[gtk+] Adwaita: no edge highlight for backdrop check/radios
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: no edge highlight for backdrop check/radios
- Date: Thu, 21 Aug 2014 13:04:07 +0000 (UTC)
commit 5344f99cdbe17d1eadebb6ffdadd410366ae2246
Author: Jakub Steiner <jimmac gmail com>
Date: Thu Aug 21 15:03:32 2014 +0200
Adwaita: no edge highlight for backdrop check/radios
gtk/resources/theme/Adwaita/_common.scss | 2 +-
gtk/resources/theme/Adwaita/gtk-contained-dark.css | 24 ++++++++++----------
gtk/resources/theme/Adwaita/gtk-contained.css | 24 ++++++++++----------
3 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 4d6d753..04cfe3e 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -1656,7 +1656,7 @@ $asset_suffix: if($variant=='dark', '-dark', '');
.#{$w}#{$s} {
-gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}#{$asset_suffix}.png"),
url("assets/#{$a}#{$as}#{$asset_suffix} 2 png"));
- icon-shadow: 0 1px 0 $borders_edge;
+ icon-shadow: if(str-index($s,"backdrop"), none, 0 1px 0 $borders_edge); //no edge highlight for
:backdrop
}
}
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 330bbdb..f175c17 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1758,11 +1758,11 @@ GtkSwitch {
.check:backdrop {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-dark.png"),
url("assets/checkbox-unchecked-backdrop-dark 2 png"));
- icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
+ icon-shadow: none; }
.check:backdrop:insensitive {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive-dark.png"),
url("assets/checkbox-unchecked-backdrop-insensitive-dark 2 png"));
- icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
+ icon-shadow: none; }
.check:inconsistent {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark 2
png"));
@@ -1778,7 +1778,7 @@ GtkSwitch {
.check:inconsistent:backdrop {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-dark.png"),
url("assets/checkbox-mixed-backdrop-dark 2 png"));
- icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
+ icon-shadow: none; }
.check:inconsistent:insensitive {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"),
url("assets/checkbox-mixed-insensitive-dark 2 png"));
@@ -1786,7 +1786,7 @@ GtkSwitch {
.check:inconsistent:insensitive:backdrop {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive-dark.png"),
url("assets/checkbox-mixed-backdrop-insensitive-dark 2 png"));
- icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
+ icon-shadow: none; }
.check:checked {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark 2
png"));
@@ -1806,11 +1806,11 @@ GtkSwitch {
.check:backdrop:checked {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-dark.png"),
url("assets/checkbox-checked-backdrop-dark 2 png"));
- icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
+ icon-shadow: none; }
.check:backdrop:checked:insensitive {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive-dark.png"),
url("assets/checkbox-checked-backdrop-insensitive-dark 2 png"));
- icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
+ icon-shadow: none; }
.menu .menuitem.check {
icon-shadow: none;
@@ -1860,11 +1860,11 @@ GtkSwitch {
.radio:backdrop {
-gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-dark.png"),
url("assets/radio-unchecked-backdrop-dark 2 png"));
- icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
+ icon-shadow: none; }
.radio:backdrop:insensitive {
-gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive-dark.png"),
url("assets/radio-unchecked-backdrop-insensitive-dark 2 png"));
- icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
+ icon-shadow: none; }
.radio:inconsistent {
-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark 2 png"));
@@ -1880,7 +1880,7 @@ GtkSwitch {
.radio:inconsistent:backdrop {
-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-dark.png"),
url("assets/radio-mixed-backdrop-dark 2 png"));
- icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
+ icon-shadow: none; }
.radio:inconsistent:insensitive {
-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"),
url("assets/radio-mixed-insensitive-dark 2 png"));
@@ -1888,7 +1888,7 @@ GtkSwitch {
.radio:inconsistent:insensitive:backdrop {
-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive-dark.png"),
url("assets/radio-mixed-backdrop-insensitive-dark 2 png"));
- icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
+ icon-shadow: none; }
.radio:checked {
-gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark 2
png"));
@@ -1908,11 +1908,11 @@ GtkSwitch {
.radio:backdrop:checked {
-gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-dark.png"),
url("assets/radio-checked-backdrop-dark 2 png"));
- icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
+ icon-shadow: none; }
.radio:backdrop:checked:insensitive {
-gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive-dark.png"),
url("assets/radio-checked-backdrop-insensitive-dark 2 png"));
- icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
+ icon-shadow: none; }
.menu .menuitem.radio {
icon-shadow: none;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index d88f013..4203fcb 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -1753,11 +1753,11 @@ GtkSwitch {
.check:backdrop {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop.png"),
url("assets/checkbox-unchecked-backdrop 2 png"));
- icon-shadow: 0 1px 0 white; }
+ icon-shadow: none; }
.check:backdrop:insensitive {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive.png"),
url("assets/checkbox-unchecked-backdrop-insensitive 2 png"));
- icon-shadow: 0 1px 0 white; }
+ icon-shadow: none; }
.check:inconsistent {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed 2 png"));
@@ -1773,7 +1773,7 @@ GtkSwitch {
.check:inconsistent:backdrop {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop.png"),
url("assets/checkbox-mixed-backdrop 2 png"));
- icon-shadow: 0 1px 0 white; }
+ icon-shadow: none; }
.check:inconsistent:insensitive {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"),
url("assets/checkbox-mixed-insensitive 2 png"));
@@ -1781,7 +1781,7 @@ GtkSwitch {
.check:inconsistent:insensitive:backdrop {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive.png"),
url("assets/checkbox-mixed-backdrop-insensitive 2 png"));
- icon-shadow: 0 1px 0 white; }
+ icon-shadow: none; }
.check:checked {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked 2 png"));
@@ -1801,11 +1801,11 @@ GtkSwitch {
.check:backdrop:checked {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop.png"),
url("assets/checkbox-checked-backdrop 2 png"));
- icon-shadow: 0 1px 0 white; }
+ icon-shadow: none; }
.check:backdrop:checked:insensitive {
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive.png"),
url("assets/checkbox-checked-backdrop-insensitive 2 png"));
- icon-shadow: 0 1px 0 white; }
+ icon-shadow: none; }
.menu .menuitem.check {
icon-shadow: none;
@@ -1855,11 +1855,11 @@ GtkSwitch {
.radio:backdrop {
-gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop.png"),
url("assets/radio-unchecked-backdrop 2 png"));
- icon-shadow: 0 1px 0 white; }
+ icon-shadow: none; }
.radio:backdrop:insensitive {
-gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive.png"),
url("assets/radio-unchecked-backdrop-insensitive 2 png"));
- icon-shadow: 0 1px 0 white; }
+ icon-shadow: none; }
.radio:inconsistent {
-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed 2 png"));
@@ -1875,7 +1875,7 @@ GtkSwitch {
.radio:inconsistent:backdrop {
-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop.png"), url("assets/radio-mixed-backdrop 2
png"));
- icon-shadow: 0 1px 0 white; }
+ icon-shadow: none; }
.radio:inconsistent:insensitive {
-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"),
url("assets/radio-mixed-insensitive 2 png"));
@@ -1883,7 +1883,7 @@ GtkSwitch {
.radio:inconsistent:insensitive:backdrop {
-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive.png"),
url("assets/radio-mixed-backdrop-insensitive 2 png"));
- icon-shadow: 0 1px 0 white; }
+ icon-shadow: none; }
.radio:checked {
-gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked 2 png"));
@@ -1903,11 +1903,11 @@ GtkSwitch {
.radio:backdrop:checked {
-gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop.png"), url("assets/radio-checked-backdrop
2 png"));
- icon-shadow: 0 1px 0 white; }
+ icon-shadow: none; }
.radio:backdrop:checked:insensitive {
-gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive.png"),
url("assets/radio-checked-backdrop-insensitive 2 png"));
- icon-shadow: 0 1px 0 white; }
+ icon-shadow: none; }
.menu .menuitem.radio {
icon-shadow: none;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]