GNOME.org
 

[gnome-themes-standard] buttons: use SVG assets to render button borders

commit 2407cedcadfeb34db63ba59e07475a17675e214b
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Jun 10 16:11:12 2011 -0400

    buttons: use SVG assets to render button borders

 themes/Adwaita/gtk-3.0/assets/Makefile.am          |    6 +
 .../gtk-3.0/assets/button-active-border-dark.svg   |  139 ++++++++++++++++++
 .../gtk-3.0/assets/button-active-border.svg        |  139 ++++++++++++++++++
 .../Adwaita/gtk-3.0/assets/button-border-dark.svg  |  118 ++++++++++++++++
 themes/Adwaita/gtk-3.0/assets/button-border.svg    |  118 ++++++++++++++++
 .../gtk-3.0/assets/button-default-border-dark.svg  |  139 ++++++++++++++++++
 .../gtk-3.0/assets/button-default-border.svg       |  148 ++++++++++++++++++++
 themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css |   18 +++-
 themes/Adwaita/gtk-3.0/gtk-widgets-assets.css      |   19 +++-
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |    9 +-
 10 files changed, 847 insertions(+), 6 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/assets/Makefile.am b/themes/Adwaita/gtk-3.0/assets/Makefile.am
index b13d3b0..985f266 100644
--- a/themes/Adwaita/gtk-3.0/assets/Makefile.am
+++ b/themes/Adwaita/gtk-3.0/assets/Makefile.am
@@ -1,5 +1,11 @@
 assetsdir = $(datadir)/themes/Adwaita/gtk-3.0/assets
 assets_DATA = 		\
+	button-active-border.svg \
+	button-active-border-dark.svg \
+	button-border.svg \
+	button-border-dark.svg \
+	button-default-border.svg \
+	button-default-border-dark.svg \
 	checkbox-checked.svg \
 	checkbox-checked-dark.svg \
 	checkbox-checked-insensitive.svg \
