summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLapo Calamandrei <calamandrei@gmail.com>2014-11-13 18:47:42 +0100
committerLapo Calamandrei <calamandrei@gmail.com>2014-11-13 18:47:42 +0100
commit69c30fda5c2034af58d0ebbbbfea729687813b6f (patch)
tree5254fd0a4b86c184920796692324ee4b5e3ef20a
parent360b516ef4efda1c3a9bb46f35b9c1dcaf9cff80 (diff)
downloadgtk+-69c30fda5c2034af58d0ebbbbfea729687813b6f.tar.gz
Adwaita: reset some properties in the overshoot mixin
Otherwise we may inherit them see: https://bugzilla.gnome.org/show_bug.cgi?id=740011
-rw-r--r--gtk/resources/theme/Adwaita/_drawing.scss4
-rw-r--r--gtk/resources/theme/Adwaita/gtk-contained-dark.css40
-rw-r--r--gtk/resources/theme/Adwaita/gtk-contained.css40
3 files changed, 68 insertions, 16 deletions
diff --git a/gtk/resources/theme/Adwaita/_drawing.scss b/gtk/resources/theme/Adwaita/_drawing.scss
index d9cdfb9200..4a4551b779 100644
--- a/gtk/resources/theme/Adwaita/_drawing.scss
+++ b/gtk/resources/theme/Adwaita/_drawing.scss
@@ -568,4 +568,8 @@
background-repeat: no-repeat;
background-position: $_position;
+
+ background-color: transparent; // reset some properties to be sure to not inherit them somehow
+ border: none; //
+ box-shadow: none; //
}
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 439306ebbb..05fe09a5c5 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -77,42 +77,66 @@
background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1c1f1f), to(rgba(28, 31, 31, 0))), linear-gradient(to bottom, rgba(28, 31, 31, 0.15), rgba(28, 31, 31, 0));
background-size: 100% 4%, 100% 70%;
background-repeat: no-repeat;
- background-position: center top; }
+ background-position: center top;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.overshoot.top:backdrop {
background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
background-size: 100% 4%;
background-repeat: no-repeat;
- background-position: center top; }
+ background-position: center top;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.overshoot.bottom {
background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1c1f1f), to(rgba(28, 31, 31, 0))), linear-gradient(to top, rgba(28, 31, 31, 0.15), rgba(28, 31, 31, 0));
background-size: 100% 4%, 100% 70%;
background-repeat: no-repeat;
- background-position: center bottom; }
+ background-position: center bottom;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.overshoot.bottom:backdrop {
background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
background-size: 100% 4%;
background-repeat: no-repeat;
- background-position: center bottom; }
+ background-position: center bottom;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.overshoot.left {
background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1c1f1f), to(rgba(28, 31, 31, 0))), linear-gradient(to right, rgba(28, 31, 31, 0.15), rgba(28, 31, 31, 0));
background-size: 4% 100%, 70% 100%;
background-repeat: no-repeat;
- background-position: left center; }
+ background-position: left center;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.overshoot.left:backdrop {
background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
background-size: 4% 100%;
background-repeat: no-repeat;
- background-position: left center; }
+ background-position: left center;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.overshoot.right {
background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1c1f1f), to(rgba(28, 31, 31, 0))), linear-gradient(to left, rgba(28, 31, 31, 0.15), rgba(28, 31, 31, 0));
background-size: 4% 100%, 70% 100%;
background-repeat: no-repeat;
- background-position: right center; }
+ background-position: right center;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.overshoot.right:backdrop {
background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
background-size: 4% 100%;
background-repeat: no-repeat;
- background-position: right center; }
+ background-position: right center;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.label.separator, GtkPlacesSidebar.sidebar .view .label.separator {
color: #eeeeec; }
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 8515873395..7ef1d4fc4a 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -77,42 +77,66 @@
background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#a1a1a1), to(rgba(161, 161, 161, 0))), linear-gradient(to bottom, rgba(161, 161, 161, 0.15), rgba(161, 161, 161, 0));
background-size: 100% 4%, 100% 70%;
background-repeat: no-repeat;
- background-position: center top; }
+ background-position: center top;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.overshoot.top:backdrop {
background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#a8a8a8), to(rgba(168, 168, 168, 0)));
background-size: 100% 4%;
background-repeat: no-repeat;
- background-position: center top; }
+ background-position: center top;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.overshoot.bottom {
background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#a1a1a1), to(rgba(161, 161, 161, 0))), linear-gradient(to top, rgba(161, 161, 161, 0.15), rgba(161, 161, 161, 0));
background-size: 100% 4%, 100% 70%;
background-repeat: no-repeat;
- background-position: center bottom; }
+ background-position: center bottom;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.overshoot.bottom:backdrop {
background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#a8a8a8), to(rgba(168, 168, 168, 0)));
background-size: 100% 4%;
background-repeat: no-repeat;
- background-position: center bottom; }
+ background-position: center bottom;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.overshoot.left {
background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#a1a1a1), to(rgba(161, 161, 161, 0))), linear-gradient(to right, rgba(161, 161, 161, 0.15), rgba(161, 161, 161, 0));
background-size: 4% 100%, 70% 100%;
background-repeat: no-repeat;
- background-position: left center; }
+ background-position: left center;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.overshoot.left:backdrop {
background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#a8a8a8), to(rgba(168, 168, 168, 0)));
background-size: 4% 100%;
background-repeat: no-repeat;
- background-position: left center; }
+ background-position: left center;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.overshoot.right {
background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#a1a1a1), to(rgba(161, 161, 161, 0))), linear-gradient(to left, rgba(161, 161, 161, 0.15), rgba(161, 161, 161, 0));
background-size: 4% 100%, 70% 100%;
background-repeat: no-repeat;
- background-position: right center; }
+ background-position: right center;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.overshoot.right:backdrop {
background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#a8a8a8), to(rgba(168, 168, 168, 0)));
background-size: 4% 100%;
background-repeat: no-repeat;
- background-position: right center; }
+ background-position: right center;
+ background-color: transparent;
+ border: none;
+ box-shadow: none; }
.label.separator, GtkPlacesSidebar.sidebar .view .label.separator {
color: #2e3436; }