[libadwaita/wip/exalm/borders: 32/40] stylesheet: Simplify entry border




commit 4646b0898d685f9e51d2bec08c15bd4ec1e05ca7
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Mon Jul 26 20:51:28 2021 +0500

    stylesheet: Simplify entry border
    
    Use plain $borders_color. We'll make it lighter globally to compensate.

 src/stylesheet/_colors.scss  |  1 -
 src/stylesheet/_drawing.scss | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/src/stylesheet/_colors.scss b/src/stylesheet/_colors.scss
index 2310c947..62130efe 100644
--- a/src/stylesheet/_colors.scss
+++ b/src/stylesheet/_colors.scss
@@ -65,7 +65,6 @@ $osd_text_color: white;
 $osd_bg_color: if($variant == 'light', transparentize($dark_bg,0.3), 
transparentize(darken(desaturate($dark_3, 100%), 10%),0.3));
 $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
-$osd_borders_color: transparentize(black, 0.3);
 
 $sidebar_bg_color: mix($bg_color, $base_color, 50%);
 
diff --git a/src/stylesheet/_drawing.scss b/src/stylesheet/_drawing.scss
index dbe3e6d6..1a55d9a0 100644
--- a/src/stylesheet/_drawing.scss
+++ b/src/stylesheet/_drawing.scss
@@ -53,31 +53,31 @@
 
   @if $t==normal {
     color: $text_color;
-    border-color: mix($borders_color, $base_color, 75%);
+    border-color: $borders_color;
     background-color: $base_color;
     // for the transition to work the number of shadows in different states needs to match, hence the 
transparent shadow here.
   }
   @if $t==insensitive {
     color: $insensitive_fg_color;
-    border-color: mix($borders_color, $insensitive_bg_color, 75%);
+    border-color: $borders_color;
     background-color: $insensitive_bg_color;
   }
   @if $t==osd {
     color: $osd_text_color;
-    border-color: $osd_borders_color;
-    background-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+    border-color: $borders_color;
+    background-color: transparentize(black, 0.5);
     background-clip: padding-box;
     box-shadow: none;
   }
   @if $t==osd-focus {
     color: $osd_text_color;
-    border-color: $accent_bg_color;
-    background-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+    border-color: $borders_color;
+    background-color: transparentize(black, 0.5);
     background-clip: padding-box;
   }
   @if $t==osd-insensitive {
     color: $osd_insensitive_fg_color;
-    border-color: $osd_borders_color;
+    border-color: $borders_color;
     background-color: $osd_insensitive_bg_color;
     background-clip: padding-box;
   }


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