diff --git a/themes/Adwaita/gtk-3.0/assets/button-active-border-dark.svg b/themes/Adwaita/gtk-3.0/assets/button-active-border-dark.svg
new file mode 100644
index 0000000..28e404a
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/button-active-border-dark.svg
@@ -0,0 +1,139 @@
+<?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-active-border-dark.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="#linearGradient18061"
+       id="linearGradient18002"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6586402,0,0,1.043478,-1831.0118,99.56125)"
+       x1="1016.0043"
+       y1="75.46637"
+       x2="1016.0043"
+       y2="70.674706" />
+    <linearGradient
+       id="linearGradient18061">
+      <stop
+         id="stop18063"
+         offset="0"
+         style="stop-color:#535156;stop-opacity:0.3137255;" />
+      <stop
+         id="stop18065"
+         offset="1"
+         style="stop-color:#333333;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient18061"
+       id="linearGradient34956"
+       x1="7.991971"
+       y1="0.99197102"
+       x2="7.991971"
+       y2="14.999095"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="36.010974"
+     inkscape:cx="10.382845"
+     inkscape:cy="8.4196092"
+     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="2.5000005"
+       rx="2.5000005"
+       y="0.5"
+       x="0.5"
+       height="15"
+       width="15"
+       id="rect17861"
+       style="color:#000000;fill:none;stroke:#111111;stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       ry="1.5556905"
+       rx="1.5556905"
+       y="1.4999998"
+       x="1.4999999"
+       height="13"
+       width="13"
+       id="rect17998"
+       style="opacity:1;fill:none;stroke:url(#linearGradient34956);stroke-width:0.99999981999999998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/button-active-border.svg b/themes/Adwaita/gtk-3.0/assets/button-active-border.svg
new file mode 100644
index 0000000..040f805
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/button-active-border.svg
@@ -0,0 +1,139 @@
+<?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-active-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="#linearGradient18061"
+       id="linearGradient18002"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6586402,0,0,1.043478,-1831.0118,99.56125)"
+       x1="1016.0043"
+       y1="75.46637"
+       x2="1016.0043"
+       y2="70.674706" />
+    <linearGradient
+       id="linearGradient18061">
+      <stop
+         id="stop18063"
+         offset="0"
+         style="stop-color:#fbfcfb;stop-opacity:0.3137255;" />
+      <stop
+         id="stop18065"
+         offset="1"
+         style="stop-color:#dddedd;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient18061"
+       id="linearGradient34956"
+       x1="7.991971"
+       y1="0.99197102"
+       x2="7.991971"
+       y2="14.999095"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="36.010974"
+     inkscape:cx="5.3565994"
+     inkscape:cy="8.4196092"
+     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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       ry="2.5000005"
+       rx="2.5000005"
+       y="0.5"
+       x="0.5"
+       height="15"
+       width="15"
+       id="rect17861"
+       style="color:#000000;fill:none;stroke:#8a8f8a;stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       ry="1.5556905"
+       rx="1.5556905"
+       y="1.4999998"
+       x="1.4999999"
+       height="13"
+       width="13"
+       id="rect17998"
+       style="opacity:1;fill:none;stroke:url(#linearGradient34956);stroke-width:0.99999981999999998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/button-border-dark.svg b/themes/Adwaita/gtk-3.0/assets/button-border-dark.svg
new file mode 100644
index 0000000..a2923ea
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/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="2.5000005"
+       rx="2.5000005"
+       y="0.5"
+       x="0.5"
+       height="15"
+       width="15"
+       id="rect17861"
+       style="color:#000000;fill:none;stroke:#111111;stroke-width:0.99999994000000003;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.99999981999999998;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="1.5042735"
+       ry="1.5042735" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/button-border.svg b/themes/Adwaita/gtk-3.0/assets/button-border.svg
new file mode 100644
index 0000000..5b57ddf
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       ry="2.5000005"
+       rx="2.5000005"
+       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.99999981999999998;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="1.5042735"
+       ry="1.5042735" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/button-default-border-dark.svg b/themes/Adwaita/gtk-3.0/assets/button-default-border-dark.svg
new file mode 100644
index 0000000..a082153
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/button-default-border-dark.svg
@@ -0,0 +1,139 @@
+<?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="svg35020"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="button-default-border-dark.svg">
+  <defs
+     id="defs35022">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5378-2-9-9"
+       id="linearGradient9679-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.59126703,0,0,0.57342363,1458.8717,475.18421)"
+       x1="-17.04915"
+       y1="107.75068"
+       x2="-17.04915"
+       y2="146.99298" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5378-2-9-9">
+      <stop
+         style="stop-color:#f4f6f4;stop-opacity:1"
+         offset="0"
+         id="stop5380-6-274-7" />
+      <stop
+         style="stop-color:#d7dad7;stop-opacity:1"
+         offset="1"
+         id="stop5382-06-25-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10605-2"
+       id="linearGradient10611"
+       x1="1421.5308"
+       y1="558.46887"
+       x2="1421.5308"
+       y2="536.01294"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0090599,0,0,1.0404782,-12.977841,-22.136002)" />
+    <linearGradient
+       id="linearGradient10605-2">
+      <stop
+         style="stop-color:#111111;stop-opacity:1;"
+         offset="0"
+         id="stop10607-5" />
+      <stop
+         style="stop-color:#333333;stop-opacity:0.94117647;"
+         offset="1"
+         id="stop10609-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient18061"
+       id="linearGradient34956"
+       x1="7.991971"
+       y1="0.99197102"
+       x2="7.991971"
+       y2="14.999095"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient18061">
+      <stop
+         id="stop18063"
+         offset="0"
+         style="stop-color:#535156;stop-opacity:1;" />
+      <stop
+         id="stop18065"
+         offset="1"
+         style="stop-color:#333333;stop-opacity:0;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="33.607848"
+     inkscape:cx="6.6534674"
+     inkscape:cy="7.6547082"
+     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="metadata35025">
+    <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="2.3103287"
+       rx="2.4539564"
+       y="1"
+       x="1"
+       height="14"
+       width="14"
+       id="rect9671"
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#111111;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       ry="0.81919247"
+       rx="0.81919247"
+       y="2.5"
+       x="2.5"
+       height="11"
+       width="11"
+       id="rect17998"
+       style="opacity:1;fill:none;stroke:#333333;stroke-width:0.99999987999999995;stroke-miterlimit:4;stroke-opacity:0.50196081;stroke-dasharray:none;display:inline;enable-background:new" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/button-default-border.svg b/themes/Adwaita/gtk-3.0/assets/button-default-border.svg
new file mode 100644
index 0000000..ab65ee5
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/button-default-border.svg
@@ -0,0 +1,148 @@
+<?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="svg35020"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="button-default-border.svg">
+  <defs
+     id="defs35022">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5378-2-9-9"
+       id="linearGradient9679-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.59126703,0,0,0.57342363,1458.8717,475.18421)"
+       x1="-17.04915"
+       y1="107.75068"
+       x2="-17.04915"
+       y2="146.99298" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5378-2-9-9">
+      <stop
+         style="stop-color:#f4f6f4;stop-opacity:1"
+         offset="0"
+         id="stop5380-6-274-7" />
+      <stop
+         style="stop-color:#d7dad7;stop-opacity:1"
+         offset="1"
+         id="stop5382-06-25-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10605-2"
+       id="linearGradient10611"
+       x1="1421.5308"
+       y1="558.46887"
+       x2="1421.5308"
+       y2="536.01294"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0090599,0,0,1.0404782,-12.977841,-22.136002)" />
+    <linearGradient
+       id="linearGradient10605-2">
+      <stop
+         style="stop-color:#a7aba7;stop-opacity:1;"
+         offset="0"
+         id="stop10607-5" />
+      <stop
+         style="stop-color:#c9cbc9;stop-opacity:1"
+         offset="1"
+         id="stop10609-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient18061"
+       id="linearGradient34956"
+       x1="7.991971"
+       y1="0.99197102"
+       x2="7.991971"
+       y2="14.999095"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient18061">
+      <stop
+         id="stop18063"
+         offset="0"
+         style="stop-color:#535156;stop-opacity:1;" />
+      <stop
+         id="stop18065"
+         offset="1"
+         style="stop-color:#333333;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10605-2"
+       id="linearGradient36784"
+       x1="8.010273"
+       y1="13.935586"
+       x2="8.010273"
+       y2="2.0775132"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="33.607848"
+     inkscape:cx="6.6534674"
+     inkscape:cy="7.6547082"
+     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="metadata35025">
+    <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="2.3103287"
+       rx="2.4539564"
+       y="1"
+       x="1"
+       height="14"
+       width="14"
+       id="rect9671"
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient36784);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       ry="0.81919247"
+       rx="0.81919247"
+       y="2.5"
+       x="2.5"
+       height="11"
+       width="11"
+       id="rect17998"
+       style="opacity:1;fill:none;stroke:#ffffff;stroke-width:0.99999987999999995;stroke-miterlimit:4;stroke-opacity:0.50196081;stroke-dasharray:none;display:inline;enable-background:new" />
+  </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 19a3c5a..6e3b9c3 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
@@ -139,7 +139,9 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive {
 }
 
 .primary-toolbar .toolbar .button:active,
