GNOME.org
 

[libadwaita/wip/exalm/background-colors: 3/7] stylesheet: borders_color -> border_color


commit 13288fd7401af1ee10b921136f9bd8b8a9e77e51
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Wed Oct 20 02:02:36 2021 +0500

    stylesheet: borders_color -> border_color
    
    Make border color names consistent with each other.

 src/stylesheet/_colors.scss                 | 10 +++++-----
 src/stylesheet/_compat-colors.scss          |  4 ++--
 src/stylesheet/widgets/_buttons.scss        |  6 +++---
 src/stylesheet/widgets/_calendar.scss       |  6 +++---
 src/stylesheet/widgets/_checks.scss         |  2 +-
 src/stylesheet/widgets/_dialogs.scss        |  2 +-
 src/stylesheet/widgets/_dropdowns.scss      |  2 +-
 src/stylesheet/widgets/_emoji-chooser.scss  |  4 ++--
 src/stylesheet/widgets/_entries.scss        |  2 +-
 src/stylesheet/widgets/_file-chooser.scss   |  2 +-
 src/stylesheet/widgets/_header-bar.scss     |  2 +-
 src/stylesheet/widgets/_level-bar.scss      |  2 +-
 src/stylesheet/widgets/_lists.scss          |  8 ++++----
 src/stylesheet/widgets/_menus.scss          |  2 +-
 src/stylesheet/widgets/_message-dialog.scss |  4 ++--
 src/stylesheet/widgets/_misc.scss           |  4 ++--
 src/stylesheet/widgets/_notebook.scss       | 10 +++++-----
 src/stylesheet/widgets/_paned.scss          |  4 ++--
 src/stylesheet/widgets/_scale.scss          |  4 ++--
 src/stylesheet/widgets/_scrolling.scss      | 12 ++++++------
 src/stylesheet/widgets/_sidebars.scss       |  6 +++---
 src/stylesheet/widgets/_spin-button.scss    |  2 +-
 src/stylesheet/widgets/_tab-view.scss       | 12 ++++++------
 src/stylesheet/widgets/_toolbars.scss       |  6 +++---
 src/stylesheet/widgets/_tooltip.scss        |  2 +-
 src/stylesheet/widgets/_trees.scss          |  4 ++--
 src/stylesheet/widgets/_window.scss         |  4 ++--
 27 files changed, 64 insertions(+), 64 deletions(-)
---
diff --git a/src/stylesheet/_colors.scss b/src/stylesheet/_colors.scss
index 923a1623..74b03241 100644
--- a/src/stylesheet/_colors.scss
+++ b/src/stylesheet/_colors.scss
@@ -21,8 +21,8 @@ $fg_color: if($variant == 'light', transparentize(black, .2), white);
 $border_opacity: if($contrast == 'high', .5, .15);
 $window_outline_opacity: if($contrast == 'high', .3, .1);
 
