[gnome-themes-standard] buttons: add a primary-toolbar raised variant of the button border
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard] buttons: add a primary-toolbar raised variant of the button border
- Date: Fri, 10 Jun 2011 20:25:13 +0000 (UTC)
commit cb3b22a8f43a3344a3ecb129095c3457929ebae5
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Fri Jun 10 16:24:15 2011 -0400
buttons: add a primary-toolbar raised variant of the button border
themes/Adwaita/gtk-3.0/assets/Makefile.am | 2 +
.../primary-toolbar-raised-button-border-dark.svg | 118 ++++++++++++++++++++
.../primary-toolbar-raised-button-border.svg | 118 ++++++++++++++++++++
themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css | 35 ++++---
themes/Adwaita/gtk-3.0/gtk-widgets-assets.css | 19 ++-
themes/Adwaita/gtk-3.0/gtk-widgets.css | 15 +--
6 files changed, 276 insertions(+), 31 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/assets/Makefile.am b/themes/Adwaita/gtk-3.0/assets/Makefile.am
index 985f266..27c5a01 100644
--- a/themes/Adwaita/gtk-3.0/assets/Makefile.am
+++ b/themes/Adwaita/gtk-3.0/assets/Makefile.am
@@ -24,6 +24,8 @@ assets_DATA = \
entry-border-normal-dark.svg \
primary-toolbar-button-active-border.svg \
primary-toolbar-button-active-border-dark.svg \
+ primary-toolbar-raised-button-border.svg \
+ primary-toolbar-raised-button-border-dark.svg \
progressbar-border.svg \
radio-selected.svg \
radio-selected-dark.svg \
diff --git a/themes/Adwaita/gtk-3.0/assets/primary-toolbar-raised-button-border-dark.svg b/themes/Adwaita/gtk-3.0/assets/primary-toolbar-raised-button-border-dark.svg
new file mode 100644
index 0000000..64a0541
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/primary-toolbar-raised-button-border-dark.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16px"
+ height="16px"
+ id="svg33222"
+ version="1.1"
+ inkscape:version="0.48.1 r9760"
+ sodipodi:docname="button-border-dark.svg">
+ <defs
+ id="defs33224">
+ <linearGradient
+ id="linearGradient4410-4-9-7-9">
+ <stop
+ style="stop-color:#535156;stop-opacity:1;"
+ offset="0"
+ id="stop4412-6-7-4-4" />
+ <stop
+ style="stop-color:#333333;stop-opacity:1;"
+ offset="1"
+ id="stop4414-9-8-8-8" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5378-2-93"
+ id="linearGradient17869"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.59659086,0,0,0.59090912,-423.94512,-57.054903)"
+ x1="220"
+ y1="304"
+ x2="220"
+ y2="336.06244" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5378-2-93">
+ <stop
+ style="stop-color:#f4f6f4;stop-opacity:1"
+ offset="0"
+ id="stop5380-6-3" />
+ <stop
+ style="stop-color:#d7dad7;stop-opacity:1"
+ offset="1"
+ id="stop5382-06-2" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4410-4-9-7-9"
+ id="linearGradient34952"
+ x1="7.9695358"
+ y1="0.96953601"
+ x2="7.9695358"
+ y2="14.937024"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="31.357231"
+ inkscape:cx="7.284836"
+ inkscape:cy="8.7791051"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="743"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata33227">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <rect
+ ry="3.0102491"
+ rx="3.0102491"
+ y="0.5"
+ x="0.5"
+ height="15"
+ width="15"
+ id="rect17861"
+ style="color:#000000;fill:none;stroke:#111111;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ style="fill:none;stroke:url(#linearGradient34952);stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+ id="rect17867"
+ width="13"
+ height="13"
+ x="1.4999999"
+ y="1.5000001"
+ rx="2.0145226"
+ ry="2.0145226" />
+ </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/primary-toolbar-raised-button-border.svg b/themes/Adwaita/gtk-3.0/assets/primary-toolbar-raised-button-border.svg
new file mode 100644
index 0000000..53ed0fe
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/primary-toolbar-raised-button-border.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16px"
+ height="16px"
+ id="svg33222"
+ version="1.1"
+ inkscape:version="0.48.1 r9760"
+ sodipodi:docname="button-border.svg">
+ <defs
+ id="defs33224">
+ <linearGradient
+ id="linearGradient4410-4-9-7-9">
+ <stop
+ style="stop-color:#fbfcfb;stop-opacity:1;"
+ offset="0"
+ id="stop4412-6-7-4-4" />
+ <stop
+ style="stop-color: rgb(221, 222, 221); stop-opacity: 1;"
+ offset="1"
+ id="stop4414-9-8-8-8" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5378-2-93"
+ id="linearGradient17869"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.59659086,0,0,0.59090912,-423.94512,-57.054903)"
+ x1="220"
+ y1="304"
+ x2="220"
+ y2="336.06244" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5378-2-93">
+ <stop
+ style="stop-color:#f4f6f4;stop-opacity:1"
+ offset="0"
+ id="stop5380-6-3" />
+ <stop
+ style="stop-color:#d7dad7;stop-opacity:1"
+ offset="1"
+ id="stop5382-06-2" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4410-4-9-7-9"
+ id="linearGradient34952"
+ x1="7.9695358"
+ y1="0.96953601"
+ x2="7.9695358"
+ y2="14.937024"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="31.357231"
+ inkscape:cx="7.284836"
+ inkscape:cy="8.7791051"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="743"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata33227">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <rect
+ ry="3.9669662"
+ rx="3.9669662"
+ y="0.5"
+ x="0.5"
+ height="15"
+ width="15"
+ id="rect17861"
+ style="color:#000000;fill:none;stroke:#a7aba7;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ style="fill:none;stroke:url(#linearGradient34952);stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+ id="rect17867"
+ width="13"
+ height="13"
+ x="1.4999999"
+ y="1.5000001"
+ rx="2.9712396"
+ ry="2.9712396" />
+ </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
index 6e3b9c3..a3f3469 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
@@ -138,6 +138,21 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive {
background-image: url("assets/scale-slider-marks-below-vertical-insensitive-dark.svg");
}
+.button {
+ border-image: url("assets/button-border-dark.svg") 3 / 3 stretch;
+}
+
+.button:active,
+.toolbar .button:active,
+.button:hover:active,
+.toolbar .button:hover:active {
+ border-image: url("assets/button-active-border-dark.svg") 3 / 3 stretch;
+}
+
+.button.default {
+ border-image: url("assets/button-default-border-dark.svg") 4 / 4 stretch;
+}
+
.primary-toolbar .toolbar .button:active,
.primary-toolbar.toolbar .button:active,
.primary-toolbar .toolbar .button:active:hover,
@@ -145,6 +160,11 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive {
border-image: url("assets/primary-toolbar-button-active-border-dark.svg") 4 / 4 stretch;
}
+.primary-toolbar .toolbar .raised .button,
+.primary-toolbar.toolbar .raised .button {
+ border-image: url("assets/primary-toolbar-raised-button-border-dark.svg") 4 / 4 stretch;
+}
+
/* TODO: need dark versions */
GtkSwitch.slider {
border-image: url("assets/switch-slider-border.svg") 2 / 2 stretch;
@@ -162,18 +182,3 @@ GtkSwitch.slider:active {
.progressbar row:selected:focused {
border-image: url("assets/progressbar-border.svg") 2 / 2 stretch;
}
-
-.button {
- border-image: url("assets/button-border-dark.svg") 3 / 3 stretch;
-}
-
-.button:active,
-.toolbar .button:active,
-.button:hover:active,
-.toolbar .button:hover:active {
- border-image: url("assets/button-active-border-dark.svg") 3 / 3 stretch;
-}
-
-.button.default {
- border-image: url("assets/button-default-border-dark.svg") 4 / 4 stretch;
-}
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
index a8bbdee..b1b8abb 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
@@ -90,13 +90,6 @@ GtkScale.progressbar.vertical {
border-image: url("assets/trough-active-border-vertical.svg") 2 / 2 stretch;
}
-.primary-toolbar .toolbar .button:active,
-.primary-toolbar.toolbar .button:active,
-.primary-toolbar .toolbar .button:active:hover,
-.primary-toolbar.toolbar .button:active:hover {
- border-image: url("assets/primary-toolbar-button-active-border.svg") 4 / 4 stretch;
-}
-
GtkSwitch.slider {
border-image: url("assets/switch-slider-border.svg") 2 / 2 stretch;
}
@@ -176,3 +169,15 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive {
.button.default {
border-image: url("assets/button-default-border.svg") 4 / 4 stretch;
}
+
+.primary-toolbar .toolbar .button:active,
+.primary-toolbar.toolbar .button:active,
+.primary-toolbar .toolbar .button:active:hover,
+.primary-toolbar.toolbar .button:active:hover {
+ border-image: url("assets/primary-toolbar-button-active-border.svg") 4 / 4 stretch;
+}
+
+.primary-toolbar .toolbar .raised .button,
+.primary-toolbar.toolbar .raised .button {
+ border-image: url("assets/primary-toolbar-raised-button-border.svg") 4 / 4 stretch;
+}
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 586abdb..316807c 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -726,6 +726,7 @@ GtkTreeMenu .menuitem * {
.primary-toolbar .toolbar .button,
.primary-toolbar.toolbar .button {
border-style: none;
+ border-image: none;
border-radius: 4;
background-image: none;
@@ -816,7 +817,7 @@ GtkTreeMenu .menuitem * {
.primary-toolbar .toolbar .raised .button,
.primary-toolbar.toolbar .raised .button {
border-width: 1;
- border-style: solid;
+ border-style: none;
background-image: -gtk-gradient (linear,
left top, left bottom,
@@ -848,10 +849,6 @@ GtkTreeMenu .menuitem * {
from (@button_active_gradient_color_a),
to (alpha (@button_active_gradient_color_b, 0.13)));
background-color: @theme_base_color;
-
- border-color: @highlighted_border;
- border-width: 1;
- border-style: solid;
}
.primary-toolbar .toolbar .raised .button:insensitive:active,
@@ -1075,10 +1072,10 @@ column-header .button {
border-radius: 0;
border-style: solid;
- -adwaita-border-gradient: -gtk-gradient(linear,
- left top, left bottom,
- from(@button_border),
- to(shade (@button_border, 1.23)));
+ border-image: -gtk-gradient(linear,
+ left top, left bottom,
+ from(@button_border),
+ to(shade (@button_border, 1.23))) 1 stretch;
}
column-header .button GtkArrow {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
