diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php index e81aa6b9d..fb7b86741 100644 --- a/modules/backend/ServiceProvider.php +++ b/modules/backend/ServiceProvider.php @@ -63,7 +63,6 @@ class ServiceProvider extends ModuleServiceProvider protected function registerAssetBundles() { CombineAssets::registerCallback(function($combiner) { - $combiner->registerBundle('~/modules/backend/assets/less/controls.less'); $combiner->registerBundle('~/modules/backend/assets/less/october.less'); $combiner->registerBundle('~/modules/backend/assets/js/october.js'); $combiner->registerBundle('~/modules/backend/assets/js/vendor/vendor.js'); diff --git a/modules/backend/assets/less/core/boot.less b/modules/backend/assets/less/core/boot.less index da5e36254..338fbf31b 100644 --- a/modules/backend/assets/less/core/boot.less +++ b/modules/backend/assets/less/core/boot.less @@ -5,10 +5,17 @@ // // Core variables and mixins -@import "../../../system/assets/ui/less/global.less"; -@import "../../../system/assets/ui/less/site.variables.less"; -@import "../../../system/assets/ui/less/site.mixins.less"; -@import "../../../system/assets/ui/less/icon.variables.less"; -@import "../../../system/assets/ui/less/icon.mixins.less"; +@import "../../../../system/assets/ui/less/global.less"; + +@import "../../../../system/assets/ui/less/site.mixins.less"; +@import "../../../../system/assets/ui/less/site.variables.less"; + +@import "../../../../system/assets/ui/less/icon.mixins.less"; +@import "../../../../system/assets/ui/less/icon.variables.less"; + +@import "../../../../system/assets/ui/less/form.variables.less"; +@import "../../../../system/assets/ui/less/button.variables.less"; +@import "../../../../system/assets/ui/less/dropdown.variables.less"; + @import "variables.less"; @import "mixins.less"; diff --git a/modules/backend/assets/less/core/variables.less b/modules/backend/assets/less/core/variables.less index 2487ba39c..5b8807128 100644 --- a/modules/backend/assets/less/core/variables.less +++ b/modules/backend/assets/less/core/variables.less @@ -21,11 +21,14 @@ @link-hover-color: darken(@link-color, 30%); // -// Fonts +// Paths // -------------------------------------------------- @fontsPath: "../font"; +@font-path: "../../../system/assets/ui/font"; +@image-path: "../../../system/assets/ui/images"; + // Callouts // -------------------------------------------------- @callout-padding: 20px; diff --git a/modules/backend/assets/less/october.less b/modules/backend/assets/less/october.less index e81a617b0..2c72d03bb 100644 --- a/modules/backend/assets/less/october.less +++ b/modules/backend/assets/less/october.less @@ -56,6 +56,7 @@ @import "../../../system/assets/ui/less/loader.less"; @import "../../../system/assets/ui/less/popover.less"; @import "../../../system/assets/ui/less/popup.less"; +@import "../../../system/assets/ui/less/tab.less"; // // Combines layout and vendor styles diff --git a/modules/system/assets/ui/less/button.less b/modules/system/assets/ui/less/button.less index 45ff10a17..b5d3b242e 100644 --- a/modules/system/assets/ui/less/button.less +++ b/modules/system/assets/ui/less/button.less @@ -8,15 +8,10 @@ // Buttons // -------------------------------------------------- -@import "button.mixins"; -@import "button.variables"; -@import "button.base"; -@import "button.groups"; - -@color-button-disabled-bg: #dbdbdb; -@color-button-disabled-text: #aaaaaa; -@color-icon-btn-default: #bcc3c7; -@color-btn-danger: #c63e26; +@import "button.mixins.less"; +@import "button.variables.less"; +@import "button.base.less"; +@import "button.groups.less"; // // Buttons diff --git a/modules/system/assets/ui/less/button.variables.less b/modules/system/assets/ui/less/button.variables.less index dc044d585..1b703e589 100644 --- a/modules/system/assets/ui/less/button.variables.less +++ b/modules/system/assets/ui/less/button.variables.less @@ -25,3 +25,8 @@ @btn-danger-border: darken(@btn-danger-bg, 5%); @btn-link-disabled-color: @gray-light; + +@color-button-disabled-bg: #dbdbdb; +@color-button-disabled-text: #aaaaaa; +@color-icon-btn-default: #bcc3c7; +@color-btn-danger: #c63e26; diff --git a/modules/system/assets/ui/less/dropdown.less b/modules/system/assets/ui/less/dropdown.less index de34c1947..48bba4f9e 100644 --- a/modules/system/assets/ui/less/dropdown.less +++ b/modules/system/assets/ui/less/dropdown.less @@ -11,32 +11,7 @@ // -------------------------------------------------- @import "dropdown.base.less"; - -@dropdown-bg: #fff; -@dropdown-border: rgba(0,0,0,.15); -@dropdown-fallback-border: #ccc; -@dropdown-divider-bg: #e5e5e5; - -@dropdown-link-color: @gray-dark; -@dropdown-link-hover-color: darken(@gray-dark, 5%); -@dropdown-link-hover-bg: #f5f5f5; - -@dropdown-link-active-color: @component-active-color; -@dropdown-link-active-bg: @component-active-bg; - -@dropdown-link-disabled-color: @gray-light; - -@dropdown-header-color: @gray-light; - -// Note: Deprecated @dropdown-caret-color as of v3.1.0 -@dropdown-caret-color: #000; - - -@color-dropdown-title-border: #c9c9c9; -@color-dropdown-title-text: @dropdown-link-color; -@color-dropdown-hover-color: #2f99da; -@color-dropdown-hover-text: #ffffff; - +@import "dropdown.variables.less"; // // Dropdowns diff --git a/modules/system/assets/ui/less/dropdown.variables.less b/modules/system/assets/ui/less/dropdown.variables.less new file mode 100644 index 000000000..0e6ff79a8 --- /dev/null +++ b/modules/system/assets/ui/less/dropdown.variables.less @@ -0,0 +1,24 @@ +@dropdown-bg: #fff; +@dropdown-border: rgba(0,0,0,.15); +@dropdown-fallback-border: #ccc; +@dropdown-divider-bg: #e5e5e5; + +@dropdown-link-color: @gray-dark; +@dropdown-link-hover-color: darken(@gray-dark, 5%); +@dropdown-link-hover-bg: #f5f5f5; + +@dropdown-link-active-color: @component-active-color; +@dropdown-link-active-bg: @component-active-bg; + +@dropdown-link-disabled-color: @gray-light; + +@dropdown-header-color: @gray-light; + +// Note: Deprecated @dropdown-caret-color as of v3.1.0 +@dropdown-caret-color: #000; + + +@color-dropdown-title-border: #c9c9c9; +@color-dropdown-title-text: @dropdown-link-color; +@color-dropdown-hover-color: #2f99da; +@color-dropdown-hover-text: #ffffff; \ No newline at end of file diff --git a/modules/system/assets/ui/less/flag.less b/modules/system/assets/ui/less/flag.less index 80c5f32ee..b94f79bb3 100644 --- a/modules/system/assets/ui/less/flag.less +++ b/modules/system/assets/ui/less/flag.less @@ -8,7 +8,7 @@ // Flag // -------------------------------------------------- -@flag-image-path: "../images"; +@flag-image-path: @image-path; [class^="flag-"], [class*=" flag-"] { diff --git a/modules/system/assets/ui/less/global.variables.less b/modules/system/assets/ui/less/global.variables.less index 063f56923..489de5c72 100644 --- a/modules/system/assets/ui/less/global.variables.less +++ b/modules/system/assets/ui/less/global.variables.less @@ -15,6 +15,13 @@ @link-hover-color: darken(@link-color, 15%); @link-hover-decoration: underline; +// +// Paths +// -------------------------------------------------- + +@font-path: "../font"; +@image-path: "../images"; + // // Breakpoints // -------------------------------------------------- diff --git a/modules/system/assets/ui/less/icon.variables.less b/modules/system/assets/ui/less/icon.variables.less index 8f220e30f..fd4af2380 100644 --- a/modules/system/assets/ui/less/icon.variables.less +++ b/modules/system/assets/ui/less/icon.variables.less @@ -1,7 +1,7 @@ // Variables // -------------------------- -@icon-font-path: "../font"; +@icon-font-path: @font-path; @icon-font-version: "1.0.0"; @adjust: "\f042"; diff --git a/modules/system/assets/ui/less/loader.less b/modules/system/assets/ui/less/loader.less index f1a13cead..dec775219 100644 --- a/modules/system/assets/ui/less/loader.less +++ b/modules/system/assets/ui/less/loader.less @@ -10,7 +10,7 @@ @color-loading-indicator-text: #999999; @color-stripe-loader: #0090c0; -@loader-image-path: "../images"; +@loader-image-path: @image-path; .loading-indicator { padding: 20px 20px 20px 60px;