-$borders_color: gtkalpha(currentColor, $border_opacity);
-$thin_borders_color: gtkalpha(currentColor, .05);
+$border_color: gtkalpha(currentColor, $border_opacity);
+$thin_border_color: gtkalpha(currentColor, .05);
 $link_color: $accent_color;
 $link_visited_color: gtkmix($accent_color, $text_color, 80%);
 $headerbar_bg_color: if($variant == 'light', #ebebeb, #303030);
@@ -66,7 +66,7 @@ $osd_fg_color: transparentize(white, .1);
 $osd_text_color: white;
 $osd_bg_color: transparentize(black, 0.3);
 
-$tooltip_borders_color: transparentize(white, 0.9);
+$tooltip_border_color: transparentize(white, 0.9);
 $shadow_color: transparentize(black, 0.9);
 
 $drop_target_color: $accent_bg_color;
@@ -77,8 +77,8 @@ $dim_label_opacity: 0.55;
 
 // High Contrast color overrides
 @if $contrast == 'high' {
-  $thin_borders_color: gtkalpha(currentColor, .25);
-  $card_border_color: $borders_color;
+  $thin_border_color: gtkalpha(currentColor, .25);
+  $card_border_color: $border_color;
 
   //focus rings
   $focus_border_color: gtkalpha($accent_bg_color, 0.8);
diff --git a/src/stylesheet/_compat-colors.scss b/src/stylesheet/_compat-colors.scss
index bb4d262d..0028ec8c 100644
--- a/src/stylesheet/_compat-colors.scss
+++ b/src/stylesheet/_compat-colors.scss
@@ -17,7 +17,7 @@
 
 @define-color insensitive_base_color #{$base_color};
 
-@define-color borders #{$borders_color};
+@define-color borders #{$border_color};
 
 @define-color theme_unfocused_bg_color #{$bg_color};
 @define-color theme_unfocused_fg_color #{$fg_color};
@@ -30,4 +30,4 @@
 
 @define-color unfocused_insensitive_color #{gtkcolor(insensitive_bg_color)};
 
-@define-color unfocused_borders #{$borders_color};
+@define-color unfocused_borders #{$border_color};
diff --git a/src/stylesheet/widgets/_buttons.scss b/src/stylesheet/widgets/_buttons.scss
index 31106e72..0b826811 100644
--- a/src/stylesheet/widgets/_buttons.scss
+++ b/src/stylesheet/widgets/_buttons.scss
@@ -21,7 +21,7 @@ button {
       background-color: $button_color;
 
       @if $contrast == 'high' {
-        box-shadow: inset 0 0 0 1px $borders_color;
+        box-shadow: inset 0 0 0 1px $border_color;
       }
 
       &:hover {
@@ -207,7 +207,7 @@ button {
       &.keyboard-activating,
       &:active,
       &:checked {
-        box-shadow: inset 0 0 0 1px $borders_color;
+        box-shadow: inset 0 0 0 1px $border_color;
       }
     }
 
@@ -322,7 +322,7 @@ button.outline {
   @extend %button_basic_flat;
 
   @if $contrast == 'high' {
-    box-shadow: inset 0 0 0 1px $borders_color;
+    box-shadow: inset 0 0 0 1px $border_color;
   }
   @else {
     box-shadow: inset 0 0 0 1px gtkalpha(currentColor, .15);
diff --git a/src/stylesheet/widgets/_calendar.scss b/src/stylesheet/widgets/_calendar.scss
index 54bb99a6..15d32d48 100644
--- a/src/stylesheet/widgets/_calendar.scss
+++ b/src/stylesheet/widgets/_calendar.scss
@@ -1,10 +1,10 @@
 calendar {
   color: $text_color;
   background-clip: padding-box;
-  border: 1px solid $borders_color;
+  border: 1px solid $border_color;
 
   > header {
-    border-bottom: 1px solid $borders_color;
+    border-bottom: 1px solid $border_color;
 
     > button {
       @extend %button_basic_flat;
@@ -14,7 +14,7 @@ calendar {
 
   > grid {
     > label.today {
-      box-shadow: inset 0px -2px $borders_color;
+      box-shadow: inset 0px -2px $border_color;
 
       &:selected {
         box-shadow: none;
diff --git a/src/stylesheet/widgets/_checks.scss b/src/stylesheet/widgets/_checks.scss
index 992880e2..091494f4 100644
--- a/src/stylesheet/widgets/_checks.scss
+++ b/src/stylesheet/widgets/_checks.scss
@@ -19,7 +19,7 @@ radio {
   background-color: $trough_color;
 
   @if $contrast == "high" {
-    box-shadow: inset 0 0 0 1px $borders_color;
+    box-shadow: inset 0 0 0 1px $border_color;
   }
 
   &:hover {
diff --git a/src/stylesheet/widgets/_dialogs.scss b/src/stylesheet/widgets/_dialogs.scss
index 006f50fb..92bd2512 100644
--- a/src/stylesheet/widgets/_dialogs.scss
+++ b/src/stylesheet/widgets/_dialogs.scss
@@ -18,7 +18,7 @@ window.dialog.print {
       background-color: white;
       color: transparentize(black, .2);
       background-clip: padding-box;
-      border: 1px solid $borders_color;
+      border: 1px solid $border_color;
     }
   }
 }
diff --git a/src/stylesheet/widgets/_dropdowns.scss b/src/stylesheet/widgets/_dropdowns.scss
index fb2b16de..21b3083b 100644
--- a/src/stylesheet/widgets/_dropdowns.scss
+++ b/src/stylesheet/widgets/_dropdowns.scss
@@ -40,7 +40,7 @@ combobox {
     // dropdowns with searchboxes on top
     .dropdown-searchbar {
       padding: 6px;
-      border-bottom: 1px solid $borders_color;
+      border-bottom: 1px solid $border_color;
     }
   }
 }
diff --git a/src/stylesheet/widgets/_emoji-chooser.scss b/src/stylesheet/widgets/_emoji-chooser.scss
index 954b429f..6874d9c7 100644
--- a/src/stylesheet/widgets/_emoji-chooser.scss
+++ b/src/stylesheet/widgets/_emoji-chooser.scss
@@ -4,14 +4,14 @@ popover.background.emoji-picker > contents {
 
 .emoji-searchbar {
   padding: 6px;
-  border-bottom: 1px solid $borders_color;
+  border-bottom: 1px solid $border_color;
 }
 
 .emoji-toolbar {
   // flowbox children already have 3px padding, so we only need 3px more to
   // get the regular 6px. We also don't need spacing, for the same reason.
   padding: 3px;
-  border-top: 1px solid $borders_color;
+  border-top: 1px solid $border_color;
 }
 
 button.emoji-section.image-button:not(.raised):not(.suggested-action):not(.destructive-action) {
diff --git a/src/stylesheet/widgets/_entries.scss b/src/stylesheet/widgets/_entries.scss
index f48e68aa..650a9153 100644
--- a/src/stylesheet/widgets/_entries.scss
+++ b/src/stylesheet/widgets/_entries.scss
@@ -4,7 +4,7 @@ entry {
     min-height: 32px;
     padding-left: 8px;
     padding-right: 8px;
-    border: 1px solid $borders_color;
+    border: 1px solid $border_color;
     border-radius: $button_radius;
     border-spacing: 6px;
     color: $text_color;
diff --git a/src/stylesheet/widgets/_file-chooser.scss b/src/stylesheet/widgets/_file-chooser.scss
index b5f89abd..858e9cc0 100644
--- a/src/stylesheet/widgets/_file-chooser.scss
+++ b/src/stylesheet/widgets/_file-chooser.scss
@@ -17,7 +17,7 @@ placesview {
 }
 
 filechooser {
-  box-shadow: 0 1px $borders_color;
+  box-shadow: 0 1px $border_color;
 
   #pathbarbox { border-bottom: 1px solid $bg_color; }
 
diff --git a/src/stylesheet/widgets/_header-bar.scss b/src/stylesheet/widgets/_header-bar.scss
index b0db21c3..c803904f 100644
--- a/src/stylesheet/widgets/_header-bar.scss
+++ b/src/stylesheet/widgets/_header-bar.scss
@@ -101,7 +101,7 @@ windowcontrols {
       padding: 2px;
       transition: $button_transition;
       @if $contrast == 'high' {
-        box-shadow: inset 0 0 0 1px $borders_color;
+        box-shadow: inset 0 0 0 1px $border_color;
       }
     }
 
diff --git a/src/stylesheet/widgets/_level-bar.scss b/src/stylesheet/widgets/_level-bar.scss
index 724619da..a4367283 100644
--- a/src/stylesheet/widgets/_level-bar.scss
+++ b/src/stylesheet/widgets/_level-bar.scss
@@ -86,7 +86,7 @@ levelbar {
         background-color: $trough_color;
 
         @if $contrast == "high" {
-          box-shadow: inset 0 0 0 1px $borders_color;
+          box-shadow: inset 0 0 0 1px $border_color;
         }
       }
     }
diff --git a/src/stylesheet/widgets/_lists.scss b/src/stylesheet/widgets/_lists.scss
index fcafc507..9e0a3650 100644
--- a/src/stylesheet/widgets/_lists.scss
+++ b/src/stylesheet/widgets/_lists.scss
@@ -3,7 +3,7 @@ list {
   color: $text_color;
   background-color: $base_color;
   background-clip: padding-box;
-  border-color: $borders_color;
+  border-color: $border_color;
 
   > row {
     padding: 2px;
@@ -15,12 +15,12 @@ list {
 
   &.horizontal row.separator,
   &.separators.horizontal > row:not(.separator) {
-    border-left: 1px solid $borders_color;
+    border-left: 1px solid $border_color;
   }
 
   &:not(.horizontal) row.separator,
   &.separators:not(.horizontal) > row:not(.separator) {
-    border-bottom: 1px solid $borders_color;
+    border-bottom: 1px solid $border_color;
   }
 }
 
@@ -138,7 +138,7 @@ row.combo {
   @include focus-ring($offset: -1px);
 
   transition: 200ms $ease-out-quad;
-  border-bottom: 1px solid $borders_color;
+  border-bottom: 1px solid $border_color;
 
   &:not(:selected).activatable {
     &:hover {
diff --git a/src/stylesheet/widgets/_menus.scss b/src/stylesheet/widgets/_menus.scss
index 80bcfa18..d275aafd 100644
--- a/src/stylesheet/widgets/_menus.scss
+++ b/src/stylesheet/widgets/_menus.scss
@@ -205,7 +205,7 @@ popover.menu {
 
 menubar {
   padding: 0px;
-  box-shadow: inset 0 -1px $borders_color;
+  box-shadow: inset 0 -1px $border_color;
 
   > item {
     min-height: 16px;
diff --git a/src/stylesheet/widgets/_message-dialog.scss b/src/stylesheet/widgets/_message-dialog.scss
index b9734055..f7f7672c 100644
--- a/src/stylesheet/widgets/_message-dialog.scss
+++ b/src/stylesheet/widgets/_message-dialog.scss
@@ -25,7 +25,7 @@ window.dialog.message {
     }
 
     .dialog-action-area {
-      border-top: 1px solid $borders_color;
+      border-top: 1px solid $border_color;
       margin: 0;
       border-spacing: 0;
 
@@ -35,7 +35,7 @@ window.dialog.message {
         border-radius: 0;
         border: none;
         background-clip: padding-box;
-        border-left: 1px solid $borders_color;
+        border-left: 1px solid $border_color;
 
         &:first-child {
           border-bottom-left-radius: $window_radius+1;
diff --git a/src/stylesheet/widgets/_misc.scss b/src/stylesheet/widgets/_misc.scss
index 0644837e..2c88d1b2 100644
--- a/src/stylesheet/widgets/_misc.scss
+++ b/src/stylesheet/widgets/_misc.scss
@@ -3,7 +3,7 @@
  **********/
 frame,
 .frame {
-  border: 1px solid $borders_color;
+  border: 1px solid $border_color;
 }
 
 frame {
@@ -19,7 +19,7 @@ frame {
  **************/
 
 separator {
-  background: $borders_color;
+  background: $border_color;
   min-width: 1px;
   min-height: 1px;
 
diff --git a/src/stylesheet/widgets/_notebook.scss b/src/stylesheet/widgets/_notebook.scss
index c1874b70..e3c50b23 100644
--- a/src/stylesheet/widgets/_notebook.scss
+++ b/src/stylesheet/widgets/_notebook.scss
@@ -3,7 +3,7 @@ notebook {
 
   > header {
     padding: 1px;
-    border-color: $borders_color;
+    border-color: $border_color;
     border-width: 1px;
     background-clip: padding-box;
 
@@ -14,7 +14,7 @@ notebook {
       > tabs {
         margin-bottom: -2px;
         > tab {
-          &:hover { box-shadow: inset 0 -4px $borders_color; }
+          &:hover { box-shadow: inset 0 -4px $border_color; }
 
           &:checked { box-shadow: inset 0 -4px $accent_bg_color; }
         }
@@ -26,7 +26,7 @@ notebook {
       > tabs {
         margin-top: -2px;
         > tab {
-          &:hover { box-shadow: inset 0 4px $borders_color; }
+          &:hover { box-shadow: inset 0 4px $border_color; }
 
           &:checked { box-shadow: inset 0 4px $accent_bg_color; }
         }
@@ -38,7 +38,7 @@ notebook {
       > tabs {
         margin-right: -2px;
         > tab {
-          &:hover { box-shadow: inset -4px 0 $borders_color; }
+          &:hover { box-shadow: inset -4px 0 $border_color; }
 
           &:checked { box-shadow: inset -4px 0 $accent_bg_color; }
         }
@@ -50,7 +50,7 @@ notebook {
       > tabs {
         margin-left: -2px;
         > tab {
-          &:hover { box-shadow: inset 4px 0 $borders_color; }
+          &:hover { box-shadow: inset 4px 0 $border_color; }
 
           &:checked { box-shadow: inset 4px 0 $accent_bg_color; }
         }
diff --git a/src/stylesheet/widgets/_paned.scss b/src/stylesheet/widgets/_paned.scss
index 06189f52..f924db05 100644
--- a/src/stylesheet/widgets/_paned.scss
+++ b/src/stylesheet/widgets/_paned.scss
@@ -6,7 +6,7 @@ paned {
     border-style: none; // just to be sure
     background-color: transparent;
     // workaround, using background instead of a border since the border will get rendered twice (?)
-    background-image: image($borders_color);
+    background-image: image($border_color);
     background-size: 1px 1px;
 
     &:selected { background-image: image($accent_bg_color); } // FIXME is this needed?
@@ -15,7 +15,7 @@ paned {
       min-width: 5px;
       min-height: 5px;
       background-color: $bg_color;
-      background-image: image($borders_color), image($borders_color);
+      background-image: image($border_color), image($border_color);
       background-size: 1px 1px, 1px 1px;
     }
   }
diff --git a/src/stylesheet/widgets/_scale.scss b/src/stylesheet/widgets/_scale.scss
index 144ddb8e..6a232666 100644
--- a/src/stylesheet/widgets/_scale.scss
+++ b/src/stylesheet/widgets/_scale.scss
@@ -3,7 +3,7 @@
   background-color: $trough_color;
 
   @if $contrast == "high" {
-    box-shadow: inset 0 0 0 1px $borders_color;
+    box-shadow: inset 0 0 0 1px $border_color;
   }
 }
 
@@ -190,7 +190,7 @@ scale {
     min-width: 0;
 
     > trough {
-      background-image: image($borders_color);
+      background-image: image($border_color);
       background-repeat: no-repeat;
     }
 
diff --git a/src/stylesheet/widgets/_scrolling.scss b/src/stylesheet/widgets/_scrolling.scss
index 611cd351..bc604667 100644
--- a/src/stylesheet/widgets/_scrolling.scss
+++ b/src/stylesheet/widgets/_scrolling.scss
@@ -9,10 +9,10 @@ scrollbar {
   color: $text_color;
 
   // scrollbar border
-  &.top    { box-shadow: inset 0 -1px $borders_color; padding-bottom: 1px; }
-  &.bottom { box-shadow: inset 0  1px $borders_color; padding-top:    1px; }
-  &.left   { box-shadow: inset -1px 0 $borders_color; padding-right:  1px; }
-  &.right  { box-shadow: inset  1px 0 $borders_color; padding-left:   1px; }
+  &.top    { box-shadow: inset 0 -1px $border_color; padding-bottom: 1px; }
+  &.bottom { box-shadow: inset 0  1px $border_color; padding-top:    1px; }
+  &.left   { box-shadow: inset -1px 0 $border_color; padding-right:  1px; }
+  &.right  { box-shadow: inset  1px 0 $border_color; padding-left:   1px; }
 
   > range > trough {
     margin: 7px;
@@ -163,10 +163,10 @@ scrolledwindow {
     // Only color the top-left (or top right in RTL) pixel, to visually connect
     // the borders of the two scrollbars.
 
-    background: linear-gradient(to bottom right, $borders_color 1px, $base_color 1px);
+    background: linear-gradient(to bottom right, $border_color 1px, $base_color 1px);
 
     &:dir(rtl) {
-      background: linear-gradient(to bottom left, $borders_color 1px, $base_color 1px);
+      background: linear-gradient(to bottom left, $border_color 1px, $base_color 1px);
     }
   }
 }
diff --git a/src/stylesheet/widgets/_sidebars.scss b/src/stylesheet/widgets/_sidebars.scss
index 5e4a5e3a..3004ce20 100644
--- a/src/stylesheet/widgets/_sidebars.scss
+++ b/src/stylesheet/widgets/_sidebars.scss
@@ -8,11 +8,11 @@
 
 %sidebar_border {
   &:dir(ltr) {
-    border-right: 1px solid $borders_color;
+    border-right: 1px solid $border_color;
   }
 
   &:dir(rtl) {
-    border-left: 1px solid $borders_color;
+    border-left: 1px solid $border_color;
   }
 }
 
@@ -32,7 +32,7 @@ stacksidebar row {
 }
 
 separator.sidebar {
-  background-color: $borders_color;
+  background-color: $border_color;
 }
 
 /**********************
diff --git a/src/stylesheet/widgets/_spin-button.scss b/src/stylesheet/widgets/_spin-button.scss
index 3fe3fcdc..c56360ff 100644
--- a/src/stylesheet/widgets/_spin-button.scss
+++ b/src/stylesheet/widgets/_spin-button.scss
@@ -11,7 +11,7 @@ spinbutton {
     margin: 0;
     background: none;
     border-style: solid;
-    border-color: $thin_borders_color;
+    border-color: $thin_border_color;
     border-radius: 0;
     box-shadow: none;
     color: inherit;
diff --git a/src/stylesheet/widgets/_tab-view.scss b/src/stylesheet/widgets/_tab-view.scss
index 28990856..aa3badf9 100644
--- a/src/stylesheet/widgets/_tab-view.scss
+++ b/src/stylesheet/widgets/_tab-view.scss
@@ -20,12 +20,12 @@ $tab_needs_attention_gradient: radial-gradient(ellipse at bottom,
 tabbar {
   .box {
     min-height: 38px;
-    border-bottom: 1px solid $borders_color;
+    border-bottom: 1px solid $border_color;
   }
 
   scrolledwindow.pinned {
     undershoot {
-      border: 0 solid $borders_color;
+      border: 0 solid $border_color;
     }
 
     &:dir(rtl) undershoot.left {
@@ -38,11 +38,11 @@ tabbar {
 
     tabbox > background {
       &:dir(ltr) {
-        box-shadow: inset -1px 0 $borders_color;
+        box-shadow: inset -1px 0 $border_color;
       }
 
       &:dir(rtl) {
-        box-shadow: inset 1px 0 $borders_color;
+        box-shadow: inset 1px 0 $border_color;
       }
     }
   }
@@ -73,7 +73,7 @@ tabbar {
 
   tab {
     border-style: solid;
-    border-color: $borders_color;
+    border-color: $border_color;
     border-width: 0 1px 0 1px;
     transition: background 150ms ease-in-out, $focus_transition;
     background-color: gtkalpha($shade_color, .6);
@@ -102,7 +102,7 @@ tabbar {
   .end-action {
     background-color: gtkalpha($shade_color, .6);
     background-clip: padding-box;
-    border-color: $borders_color;
+    border-color: $border_color;
     border-style: solid;
     transition: background 150ms ease-in-out;
 
diff --git a/src/stylesheet/widgets/_toolbars.scss b/src/stylesheet/widgets/_toolbars.scss
index a42c66c0..96e3ded8 100644
--- a/src/stylesheet/widgets/_toolbars.scss
+++ b/src/stylesheet/widgets/_toolbars.scss
@@ -141,7 +141,7 @@ searchbar {
   > revealer > box {
     padding: 0px 6px 1px 6px;
     border-spacing: 6px;
-    box-shadow: inset 0 -1px $borders_color;
+    box-shadow: inset 0 -1px $border_color;
 
     @extend %toolbar;
 
@@ -161,7 +161,7 @@ searchbar {
 
 actionbar > revealer > box {
   padding: 1px 6px 0px 6px;
-  box-shadow: inset 0 1px $borders_color;
+  box-shadow: inset 0 1px $border_color;
   @extend %toolbar;
 
   &, > box.start, > box.end {
@@ -177,7 +177,7 @@ infobar {
   > revealer > box {
     padding: 8px 8px 9px 8px;
     border-spacing: 12px;
-    box-shadow: inset 0 -1px $borders_color;
+    box-shadow: inset 0 -1px $border_color;
   }
 
   &.action:hover > revealer > box {
diff --git a/src/stylesheet/widgets/_tooltip.scss b/src/stylesheet/widgets/_tooltip.scss
index 7091ab6f..d9e6c92e 100644
--- a/src/stylesheet/widgets/_tooltip.scss
+++ b/src/stylesheet/widgets/_tooltip.scss
@@ -4,7 +4,7 @@ tooltip {
     // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
     background-color: transparentize(black, 0.2);
     background-clip: padding-box;
-    border: 1px solid $tooltip_borders_color; // this subtle border is meant to
+    border: 1px solid $tooltip_border_color; // this subtle border is meant to
                                               // not make the tooltip melt with
                                               // very dark backgrounds
     color: white;
diff --git a/src/stylesheet/widgets/_trees.scss b/src/stylesheet/widgets/_trees.scss
index 23f7bae3..0c042894 100644
--- a/src/stylesheet/widgets/_trees.scss
+++ b/src/stylesheet/widgets/_trees.scss
@@ -19,7 +19,7 @@ treeview.view {
 
   &.separator {
     min-height: 2px;
-    color: $borders_color;
+    color: $border_color;
   }
 
   &:drop(active) {
@@ -149,7 +149,7 @@ columnview {
 
   // make column separators visible when :show-column-separators is true
   &.column-separators > listview > row > cell {
-    border-left-color: $borders_color;
+    border-left-color: $border_color;
   }
 
   // shrink vertically for .data-table
diff --git a/src/stylesheet/widgets/_window.scss b/src/stylesheet/widgets/_window.scss
index 2df5d1a9..ef1a30a7 100644
--- a/src/stylesheet/widgets/_window.scss
+++ b/src/stylesheet/widgets/_window.scss
@@ -62,12 +62,12 @@ window {
     margin: 0;
     padding: 5px;
     border-radius: 0;
-    box-shadow: inset 0 0 0 5px $borders_color,
+    box-shadow: inset 0 0 0 5px $border_color,
                 inset 0 0 0 4px $headerbar_bg_color,
                 inset 0 0 0 1px $window_border_color;
 
     &:backdrop {
-      box-shadow: inset 0 0 0 5px $borders_color,
+      box-shadow: inset 0 0 0 5px $border_color,
                   inset 0 0 0 4px $headerbar_backdrop_color,
                   inset 0 0 0 1px $window_border_backdrop_color;
     }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]