-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2089 from CachetHQ/split-gulp
Split css between dashboard and status page
- Loading branch information
Showing
23 changed files
with
1,070 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
@import "palette"; | ||
|
||
$ionicons-font-path: "../../../fonts" !default; | ||
@import "./node_modules/ionicons/scss/ionicons"; | ||
|
||
@import "modules/bootstrap"; | ||
|
||
html { | ||
position: relative; | ||
min-height: 100%; | ||
-webkit-font-smoothing: antialiased; | ||
// always show up-down scrollbar to prevent content from jumping left/right | ||
// depending on whether the page is taller than 100% of viewport height | ||
overflow-y: scroll; | ||
} | ||
|
||
body { | ||
margin-bottom: 60px; | ||
padding-bottom: 60px; | ||
} | ||
|
||
@import "helpers"; | ||
|
||
// Module overrides | ||
@import "modules/tabs"; | ||
@import "modules/forms"; | ||
@import "modules/well"; | ||
@import "modules/alerts"; | ||
@import "modules/panels"; | ||
@import "modules/btns"; | ||
@import "modules/pager"; | ||
|
||
// Error pages can have their own overrides. | ||
@import "errors"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,57 +1,4 @@ | ||
@import "palette"; | ||
|
||
$ionicons-font-path: "../../../fonts" !default; | ||
@import "./node_modules/ionicons/scss/ionicons"; | ||
|
||
@import "modules/bootstrap"; | ||
|
||
html { | ||
position: relative; | ||
min-height: 100%; | ||
-webkit-font-smoothing: antialiased; | ||
// always show up-down scrollbar to prevent content from jumping left/right | ||
// depending on whether the page is taller than 100% of viewport height | ||
overflow-y: scroll; | ||
} | ||
|
||
body { | ||
margin-bottom: 60px; | ||
padding-bottom: 60px; | ||
} | ||
|
||
@import "helpers"; | ||
|
||
// Module overrides | ||
@import "modules/tabs"; | ||
@import "modules/forms"; | ||
@import "modules/well"; | ||
@import "modules/alerts"; | ||
@import "modules/panels"; | ||
@import "modules/btns"; | ||
@import "modules/pager"; | ||
|
||
// Styles for partials | ||
@import "partials/base"; | ||
@import "partials/wrapper"; | ||
@import "partials/navbar"; | ||
@import "partials/sidebar"; | ||
@import "partials/content"; | ||
@import "partials/modals"; | ||
|
||
// Styles for specific page | ||
@import "pages/login"; | ||
@import "pages/setup"; | ||
@import "pages/dashboard"; | ||
|
||
// Styles for plugins | ||
@import "plugins/messenger"; | ||
@import "plugins/animate"; | ||
@import "plugins/bootstrap-datetimepicker/bootstrap-datetimepicker"; | ||
@import "plugins/password-strength"; | ||
@import "plugins/sortable"; | ||
@import "vendors"; | ||
|
||
// Status Page will need to override certain styles. | ||
@import "status-page"; | ||
|
||
// Error pages can have their own overrides. | ||
@import "errors"; | ||
@import "status-page/status-page"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
@import "vendors"; | ||
|
||
// Styles for partials | ||
@import "dashboard/partials/base"; | ||
@import "dashboard/partials/wrapper"; | ||
@import "dashboard/partials/navbar"; | ||
@import "dashboard/partials/sidebar"; | ||
@import "dashboard/partials/content"; | ||
@import "dashboard/partials/modals"; | ||
|
||
// Styles for specific page | ||
@import "dashboard/pages/login"; | ||
@import "dashboard/pages/setup"; | ||
@import "dashboard/pages/dashboard"; | ||
|
||
// Styles for plugins | ||
@import "plugins/jquery.minicolors"; | ||
@import "plugins/github-markdown"; | ||
@import "plugins/sweetalert"; | ||
@import "plugins/messenger"; | ||
@import "plugins/animate"; | ||
@import "plugins/bootstrap-datetimepicker/bootstrap-datetimepicker"; | ||
@import "plugins/password-strength"; | ||
@import "plugins/sortable"; |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.