[gtk+] Adwaita: selection mode and selection menu tweaks
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: selection mode and selection menu tweaks
- Date: Tue, 8 Jul 2014 10:53:01 +0000 (UTC)
commit f15b61421afec49bc1e451f4e4d862484c5a655e
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Tue Jul 8 12:52:25 2014 +0200
Adwaita: selection mode and selection menu tweaks
gtk/resources/theme/Adwaita/_common.scss | 23 +++++++++-------
gtk/resources/theme/Adwaita/gtk-contained-dark.css | 27 +++++++++++--------
gtk/resources/theme/Adwaita/gtk-contained.css | 27 +++++++++++--------
3 files changed, 45 insertions(+), 32 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index e91d0c6..830ca3e 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -730,10 +730,10 @@ GtkComboBox {
border-color: $selected_borders_color;
background-image: linear-gradient(to bottom,
lighten($selected_bg_color,5%),
- lighten($selected_bg_color,2%));
+ $selected_bg_color);
box-shadow: inset 0 -1px mix($selected_borders_color,
- $selected_bg_color, 30%), //bottom shade
- inset 0 1px mix($top_hilight,$selected_bg_color, 70%);
+ $selected_bg_color, 35%), //bottom shade
+ inset 0 1px mix($top_hilight,$selected_bg_color, 60%);
&:backdrop {
background-image: linear-gradient(to bottom, $selected_bg_color);
box-shadow: inset 0 1px mix($top_hilight,$selected_bg_color, 60%);
@@ -781,15 +781,18 @@ GtkComboBox {
}
.selection-menu {
border-color: transparentize($selected_bg_color,1);
- background-image: linear-gradient(to bottom, transparentize($selected_bg_color,1));
+ background-image: linear-gradient(to bottom,
+ transparentize($selected_bg_color,1));
box-shadow: none;
- &:hover {
- $_hover_color: lighten($selected_bg_color,9%);
- border-color: $_hover_color;
- background-image: linear-gradient(to bottom, $_hover_color);
- box-shadow: 0 1px transparentize(black,0.85);
+ padding-left: 10px;
+ padding-right: 10px;
+ GtkArrow { -GtkArrow-arrow-scaling: 1; }
+ .arrow {
+ -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
+ color: transparentize($selected_fg_color,0.5);
+ icon-shadow: none;
}
- &:backdrop, &:backdrop:hover { @extend .selection-menu };
+ &:backdrop { @extend .selection-menu };
}
}
.tiled &, .maximized & {
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 83c6226..56622c6 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -856,8 +856,8 @@ GtkComboBox {
color: #14375d;
text-shadow: 0 1px rgba(0, 0, 0, 0.5);
border-color: #0f2b48;
- background-image: linear-gradient(to bottom, #256ab1, #2362a5);
- box-shadow: inset 0 -1px #1b4e82, inset 0 1px rgba(55, 108, 164, 0.37); }
+ background-image: linear-gradient(to bottom, #256ab1, #215d9c);
+ box-shadow: inset 0 -1px #1a4b7e, inset 0 1px rgba(48, 103, 161, 0.46); }
.titlebar.selection-mode:backdrop,
.header-bar.selection-mode:backdrop {
background-image: linear-gradient(to bottom, #215d9c);
@@ -975,18 +975,23 @@ GtkComboBox {
background-image: linear-gradient(to bottom, #393f3f);
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
border-color: #0f2b48; }
- .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
.titlebar.selection-mode .selection-menu:backdrop:hover,
+ .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
.header-bar.selection-mode .selection-menu,
- .header-bar.selection-mode .selection-menu:backdrop,
- .header-bar.selection-mode .selection-menu:backdrop:hover {
+ .header-bar.selection-mode .selection-menu:backdrop {
border-color: rgba(33, 93, 156, 0);
background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0));
- box-shadow: none; }
- .titlebar.selection-mode .selection-menu:hover,
- .header-bar.selection-mode .selection-menu:hover {
- border-color: #2974c2;
- background-image: linear-gradient(to bottom, #2974c2);
- box-shadow: 0 1px rgba(0, 0, 0, 0.15); }
+ box-shadow: none;
+ padding-left: 10px;
+ padding-right: 10px; }
+ .titlebar.selection-mode .selection-menu GtkArrow, .titlebar.selection-mode .selection-menu:backdrop
GtkArrow,
+ .header-bar.selection-mode .selection-menu GtkArrow,
+ .header-bar.selection-mode .selection-menu:backdrop GtkArrow {
+ -GtkArrow-arrow-scaling: 1; }
+ .titlebar.selection-mode .selection-menu .arrow,
+ .header-bar.selection-mode .selection-menu .arrow {
+ -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+ color: rgba(255, 255, 255, 0.5);
+ icon-shadow: none; }
.tiled .titlebar, .maximized .titlebar, .tiled
.header-bar, .maximized
.header-bar {
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 95d6a69..960e531 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -848,8 +848,8 @@ GtkComboBox {
color: #256ab1;
text-shadow: 0 1px rgba(0, 0, 0, 0.5);
border-color: #184472;
- background-image: linear-gradient(to bottom, #5f9ddd, #5295db);
- box-shadow: inset 0 -1px #3b79ba, inset 0 1px #c8ddf3; }
+ background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9);
+ box-shadow: inset 0 -1px #3875b4, inset 0 1px #b6d2ef; }
.titlebar.selection-mode:backdrop,
.header-bar.selection-mode:backdrop {
background-image: linear-gradient(to bottom, #4a90d9);
@@ -967,18 +967,23 @@ GtkComboBox {
background-image: linear-gradient(to bottom, #ededed);
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
border-color: #184472; }
- .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
.titlebar.selection-mode .selection-menu:backdrop:hover,
+ .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
.header-bar.selection-mode .selection-menu,
- .header-bar.selection-mode .selection-menu:backdrop,
- .header-bar.selection-mode .selection-menu:backdrop:hover {
+ .header-bar.selection-mode .selection-menu:backdrop {
border-color: rgba(74, 144, 217, 0);
background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0));
- box-shadow: none; }
- .titlebar.selection-mode .selection-menu:hover,
- .header-bar.selection-mode .selection-menu:hover {
- border-color: #70a7e1;
- background-image: linear-gradient(to bottom, #70a7e1);
- box-shadow: 0 1px rgba(0, 0, 0, 0.15); }
+ box-shadow: none;
+ padding-left: 10px;
+ padding-right: 10px; }
+ .titlebar.selection-mode .selection-menu GtkArrow, .titlebar.selection-mode .selection-menu:backdrop
GtkArrow,
+ .header-bar.selection-mode .selection-menu GtkArrow,
+ .header-bar.selection-mode .selection-menu:backdrop GtkArrow {
+ -GtkArrow-arrow-scaling: 1; }
+ .titlebar.selection-mode .selection-menu .arrow,
+ .header-bar.selection-mode .selection-menu .arrow {
+ -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+ color: rgba(255, 255, 255, 0.5);
+ icon-shadow: none; }
.tiled .titlebar, .maximized .titlebar, .tiled
.header-bar, .maximized
.header-bar {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]