diff options
author | Lapo Calamandrei <calamandrei@gmail.com> | 2015-09-02 12:05:22 +0200 |
---|---|---|
committer | Lapo Calamandrei <calamandrei@gmail.com> | 2015-09-02 12:06:49 +0200 |
commit | b4da542980730ffa4c7246b43b6efc41ef6df10e (patch) | |
tree | 67eb3e432ebb7fdf1f442a878e9699663037c256 /gtk | |
parent | 4d31b2ca0de8a8e10396b031e3c0a3c6b9948a68 (diff) | |
download | gtk+-b4da542980730ffa4c7246b43b6efc41ef6df10e.tar.gz |
Adwaita: sync sidebar color vars.
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/theme/Adwaita/_colors.scss | 4 | ||||
-rw-r--r-- | gtk/theme/Adwaita/_common.scss | 1 | ||||
-rw-r--r-- | gtk/theme/Adwaita/gtk-contained-dark.css | 2 | ||||
-rw-r--r-- | gtk/theme/Adwaita/gtk-contained.css | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/gtk/theme/Adwaita/_colors.scss b/gtk/theme/Adwaita/_colors.scss index 1479064ecd..52ca0a93dc 100644 --- a/gtk/theme/Adwaita/_colors.scss +++ b/gtk/theme/Adwaita/_colors.scss @@ -30,7 +30,7 @@ $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_col $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%); $osd_borders_color: transparentize(black, 0.3); -$sidebar_bg_color: lighten($bg_color, 2%); +$sidebar_bg_color: mix($bg_color, $base_color, 50%); $tooltip_borders_color: transparentize(white, 0.9); @@ -48,6 +48,6 @@ $backdrop_insensitive_color: if($variant == 'light', darken($backdrop_bg_color, $backdrop_selected_fg_color: $selected_fg_color; $backdrop_borders_color: mix($borders_color, $bg_color, 90%); $backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, 35%); -$backdrop_sidebar_bg_color: lighten($backdrop_bg_color, 2%); +$backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, 50%); $backdrop_scrollbar_bg_color: darken($backdrop_bg_color, 3%); diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 8abf21a639..eb7e414344 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2882,7 +2882,6 @@ GtkFileChooserDialog { .sidebar { border: none; - // Popover background color background-color: mix($bg_color, $base_color, 50%); &:backdrop { diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 553d4a8fe7..e6685db546 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -3946,7 +3946,7 @@ GtkFileChooserDialog .dialog-action-box { border: none; background-color: #313434; } .sidebar:backdrop { - background-color: #3e4444; } + background-color: #333636; } GtkSidebarRow.list-row { padding: 0px; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index b9cf139d47..86ebc217ce 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -4118,7 +4118,7 @@ GtkFileChooserDialog .dialog-action-box { border: none; background-color: #f6f6f6; } .sidebar:backdrop { - background-color: #f2f2f2; } + background-color: #f6f6f6; } GtkSidebarRow.list-row { padding: 0px; } |