[libadwaita/wip/exalm/borders: 29/40] stylesheet: Remove $treeview_borders_color




commit 3fe0d301f92251c682baccd235e55c1e28a7a62b
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Mon Jul 26 20:41:23 2021 +0500

    stylesheet: Remove $treeview_borders_color
    
    Use regular $borders_color. For tree view tree lines and separators make
    a separate opaque version.

 src/stylesheet/_common.scss        |  2 --
 src/stylesheet/widgets/_lists.scss |  4 ++--
 src/stylesheet/widgets/_trees.scss | 15 +++++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/src/stylesheet/_common.scss b/src/stylesheet/_common.scss
index 896ac12d..52d21d1a 100644
--- a/src/stylesheet/_common.scss
+++ b/src/stylesheet/_common.scss
@@ -9,8 +9,6 @@ $menu_padding: 12px; //inner menuitem padding
 $window_radius: $button_radius + 3;
 $popover_radius: $button_radius + 4;
 
-$treeview_borders_color: if($variant=='light',mix($borders_color, $base_color,80%),mix($fg_color, 
$base_color, 20%));
-
 .background {
   color: $fg_color;
   background-color: $bg_color;
diff --git a/src/stylesheet/widgets/_lists.scss b/src/stylesheet/widgets/_lists.scss
index 6fcbd092..1d157563 100644
--- a/src/stylesheet/widgets/_lists.scss
+++ b/src/stylesheet/widgets/_lists.scss
@@ -10,11 +10,11 @@ list {
 
   &.horizontal row.separator,
   &.separators.horizontal > row:not(.separator) {
-    border-left: 1px solid $treeview_borders_color;
+    border-left: 1px solid $borders_color;
   }
   &:not(.horizontal) row.separator,
   &.separators:not(.horizontal) > row:not(.separator) {
-    border-bottom: 1px solid $treeview_borders_color;
+    border-bottom: 1px solid $borders_color;
   }
 }
 
diff --git a/src/stylesheet/widgets/_trees.scss b/src/stylesheet/widgets/_trees.scss
index e093bc91..1d4b954d 100644
--- a/src/stylesheet/widgets/_trees.scss
+++ b/src/stylesheet/widgets/_trees.scss
@@ -1,12 +1,15 @@
 // To be used for opaque elements overlaid atop the selected row
 $treeview_selection_default: transparentize($text_color, .9);
 $treeview_selection_opaque: mix(opacify($treeview_selection_default, 1), $base_color, 100% * 
alpha($treeview_selection_default));
+$treeview_borders_opaque: mix($text_color, $base_color, if($contrast == 'high', 40%, 20%));
 
-columnview.view,
 treeview.view {
-  border-left-color: $treeview_borders_color; // this is actually the tree lines color,
-  border-top-color: $treeview_borders_color; // while this is the grid lines color, better then nothing
+  border-left-color: $treeview_borders_opaque; // this is actually the tree lines color,
+  border-top-color: $treeview_borders_opaque; // while this is the grid lines color, better then nothing
+}
 
+columnview.view,
+treeview.view {
   @include focus-ring();
 
   &:selected {
@@ -17,7 +20,7 @@ treeview.view {
 
   &.separator {
     min-height: 2px;
-    color: $treeview_borders_color;
+    color: $borders_color;
   }
 
   &:drop(active) {
@@ -130,7 +133,7 @@ treeview.view {
   background-image: none;
   border-style: solid;
   border-width: 0 0 1px 1px;
-  border-color: $treeview_borders_color;
+  border-color: $borders_color;
   border-radius: 0;
 
   &:disabled {
@@ -164,7 +167,7 @@ columnview {
 
   // make column separators visible when :show-column-separators is true
   &.column-separators > listview > row > cell {
-    border-left-color: $treeview_borders_color;
+    border-left-color: $borders_color;
   }
 
   // shrink vertically for .data-table


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]