From b64816ed8d887f27caaef0bacc20e0a7640912f4 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Sat, 16 Apr 2016 14:32:04 +0200 Subject: [PATCH] Adwaita: more border color tweaking --- gtk/theme/Adwaita/_colors.scss | 2 +- gtk/theme/Adwaita/gtk-contained-dark.css | 14 +++++++------- gtk/theme/Adwaita/gtk-contained.css | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gtk/theme/Adwaita/_colors.scss b/gtk/theme/Adwaita/_colors.scss index 0a1e55a1c4..a4c4e467a8 100644 --- a/gtk/theme/Adwaita/_colors.scss +++ b/gtk/theme/Adwaita/_colors.scss @@ -11,7 +11,7 @@ $selected_fg_color: #ffffff; $selected_bg_color: if($variant == 'light', #4a90d9, darken(#4a90d9,20%)); $selected_borders_color: if($variant== 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%)); $borders_color: if($variant == 'light', darken($bg_color,22%), darken($bg_color,10%)); -$alt_borders_color: if($variant == 'light', darken($bg_color,30%), darken($bg_color,12%)); +$alt_borders_color: if($variant == 'light', darken($bg_color,35%), darken($bg_color,15%)); $borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93)); $link_color: if($variant == 'light', darken($selected_bg_color,10%), lighten($selected_bg_color,20%)); $link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), lighten($selected_bg_color,10%)); diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 2a30570111..bc7a0f2acf 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1658,7 +1658,7 @@ headerbar { min-height: 46px; border-width: 0 0 1px; border-style: solid; - border-color: #1c1f1f; + border-color: #151717; border-radius: 0; background-image: linear-gradient(to top, #2a2f2f, #2f3434 2px, #323737 3px); background-color: #323737; @@ -2630,7 +2630,7 @@ switch { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; + border-color: #151717; text-shadow: 0 -1px rgba(0, 0, 0, 0.81176); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); background-image: linear-gradient(to bottom, #323737 20%, #2a2f2f 90%); @@ -2638,7 +2638,7 @@ switch { switch:hover slider { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; + border-color: #151717; background-image: linear-gradient(to bottom, #393f3f 20%, #2f3434 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #323737, inset 0 -1px #2a2f2f, 0 1px rgba(0, 0, 0, 0.1); } switch:checked slider { @@ -2731,7 +2731,7 @@ radio { -gtk-icon-source: none; color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; + border-color: #151717; text-shadow: 0 -1px rgba(0, 0, 0, 0.81176); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); background-image: linear-gradient(to bottom, #323737 20%, #2a2f2f 90%); @@ -2743,7 +2743,7 @@ radio { radio:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; + border-color: #151717; background-image: linear-gradient(to bottom, #393f3f 20%, #2f3434 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #323737, inset 0 -1px #2a2f2f, 0 1px rgba(0, 0, 0, 0.1); } check:active, @@ -3001,7 +3001,7 @@ scale { scale slider { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; + border-color: #151717; text-shadow: 0 -1px rgba(0, 0, 0, 0.81176); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); background-image: linear-gradient(to bottom, #323737 20%, #2a2f2f 90%); @@ -3013,7 +3013,7 @@ scale { scale slider:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; + border-color: #151717; background-image: linear-gradient(to bottom, #393f3f 20%, #2f3434 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #323737, inset 0 -1px #2a2f2f, 0 1px rgba(0, 0, 0, 0.1); } scale slider:active { diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index f3333397a1..a3c209e464 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1665,7 +1665,7 @@ headerbar { min-height: 46px; border-width: 0 0 1px; border-style: solid; - border-color: #9d9d99; + border-color: #91918c; border-radius: 0; background-image: linear-gradient(to top, #d4d4d2, #efefef 2px, #f4f4f4 3px); background-color: #f4f4f4; @@ -2644,7 +2644,7 @@ switch { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; + border-color: #91918c; text-shadow: 0 1px rgba(255, 255, 255, 0.76923); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); background-image: linear-gradient(to bottom, #f4f4f4 20%, #e8e8e7 90%); @@ -2652,7 +2652,7 @@ switch { switch:hover slider { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; + border-color: #91918c; background-image: linear-gradient(to bottom, #fefefe 10%, #f2f2f1 90%); box-shadow: inset 0 1px white, inset 0 -2px #f4f4f4, inset 0 -1px #cfcfcd, 0 1px rgba(0, 0, 0, 0.1); } switch:checked slider { @@ -2756,7 +2756,7 @@ radio { -gtk-icon-source: none; color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; + border-color: #91918c; text-shadow: 0 1px rgba(255, 255, 255, 0.76923); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); background-image: linear-gradient(to bottom, #f4f4f4 20%, #e8e8e7 90%); @@ -2768,7 +2768,7 @@ radio { radio:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; + border-color: #91918c; background-image: linear-gradient(to bottom, #fefefe 10%, #f2f2f1 90%); box-shadow: inset 0 1px white, inset 0 -2px #f4f4f4, inset 0 -1px #cfcfcd, 0 1px rgba(0, 0, 0, 0.1); } check:active, @@ -3030,7 +3030,7 @@ scale { scale slider { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; + border-color: #91918c; text-shadow: 0 1px rgba(255, 255, 255, 0.76923); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); background-image: linear-gradient(to bottom, #f4f4f4 20%, #e8e8e7 90%); @@ -3042,7 +3042,7 @@ scale { scale slider:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #9d9d99; + border-color: #91918c; background-image: linear-gradient(to bottom, #fefefe 10%, #f2f2f1 90%); box-shadow: inset 0 1px white, inset 0 -2px #f4f4f4, inset 0 -1px #cfcfcd, 0 1px rgba(0, 0, 0, 0.1); } scale slider:active {