[gtk+/gtk-3-18] Adwaita: revert menu color change on the light variant
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-18] Adwaita: revert menu color change on the light variant
- Date: Fri, 11 Dec 2015 19:20:41 +0000 (UTC)
commit 66772d30d1e490c7304b272fdc2aa49e54ee6ff1
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Fri Dec 11 20:19:27 2015 +0100
Adwaita: revert menu color change on the light variant
...and make the change more subtle on the dark one.
gtk/theme/Adwaita/_colors.scss | 4 ++--
gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++--
gtk/theme/Adwaita/gtk-contained.css | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_colors.scss b/gtk/theme/Adwaita/_colors.scss
index c2f8a4d..dab01f9 100644
--- a/gtk/theme/Adwaita/_colors.scss
+++ b/gtk/theme/Adwaita/_colors.scss
@@ -16,7 +16,7 @@ $link_color: if($variant == 'light', darken($selected_bg_color,10%), lighten($se
$link_visited_color: if($variant == 'light', darken($selected_bg_color,20%),
lighten($selected_bg_color,10%));
$top_hilight: $borders_edge;
-$menu_color: mix($bg_color, $base_color, 50%);
+$menu_color: if($variant == 'light', $base_color, mix($bg_color, $base_color, 20%));
$scrollbar_bg_color: darken($bg_color, 7%);
@@ -54,4 +54,4 @@ $backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, 50%);
$backdrop_scrollbar_bg_color: darken($backdrop_bg_color, 3%);
-$backdrop_menu_color: mix($backdrop_bg_color, $backdrop_base_color, 50%);
+$backdrop_menu_color: if($variant == 'light', $backdrop_base_color, mix($backdrop_bg_color,
$backdrop_base_color, 20%));
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index af6b24d..d3c1c56 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2015,12 +2015,12 @@ column-header .titlebar .button.titlebutton,
.menu {
margin: 4px;
padding: 0px;
- background-color: #313434;
+ background-color: #2c2d2d;
border: 1px solid #1c1f1f; }
.csd .menu {
border: none; }
.menu:backdrop {
- background-color: #333636; }
+ background-color: #2f3030; }
.menu .menuitem {
text-shadow: none;
padding: 4px; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index b2acbdd..829536a 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2021,12 +2021,12 @@ column-header .titlebar .button.titlebutton,
.menu {
margin: 4px;
padding: 0px;
- background-color: #f6f6f6;
+ background-color: #ffffff;
border: 1px solid #a1a1a1; }
.csd .menu {
border: none; }
.menu:backdrop {
- background-color: #f6f6f6; }
+ background-color: white; }
.menu .menuitem {
text-shadow: none;
padding: 4px; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]