ui-scss: settings separated colors, fonts and globals

catkrahl · Apr 16, 2020 · fed1cf0 · fed1cf0
1 parent 1a3786b
commit fed1cf0
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 26 deletions.
diff --git a/src/UI/scss/_01-settings-colors.scss b/src/UI/scss/_01-settings-colors.scss
@@ -23,9 +23,36 @@ $ui-dark-gray-3:			darken($ui-base-color-gray, 30%);
 $ui-text-color:				$ui-base-color-dark;
 $ui-text-color-light:		lighten($ui-text-color,30%);
 
+
+// IL6 variables from variables.less
+// Layout (UI-PageLayout )
+//
+// variables to modify the appearance of the page generated by the UI Framework.
+// header, footer and logo
+
+$il-standard-page-header-bg-color: #fff;
+$il-standard-page-border-light-color: #ddd;
+$il-metabar-glyph-color: #aaa;
+$il-standard-page-breadcrumbs-bg-color: #fff;
+$il-standard-page-breadcrumbs-divider-color: #bbb;
+$il-maincontrols-mainbar-bg-color: #fff;
+$il-mainbar-btn-color: #fff;
+$il-mainbar-btn-bg-color: #4a4a4a;
+$il-mainbar-btn-color-engaged: #4a4a4a;
+$il-mainbar-btn-bg-color-engaged: #fff;
+$il-mainbar-tools-bg: $body-bg;
+$il-slate-bulky-bg-color: #f2f2f2;
+$il-slate-bulky-level2-bg-color: #e3e3e3;
+$il-slate-bulky-bg-color-engaged: fade($brand-primary, 30%);
+$il-mainbar-slates-bg-color: #fff;
+$il-metabar-slates-bg-color: #fafafa;
+$characteristic-value-border-color: #ddd;
+
+
 // *************************************
-// legacy colors
-$brand-primary:         $ui-main-color-3; // #4c6586;
+// legacy colors from 
+
+$brand-primary:         $ui-main-color-1; // #4c6586;
 $brand-secondary:       $ui-main-color-2; // #6ea03c;
 $brand-success:         #6ea03c;
 $brand-info:            #dcb496;

diff --git a/src/UI/scss/_01-settings-fonts.scss b/src/UI/scss/_01-settings-fonts.scss
@@ -1,3 +1,7 @@
+// font settings
+
+$web-font-path: "/templates/default/fonts/";
+
 @font-face {
 	font-family: 'Open Sans';
 	src:	url('#{$web-font-path}OpenSansWeb/OpenSans-Regular.woff2') format('woff2'),

diff --git a/src/UI/scss/_01-settings-globals.scss b/src/UI/scss/_01-settings-globals.scss
@@ -1,5 +1,3 @@
-$web-font-path: "/templates/default/fonts/";
-
 // variables from standardpage.less
 $il-standard-page-zindex-base: $zindex-navbar;
 $il-standard-page-zindex-header: $il-standard-page-zindex-base - 1;
@@ -8,44 +6,35 @@ $il-standard-page-zindex-maincontrols: $il-standard-page-zindex-breadcrumbs - 1;
 $il-standard-page-zindex-mainbar: $il-standard-page-zindex-maincontrols - 1;
 $il-standard-page-zindex-mainbar-slates: $il-standard-page-zindex-mainbar - 1;
 
-//## IL6 variables from variables.less
-//== Layout (UI-PageLayout )
-//
-//## Variables to modify the appearance of the page generated by the UI Framework.
-//** header, footer and logo
+
 $grid-float-breakpoint-max: 768px;
 
 $il-standard-page-logo-height: 45px;
 $il-standard-page-logo-width: 45px;
 $il-standard-page-header-height: 60px;
-$il-standard-page-header-bg-color: #fff;
-$il-standard-page-border-light-color: #ddd;
+
 $il-standard-page-content-padding: 20px;
 
 //** metabar
 $il-metabar-entry-height: 60px;
 $il-metabar-entry-width: 60px;
 $il-metabar-glyph-size: 2.3rem;
-$il-metabar-glyph-color: #aaa;
+
 $il-metabar-slates-width: 500px;
 
 //** breadcrumbs
 $il-standard-page-breadcrumbs-height: 33px;
-$il-standard-page-breadcrumbs-bg-color: #fff;
-$il-standard-page-breadcrumbs-divider-color: #bbb;
+
 
 //** mainbar
-$il-maincontrols-mainbar-bg-color: #fff;
+
 $il-mainbar-btn-height: 80px;
 $il-mainbar-btn-width: 80px;
-$il-mainbar-btn-color: #fff;
-$il-mainbar-btn-bg-color: #4a4a4a;
-$il-mainbar-btn-color-engaged: #4a4a4a;
-$il-mainbar-btn-bg-color-engaged: #fff;
+
 $il-mainbar-btn-border: 1px solid $il-standard-page-border-light-color;
 $il-mainbar-btn-label-size: .9rem;
 $il-mainbar-bulky-label-margin-top: 5px;
-$il-mainbar-tools-bg: $body-bg;
+
 $il-mainbar-tools-item-gap: 3px;
 
 //** tools
@@ -59,9 +48,9 @@ $il-mode-info-shadow: 0px 2px 2px 0px rgba(128, 128, 128, 1);
 $il-mode-info-text-color: white;
 
 //** slates
-$il-slate-bulky-bg-color: #f2f2f2;
-$il-slate-bulky-level2-bg-color: #e3e3e3;
-$il-slate-bulky-bg-color-engaged: fade($brand-primary, 30%);
+
+
+
 $il-slate-content-padding: 10px 20px;
 $il-slate-tree-padding: 4px 0;
 $il-slate-bulky-padding: 10px 40px 15px 10px;
@@ -71,8 +60,7 @@ $il-slate-bulky-glyph-margin-right: 5px;
 $il-slate-bulky-label-size: 1.5rem;
 $il-slate-content-spacing: 2px;
 $il-standard-page-slate-width: 329px;
-$il-mainbar-slates-bg-color: #fff;
-$il-metabar-slates-bg-color: #fafafa;
+
 $il-mainbar-close-slate-btn-height: 45px;
 $il-metabar-close-slate-btn-height: 30px;
 
@@ -100,4 +88,3 @@ $il-tree-node-vertical-spacing: 0px;
 
 //== Characteristic Value Listing
 //** item rows layout
-$characteristic-value-border-color: #ddd;