-.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-dark.svg") 4 / 4 stretch;
 }
 
@@ -161,3 +163,17 @@ GtkSwitch.slider:active {
     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 39edc36..a8bbdee 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
@@ -91,7 +91,9 @@ GtkScale.progressbar.vertical {
 }
 
 .primary-toolbar .toolbar .button:active,
-.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;
 }
 
@@ -159,3 +161,18 @@ GtkScale.scale-has-marks-below.slider.vertical {
 GtkScale.scale-has-marks-below.slider.vertical:insensitive {
     background-image: url("assets/scale-slider-marks-below-vertical-insensitive.svg");
 }
+
+.button {
+    border-image: url("assets/button-border.svg") 3 / 3 stretch;
+}
+
+.button:active,
+.toolbar .button:active,
+.button:hover:active,
+.toolbar .button:hover:active {
+    border-image: url("assets/button-active-border.svg") 3 / 3 stretch;
+}
+
+.button.default {
+    border-image: url("assets/button-default-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 aa15166..586abdb 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -330,8 +330,8 @@ GtkScrolledWindow.frame {
 
     border-radius: 2;
     border-width: 1;
-    border-color: @button_border;
-    border-style: solid;
+    border-style: none;
+    /* border-image in -assets variant */
 
     background-image: -gtk-gradient (linear,
 				     left top, left bottom,
@@ -355,18 +355,19 @@ GtkScrolledWindow.frame {
     				     left top, left bottom,
                                      from (@button_active_gradient_color_a),
 				     to (alpha (@button_active_gradient_color_b, 0.13)));
-    border-color: @highlighted_border;
 }
 
 .button:insensitive {
     background-image: none;
     background-color: @insensitive_bg_color;
     color: @insensitive_fg_color;
+
+    border-image: none;
+    border-style: solid;
 }
 
 .button.default {
     border-width: 2;
-    border-color: shade (@button_border, 1.10);
 }
 
 /*****************
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]