Merge pull request #45 from nadjak77/logincomposite-benjamin

change variables
wilsonge · Feb 6, 2019 · a6070e0 · a6070e0
2 parents 294309a + 0d45563
commit a6070e0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 21 deletions.
diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss
@@ -13,9 +13,10 @@ $gray-700:                         #495057;
 $gray-800:                         #343a40;
 $gray-900:                         #212529;
 $black:                            #000;
+$light-blue:                       #ebeff5;
 
 // BS Colours
-$blue:                             #3073bb;
+$blue:                             #1a466b;
 $indigo:                           #0377be;
 $purple:                           #6f42c1;
 $pink:                             #e83e8c;
@@ -25,16 +26,6 @@ $green:                            #2f7d32;
 $teal:                             #20c997;
 $cyan:                             #108193;
 
-//variables for colors
-:root{
---background-color-light:#ebf0f5;
---background-color-dark:#1a466b;
---font-color-light:#fff;
---font-color-dark:var--(gray-600);
---link-color:$gray-600;
---main-bg:      #ebeff5;
-}
-
 $theme-colors: ();
 $theme-colors: map-merge((
   primary: $blue,
@@ -67,6 +58,11 @@ $colors: (
   white-offset: #fefefe,
   focus: #39f,
   table-border: $gray-300,
+  atum-bg-dark: $blue,
+  atum-bg-light: $light-blue,
+  atum-text-dark: $gray-600,
+  atum-text-light: $white,
+  atum-link-color:$gray-600
 );
 
 // Global

diff --git a/administrator/templates/atum/scss/blocks/_header.scss b/administrator/templates/atum/scss/blocks/_header.scss
@@ -88,7 +88,7 @@
       padding-top: 0;
 
       &::after {
-        color: var(--main-bg);
+        color: var(--atum-bg-light);
       }
     }
   }

diff --git a/administrator/templates/atum/scss/blocks/_login.scss b/administrator/templates/atum/scss/blocks/_login.scss
@@ -2,7 +2,7 @@
 
 .view-login {
 	.container-main{
-		background: var(--background-color-light);
+		background: var(--atum-bg-light);
 		/**
 		* Note IDE's will consider this file import to fail in SCSS but this is correct for the final
 		* compiled CSS file
@@ -54,7 +54,7 @@
     width: 23rem;
 	background:var(--white);
 	padding:15px;
-	color:var(--font-color-dark);
+	color:var(--atum-text-dark);
 	border-radius:3px;
 	-webkit-box-shadow: 0px 0px 10px 0px #ccc;
 	-moz-box-shadow:    0px 0px 10px 0px #ccc;
@@ -146,7 +146,7 @@
   }
 
   #sidebar {
-    color: var(--font-color-light);
+    color: var(--atum-text-light);
     position:absolute;
     bottom: 40px;
     width: 100%;
@@ -180,7 +180,7 @@
 
 .com_login .sidebar-wrapper .main-brand{
 	margin-top:100px;
-	color:var(--font-color-light);
+	color:var(--atum-text-light);
 	text-align:center;
 	@include media-breakpoint-down(sm) {
 		margin-top:10px;
@@ -195,6 +195,6 @@
 .com_login .sidebar-wrapper .main-brand a,
 .com_login .sidebar-wrapper #sidebar,
 .com_login .sidebar-wrapper #sidebar a{
-	color:var(--font-color-light);
+	color:var(--atum-text-light);
 }
 
diff --git a/administrator/templates/atum/scss/blocks/_sidebar.scss b/administrator/templates/atum/scss/blocks/_sidebar.scss
@@ -19,7 +19,7 @@
   flex-direction: column;
   flex: 1 0 $sidebar-width;
   max-width: $sidebar-width;
-  background-color: var(--background-color-dark);
+  background-color: var(--atum-bg-dark);
   box-shadow: $atum-box-shadow;
   transition: all .3s ease;
   overflow: hidden;

diff --git a/administrator/templates/atum/scss/blocks/_toolbar.scss b/administrator/templates/atum/scss/blocks/_toolbar.scss
@@ -10,7 +10,7 @@
   min-height: 43px;
   padding: 13px 0;
   color: #0c192e;
-  background: var(--main-bg);
+  background: var(--atum-bg-light);
 
   .row {
     margin-right: 0;

diff --git a/administrator/templates/atum/scss/template.scss b/administrator/templates/atum/scss/template.scss
@@ -74,13 +74,13 @@
 .container-main {
   position: relative;
   min-height: calc(100vh - #{$header-height});
-  background-color: var(--main-bg);
+  background-color: var(--atum-bg-light);
 }
 
 .list-view-main {
 
   .container-main {
-    background-color: var(--main-bg);
+    background-color: var(--atum-bg-light);
   }
 
 }