Merge pull request #620 from Shrinks99/master

SASS Variable Colour Enforcement
streamaserver · Apr 28, 2018 · 70aa3c7 · 70aa3c7
2 parents 2ab8667 + 0b03f3f
commit 70aa3c7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/grails-app/assets/stylesheets/_admin.scss b/grails-app/assets/stylesheets/_admin.scss
@@ -32,7 +32,7 @@
 
         &:hover a,
         &.active a{
-          background: darken($primary, 40%);
+          background: $secondary;
           color: white;
         }
 

diff --git a/grails-app/assets/stylesheets/_btn.scss b/grails-app/assets/stylesheets/_btn.scss
@@ -100,7 +100,7 @@
       bottom: -2px;
       z-index: 9;
       background-color: rgb(67, 158, 193);
-      border: 2px dashed #b0ddef;
+      border: 2px dashed $primary;
       text-align: center;
       font-weight: 500;
       line-height: 56px;

diff --git a/grails-app/assets/stylesheets/_media-display.scss b/grails-app/assets/stylesheets/_media-display.scss
@@ -96,7 +96,7 @@
     width: 1.8em;
     line-height: 1.8em;
     text-align: center;
-    color: #b0ddef;
+    color: $primary;
     font-size: 33px;
     margin: -.9em;
     border-radius: 100%;

diff --git a/grails-app/assets/stylesheets/_misc.scss b/grails-app/assets/stylesheets/_misc.scss
@@ -26,7 +26,7 @@
   background-color: darken($primary, 40%);
 
   &:hover{
-    background-color: darken($primary, 45%);
+    background-color: $secondary;
   }
 }
 

diff --git a/grails-app/assets/stylesheets/_player-controls.scss b/grails-app/assets/stylesheets/_player-controls.scss
@@ -47,7 +47,7 @@
 
       }
       &.current{
-        background: darken($primary, 45%);
+        background: $secondary;
         .episode-play{
           display: none;
         }
@@ -476,7 +476,7 @@
       }
 
       &.current{
-        background: darken($primary, 45%);
+        background: $secondary;
         .episode-play{
           display: none;
         }

diff --git a/grails-app/assets/stylesheets/_util.scss b/grails-app/assets/stylesheets/_util.scss
@@ -355,7 +355,7 @@ a{
   width: 1.8em;
   line-height: 1.8em;
   text-align: center;
-  color: #b0ddef;
+  color: $primary;
   font-size: 33px;
   border-radius: 100%;
   border: 1px solid white;