Extract more color rules into skins (jekyll#452)

Merge pull request 452
laxa88 · Apr 9, 2020 · 04e9885 · 04e9885
1 parent 6de61a3
commit 04e9885
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 17 deletions.
diff --git a/_sass/minima/_base.scss b/_sass/minima/_base.scss
@@ -120,7 +120,7 @@ a {
   }
 
   &:hover {
-    color: $text-color;
+    color: $link-hover-color;
     text-decoration: underline;
   }
 
@@ -139,7 +139,7 @@ a {
  */
 blockquote {
   color: $brand-color;
-  border-left: 4px solid $brand-color-light;
+  border-left: 4px solid $border-color-01;
   padding-left: $spacing-unit / 2;
   @include relative-font-size(1.125);
   font-style: italic;
@@ -162,7 +162,7 @@ pre,
 code {
   font-family: $code-font-family;
   font-size: 0.9375em;
-  border: 1px solid $brand-color-light;
+  border: 1px solid $border-color-01;
   border-radius: 3px;
   background-color: $code-background-color;
 }

diff --git a/_sass/minima/_layout.scss b/_sass/minima/_layout.scss
@@ -2,8 +2,8 @@
  * Site header
  */
 .site-header {
-  border-top: 5px solid $brand-color-dark;
-  border-bottom: 1px solid $brand-color-light;
+  border-top: 5px solid $border-color-03;
+  border-bottom: 1px solid $border-color-01;
   min-height: $spacing-unit * 1.865;
   line-height: $base-line-height * $base-font-size * 2.25;
 
@@ -24,7 +24,7 @@
 
   &,
   &:visited {
-    color: $brand-color-dark;
+    color: $site-title-color;
   }
 }
 
@@ -33,12 +33,12 @@
   top: 9px;
   right: $spacing-unit / 2;
   background-color: $background-color;
-  border: 1px solid $brand-color-light;
+  border: 1px solid $border-color-01;
   border-radius: 5px;
   text-align: right;
 
   .nav-trigger {
-      display: none;
+    display: none;
   }
 
   .menu-icon {
@@ -50,7 +50,7 @@
     text-align: center;
 
     > svg path {
-      fill: $brand-color-dark;
+      fill: $border-color-03;
     }
   }
 
@@ -122,7 +122,7 @@
  * Site footer
  */
 .site-footer {
-  border-top: 1px solid $brand-color-light;
+  border-top: 1px solid $border-color-01;
   padding: $spacing-unit 0;
 }
 
@@ -297,8 +297,8 @@
     a {
       display: block;
       padding: $spacing-unit / 4;
-      border: 1px solid $brand-color-light;
-      &:hover { border-color: darken($brand-color-light, 10%) }
+      border: 1px solid $border-color-01;
+      &:hover { border-color: $border-color-02 }
     }
   }
 }
@@ -323,7 +323,7 @@
       border: 1px solid transparent;
 
       &.pager-edge {
-        color: darken($brand-color-light, 5%);
+        color: $border-color-01;
         border: 1px dashed;
       }
     }

diff --git a/_sass/minima/skins/classic.scss b/_sass/minima/skins/classic.scss
@@ -4,18 +4,25 @@ $brand-color:           #828282 !default;
 $brand-color-light:     lighten($brand-color, 40%) !default;
 $brand-color-dark:      darken($brand-color, 25%) !default;
 
-$text-color:            #111 !default;
+$site-title-color:      $brand-color-dark !default;
+
+$text-color:            #111111 !default;
 $background-color:      #fdfdfd !default;
-$code-background-color: #eef !default;
+$code-background-color: #eeeeff !default;
 
 $link-base-color:       #2a7ae2 !default;
 $link-visited-color:    darken($link-base-color, 15%) !default;
+$link-hover-color:      $text-color !default;
+
+$border-color-01:       $brand-color-light !default;
+$border-color-02:       lighten($brand-color, 35%) !default;
+$border-color-03:       $brand-color-dark !default;
 
 $table-text-color:      lighten($text-color, 18%) !default;
 $table-zebra-color:     lighten($brand-color, 46%) !default;
 $table-header-bg-color: lighten($brand-color, 43%) !default;
-$table-header-border:   lighten($brand-color, 36%) !default;
-$table-border-color:    $brand-color-light !default;
+$table-header-border:   lighten($brand-color, 37%) !default;
+$table-border-color:    $border-color-01 !default;
 
 
 // Syntax highlighting styles should be adjusted appropriately for every "skin"

diff --git a/_sass/minima/skins/solarized.scss b/_sass/minima/skins/solarized.scss
@@ -53,12 +53,19 @@ $brand-color:           $sol-mono1 !default;
 $brand-color-light:     mix($sol-mono1, $sol-mono3) !default;
 $brand-color-dark:      $sol-mono00 !default;
 
+$site-title-color:      $sol-mono00 !default;
+
 $text-color:            $sol-mono01 !default;
 $background-color:      $sol-mono3 !default;
 $code-background-color: $sol-mono2 !default;
 
 $link-base-color:       $sol-blue !default;
 $link-visited-color:    mix($sol-blue, $sol-mono00) !default;
+$link-hover-color:      $sol-mono00 !default;
+
+$border-color-01:       $brand-color-light !default;
+$border-color-02:       $sol-mono1 !default;
+$border-color-03:       $sol-mono00 !default;
 
 $table-text-color:      $sol-mono00 !default;
 $table-zebra-color:     mix($sol-mono2, $sol-mono3) !default;