[gtk+] Adwaita: selection mode buttons to have borders and fill
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: selection mode buttons to have borders and fill
- Date: Tue, 17 Jun 2014 13:56:55 +0000 (UTC)
commit d87d62fe73639973de697aabc9a41e58d9c9d771
Author: Jakub Steiner <jimmac gmail com>
Date: Tue Jun 17 15:55:58 2014 +0200
Adwaita: selection mode buttons to have borders and fill
gtk/resources/theme/Adwaita/_common.scss | 7 +++++--
gtk/resources/theme/Adwaita/_drawing.scss | 2 +-
gtk/resources/theme/Adwaita/gtk-contained-dark.css | 11 ++++++-----
gtk/resources/theme/Adwaita/gtk-contained.css | 11 ++++++-----
4 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 63bfb2b..4b308a1 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -262,7 +262,7 @@
@include button(active,$b_color, white);
}
&:backdrop {
- @include button(backdrop,$b_color);
+ @include button(backdrop,$b_color,white);
&:insensitive {
@include button(backdrop-insensitive);
}
@@ -631,7 +631,10 @@ GtkComboBox {
&:hover { @include button(hover, $selected_bg_color, $selected_fg_color, noedge); }
&:active { @include button(active, $selected_bg_color, $selected_fg_color, noedge); }
&:insensitive { @include button(insensitive, $selected_bg_color, $selected_fg_color, noedge); }
- &:backdrop { @include button(backdrop, $selected_bg_color, $selected_fg_color, noedge); }
+ &:backdrop {
+ @include button(backdrop, $selected_bg_color, $selected_fg_color, noedge);
+ border-color: darken($selected_bg_color, 15%);
+ }
&:backdrop:insensitive { @include button(backdrop-insensitive, $selected_bg_color, $selected_fg_color,
noedge); }
&.suggested-action {
@include button($t:normal, $noedge:true);
diff --git a/gtk/resources/theme/Adwaita/_drawing.scss b/gtk/resources/theme/Adwaita/_drawing.scss
index 1a55b7f..a532051 100644
--- a/gtk/resources/theme/Adwaita/_drawing.scss
+++ b/gtk/resources/theme/Adwaita/_drawing.scss
@@ -238,7 +238,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
//
// backdrop button
//
- color: if($c!=$bg_color, $backdrop_bg_color, $backdrop_fg_color);
+ color: if($c!=$bg_color, $tc, $backdrop_fg_color);
border-color: if($c!=$bg_color, $c, $backdrop_borders_color);
background-image: linear-gradient(to bottom,
if($c!=bg_color,$c,$backdrop_bg_color));
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 2a7614e..51936aa 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -334,7 +334,7 @@
.button.suggested-action:backdrop {
border-width: 1px;
border-style: solid;
- color: #393f3f;
+ color: white;
border-color: #215d9c;
background-image: linear-gradient(to bottom, #215d9c);
text-shadow: none;
@@ -386,7 +386,7 @@
.button.destructive-action:backdrop {
border-width: 1px;
border-style: solid;
- color: #393f3f;
+ color: white;
border-color: #d51010;
background-image: linear-gradient(to bottom, #d51010);
text-shadow: none;
@@ -763,12 +763,13 @@ GtkComboBox {
.header-bar.selection-mode .button:backdrop {
border-width: 1px;
border-style: solid;
- color: #393f3f;
+ color: white;
border-color: #215d9c;
background-image: linear-gradient(to bottom, #215d9c);
text-shadow: none;
icon-shadow: none;
- box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+ box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+ border-color: #14375d; }
.titlebar.selection-mode .button:backdrop:insensitive,
.header-bar.selection-mode .button:backdrop:insensitive {
border-width: 1px;
@@ -2297,7 +2298,7 @@ GtkInfoBar {
.error .button:backdrop {
border-width: 1px;
border-style: solid;
- color: #393f3f;
+ color: white;
border-color: #215d9c;
background-image: linear-gradient(to bottom, #215d9c);
text-shadow: none;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 570ed08..fe83d3e 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -334,7 +334,7 @@
.button.suggested-action:backdrop {
border-width: 1px;
border-style: solid;
- color: #ededed;
+ color: white;
border-color: #4a90d9;
background-image: linear-gradient(to bottom, #4a90d9);
text-shadow: none;
@@ -386,7 +386,7 @@
.button.destructive-action:backdrop {
border-width: 1px;
border-style: solid;
- color: #ededed;
+ color: white;
border-color: #ef2929;
background-image: linear-gradient(to bottom, #ef2929);
text-shadow: none;
@@ -763,12 +763,13 @@ GtkComboBox {
.header-bar.selection-mode .button:backdrop {
border-width: 1px;
border-style: solid;
- color: #ededed;
+ color: white;
border-color: #4a90d9;
background-image: linear-gradient(to bottom, #4a90d9);
text-shadow: none;
icon-shadow: none;
- box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+ box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+ border-color: #256ab1; }
.titlebar.selection-mode .button:backdrop:insensitive,
.header-bar.selection-mode .button:backdrop:insensitive {
border-width: 1px;
@@ -2295,7 +2296,7 @@ GtkInfoBar {
.error .button:backdrop {
border-width: 1px;
border-style: solid;
- color: #ededed;
+ color: white;
border-color: #4a90d9;
background-image: linear-gradient(to bottom, #4a90d9);
text-shadow: none;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]