[gnome-themes-standard/lapo-work] Widget theme: first stab at the dark theme rebuild.
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard/lapo-work] Widget theme: first stab at the dark theme rebuild.
- Date: Mon, 21 Nov 2011 22:22:37 +0000 (UTC)
commit 4f7537f2494c6d1792aa3c7a38f2496f73150948
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Mon Nov 21 23:22:17 2011 +0100
Widget theme: first stab at the dark theme rebuild.
.../Adwaita/gtk-3.0/borders/button-border-dark.svg | 43 ++----
.../gtk-3.0/borders/button-border-focused-dark.svg | 20 ++--
.../gtk-3.0/borders/generic-border-dark.svg | 47 +++---
.../borders/generic-border-focused-dark.svg | 123 +++++++---------
.../borders/primary-toolbar-button-border-dark.svg | 65 ++-------
.../primary-toolbar-button-border-focused-dark.svg | 45 ++----
.../primary-toolbar-generic-border-dark.svg | 136 ++++-------------
...primary-toolbar-generic-border-focused-dark.svg | 45 ++----
themes/Adwaita/gtk-3.0/gnome-applications.css | 10 +-
themes/Adwaita/gtk-3.0/gtk-dark.css | 12 +-
themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css | 71 +---------
.../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css | 161 ++++++++++++++++++++
themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 9 -
.../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css | 11 ++-
themes/Adwaita/gtk-3.0/gtk-widgets.css | 9 +-
themes/Adwaita/gtk-3.0/gtk.css | 3 +-
16 files changed, 354 insertions(+), 456 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/borders/button-border-dark.svg b/themes/Adwaita/gtk-3.0/borders/button-border-dark.svg
index 2129edf..ff93c84 100644
--- a/themes/Adwaita/gtk-3.0/borders/button-border-dark.svg
+++ b/themes/Adwaita/gtk-3.0/borders/button-border-dark.svg
@@ -15,22 +15,10 @@
id="svg33222"
version="1.1"
inkscape:version="0.48.1 r9760"
- sodipodi:docname="lapo-border-hilight.svg">
+ sodipodi:docname="button-border-dark.svg">
<defs
id="defs33224">
<linearGradient
- inkscape:collect="always"
- id="linearGradient3845">
- <stop
- style="stop-color:#b2b6b2;stop-opacity:1"
- offset="0"
- id="stop3847" />
- <stop
- style="stop-color:#bdbfbd;stop-opacity:1"
- offset="1"
- id="stop3849" />
- </linearGradient>
- <linearGradient
id="linearGradient3837">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
@@ -50,15 +38,6 @@
x2="7.999999"
y2="14.003025"
gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3845"
- id="linearGradient3851"
- x1="8.0000019"
- y1="1.5371597"
- x2="8.000001"
- y2="13.462841"
- gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
@@ -68,17 +47,17 @@
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:zoom="16"
- inkscape:cx="15.68732"
- inkscape:cy="9.5803639"
+ inkscape:cx="15.81232"
+ inkscape:cy="7.0803639"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
- inkscape:window-width="1920"
- inkscape:window-height="1022"
- inkscape:window-x="-10"
- inkscape:window-y="18"
- inkscape:window-maximized="1"
+ inkscape:window-width="611"
+ inkscape:window-height="438"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="0"
inkscape:snap-nodes="false"
inkscape:snap-bbox="true"
inkscape:showpageshadow="false"
@@ -108,7 +87,7 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
- style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.8"
+ style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.1"
d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4"
id="rect17861-5"
inkscape:connector-curvature="0"
@@ -121,7 +100,7 @@
height="13.999999"
width="15"
id="rect17861"
- style="color:#000000;fill:none;stroke:url(#linearGradient3851);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:none;stroke:#24282a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
ry="1.5"
rx="1.5"
@@ -130,6 +109,6 @@
height="12"
width="13.000001"
id="rect17861-6"
- style="color:#000000;fill:none;stroke:url(#linearGradient3843);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.8" />
+ style="color:#000000;fill:none;stroke:url(#linearGradient3843);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.1" />
</g>
</svg>
diff --git a/themes/Adwaita/gtk-3.0/borders/button-border-focused-dark.svg b/themes/Adwaita/gtk-3.0/borders/button-border-focused-dark.svg
index ad8abbf..b93accd 100644
--- a/themes/Adwaita/gtk-3.0/borders/button-border-focused-dark.svg
+++ b/themes/Adwaita/gtk-3.0/borders/button-border-focused-dark.svg
@@ -15,7 +15,7 @@
id="svg33222"
version="1.1"
inkscape:version="0.48.1 r9760"
- sodipodi:docname="button-border.svg">
+ sodipodi:docname="button-border-focused-dark.svg">
<defs
id="defs33224">
<linearGradient
@@ -48,16 +48,16 @@
inkscape:pageshadow="2"
inkscape:zoom="16"
inkscape:cx="15.81232"
- inkscape:cy="9.5803639"
+ inkscape:cy="7.0803639"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
- inkscape:window-width="1920"
- inkscape:window-height="1022"
- inkscape:window-x="-10"
- inkscape:window-y="18"
- inkscape:window-maximized="1"
+ inkscape:window-width="829"
+ inkscape:window-height="662"
+ inkscape:window-x="625"
+ inkscape:window-y="325"
+ inkscape:window-maximized="0"
inkscape:snap-nodes="false"
inkscape:snap-bbox="true"
inkscape:showpageshadow="false"
@@ -87,7 +87,7 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
- style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.8"
+ style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.1"
d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4"
id="rect17861-5"
inkscape:connector-curvature="0"
@@ -100,7 +100,7 @@
height="13.999999"
width="15"
id="rect17861"
- style="color:#000000;fill:none;stroke:#729fcf;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:none;stroke:#3465a4;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
ry="1.5"
rx="1.5"
@@ -109,6 +109,6 @@
height="12"
width="13.000001"
id="rect17861-6"
- style="color:#000000;fill:none;stroke:url(#linearGradient3843);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.8" />
+ style="color:#000000;fill:none;stroke:url(#linearGradient3843);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.1" />
</g>
</svg>
diff --git a/themes/Adwaita/gtk-3.0/borders/generic-border-dark.svg b/themes/Adwaita/gtk-3.0/borders/generic-border-dark.svg
index 113fc52..15ea100 100644
--- a/themes/Adwaita/gtk-3.0/borders/generic-border-dark.svg
+++ b/themes/Adwaita/gtk-3.0/borders/generic-border-dark.svg
@@ -15,29 +15,28 @@
id="svg33222"
version="1.1"
inkscape:version="0.48.1 r9760"
- sodipodi:docname="lapo-border.svg">
+ sodipodi:docname="button-border-dark.svg">
<defs
id="defs33224">
<linearGradient
- inkscape:collect="always"
- id="linearGradient3845">
+ id="linearGradient3837">
<stop
- style="stop-color:#b2b6b2;stop-opacity:1"
+ style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
- id="stop3847" />
+ id="stop3839" />
<stop
- style="stop-color:#bdbfbd;stop-opacity:1"
+ style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
- id="stop3849" />
+ id="stop3841" />
</linearGradient>
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient3845"
- id="linearGradient3851"
- x1="8.0000019"
- y1="1.5371597"
- x2="8.000001"
- y2="13.462841"
+ xlink:href="#linearGradient3837"
+ id="linearGradient3843"
+ x1="7.999999"
+ y1="1.92503"
+ x2="7.999999"
+ y2="14.003025"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
@@ -47,18 +46,18 @@
borderopacity="1.0"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="9.2973179"
- inkscape:cy="4.0866946"
+ inkscape:zoom="16"
+ inkscape:cx="15.81232"
+ inkscape:cy="7.0803639"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
- inkscape:window-width="1920"
- inkscape:window-height="1022"
- inkscape:window-x="-10"
- inkscape:window-y="18"
- inkscape:window-maximized="1"
+ inkscape:window-width="611"
+ inkscape:window-height="438"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="0"
inkscape:snap-nodes="false"
inkscape:snap-bbox="true"
inkscape:showpageshadow="false"
@@ -79,7 +78,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -88,7 +87,7 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
- style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.8"
+ style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.1"
d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4"
id="rect17861-5"
inkscape:connector-curvature="0"
@@ -101,6 +100,6 @@
height="13.999999"
width="15"
id="rect17861"
- style="color:#000000;fill:none;stroke:url(#linearGradient3851);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:none;stroke:#24282a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
</svg>
diff --git a/themes/Adwaita/gtk-3.0/borders/generic-border-focused-dark.svg b/themes/Adwaita/gtk-3.0/borders/generic-border-focused-dark.svg
index 328b7c5..b4ac003 100644
--- a/themes/Adwaita/gtk-3.0/borders/generic-border-focused-dark.svg
+++ b/themes/Adwaita/gtk-3.0/borders/generic-border-focused-dark.svg
@@ -7,96 +7,77 @@
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";
- height="16px"
width="16px"
+ height="16px"
+ id="svg33222"
version="1.1"
- id="svg2"
inkscape:version="0.48.1 r9760"
- sodipodi:docname="lapo-border-focused.svg">
+ sodipodi:docname="generic-border-dark-focused.svg">
<defs
- id="defs12">
- <linearGradient
- id="linearGradient3006">
- <stop
- id="stop3008"
- offset="0"
- style="stop-color:#729fcf;stop-opacity:1" />
- <stop
- id="stop3010"
- offset="1"
- style="stop-color:#9ebdde;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3845"
- id="linearGradient3851"
- x1="8.0000019"
- y1="1.5371597"
- x2="8.000001"
- y2="13.462841"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient3845">
- <stop
- style="stop-color:#b2b6b2;stop-opacity:1"
- offset="0"
- id="stop3847" />
- <stop
- style="stop-color:#bdbfbd;stop-opacity:1"
- offset="1"
- id="stop3849" />
- </linearGradient>
- </defs>
+ id="defs33224" />
<sodipodi:namedview
- pagecolor="#ffffff"
+ id="base"
+ pagecolor="#8e8e8e"
bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
inkscape:pageshadow="2"
- inkscape:window-width="1004"
- inkscape:window-height="817"
- id="namedview10"
+ inkscape:zoom="16"
+ inkscape:cx="15.81232"
+ inkscape:cy="7.0803639"
+ inkscape:current-layer="layer1"
showgrid="false"
- inkscape:zoom="17.625"
- inkscape:cx="8.3404256"
- inkscape:cy="8"
- inkscape:window-x="0"
- inkscape:window-y="26"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="829"
+ inkscape:window-height="662"
+ inkscape:window-x="625"
+ inkscape:window-y="325"
inkscape:window-maximized="0"
- inkscape:current-layer="svg2" />
+ inkscape:snap-nodes="false"
+ inkscape:snap-bbox="true"
+ inkscape:showpageshadow="false"
+ showborder="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2992"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
<metadata
- id="metadata4">
+ 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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
- <path
- style="enable-background:accumulate;color:#000000;stroke:#ffffff;stroke-opacity:1;opacity:0.8"
- d="m15.5,4,0,9c0,1.385-1.115,2.5-2.5,2.5h-10c-1.385,0-2.5-1.115-2.5-2.5v-9"
- stroke="#f5f5f5"
- stroke-miterlimit="4"
- stroke-width="1"
- fill="none"
- id="path6" />
- <rect
- ry="2.5"
- rx="2.5000005"
- y="0.5"
- x="0.5"
- height="13.999999"
- width="15"
- id="rect17861"
- style="color:#000000;fill:none;stroke:#729fcf;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+ style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.1"
+ d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4"
+ id="rect17861-5"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssssc" />
+ <rect
+ ry="2.5"
+ rx="2.5000005"
+ y="0.5"
+ x="0.5"
+ height="13.999999"
+ width="15"
+ id="rect17861"
+ style="color:#000000;fill:none;stroke:#3465a4;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ </g>
</svg>
diff --git a/themes/Adwaita/gtk-3.0/borders/primary-toolbar-button-border-dark.svg b/themes/Adwaita/gtk-3.0/borders/primary-toolbar-button-border-dark.svg
index f9733ea..4aacf10 100644
--- a/themes/Adwaita/gtk-3.0/borders/primary-toolbar-button-border-dark.svg
+++ b/themes/Adwaita/gtk-3.0/borders/primary-toolbar-button-border-dark.svg
@@ -15,53 +15,10 @@
id="svg33222"
version="1.1"
inkscape:version="0.48.1 r9760"
- sodipodi:docname="lapo-toolbar-border-hilight.svg">
+ sodipodi:docname="primary-toolbar-button-border.svg">
<defs
id="defs33224">
<linearGradient
- id="linearGradient3826">
- <stop
- id="stop3828"
- offset="0"
- style="stop-color:#000000;stop-opacity:0.051" />
- <stop
- id="stop3830"
- offset="1"
- style="stop-color:#ffffff;stop-opacity:0.502" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient3845">
- <stop
- style="stop-color:#898f89;stop-opacity:1"
- offset="0"
- id="stop3847" />
- <stop
- style="stop-color:#bdbfbd;stop-opacity:1"
- offset="1"
- id="stop3849" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3845"
- id="linearGradient3851"
- x1="8.0000019"
- y1="1.5371597"
- x2="8.000001"
- y2="13.462841"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.86666667,0,0,0.92857148,1.0666667,1.0357143)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3826"
- id="linearGradient3851-3"
- x1="8.0000019"
- y1="1.5371597"
- x2="8.000001"
- y2="13.462841"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.86666667,0,0,0.92857148,1.0666667,1.0357143)" />
- <linearGradient
id="linearGradient3837">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
@@ -87,11 +44,11 @@
<stop
id="stop3828-2"
offset="0"
- style="stop-color:#adada4;stop-opacity:1" />
+ style="stop-color:#000000;stop-opacity:1" />
<stop
id="stop3830-6"
offset="1"
- style="stop-color:#ebebea;stop-opacity:1" />
+ style="stop-color:#ffffff;stop-opacity:1" />
</linearGradient>
<linearGradient
y2="13.462841"
@@ -111,17 +68,17 @@
borderopacity="1.0"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
- inkscape:zoom="22.627417"
- inkscape:cx="9.1640121"
- inkscape:cy="7.1218558"
+ inkscape:zoom="16"
+ inkscape:cx="14.265702"
+ inkscape:cy="4.7605794"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1920"
inkscape:window-height="1022"
- inkscape:window-x="-10"
- inkscape:window-y="18"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
inkscape:window-maximized="1"
inkscape:snap-nodes="false"
inkscape:snap-bbox="true"
@@ -159,7 +116,7 @@
height="14.499999"
width="14.499999"
id="rect17861-9"
- style="color:#000000;fill:none;stroke:url(#linearGradient3880);stroke-width:1.5;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" />
+ style="color:#000000;fill:none;stroke:url(#linearGradient3880);stroke-width:1.50000000000000000;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;opacity:0.1" />
<rect
ry="2.5"
rx="2.5"
@@ -168,7 +125,7 @@
height="13"
width="13"
id="rect17861"
- style="color:#000000;fill:none;stroke:url(#linearGradient3851);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:none;stroke:#24282a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0" />
<rect
ry="1.5"
rx="1.5"
@@ -177,6 +134,6 @@
height="11"
width="11"
id="rect17861-6"
- style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient3864);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="opacity:0.1;color:#000000;fill:none;stroke:url(#linearGradient3864);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
</svg>
diff --git a/themes/Adwaita/gtk-3.0/borders/primary-toolbar-button-border-focused-dark.svg b/themes/Adwaita/gtk-3.0/borders/primary-toolbar-button-border-focused-dark.svg
index ba18f7d..643d307 100644
--- a/themes/Adwaita/gtk-3.0/borders/primary-toolbar-button-border-focused-dark.svg
+++ b/themes/Adwaita/gtk-3.0/borders/primary-toolbar-button-border-focused-dark.svg
@@ -15,31 +15,10 @@
id="svg33222"
version="1.1"
inkscape:version="0.48.1 r9760"
- sodipodi:docname="primary-toolbar-button-border-focused.svg">
+ sodipodi:docname="primary-toolbar-button-border-dark.svg">
<defs
id="defs33224">
<linearGradient
- id="linearGradient3826">
- <stop
- id="stop3828"
- offset="0"
- style="stop-color:#000000;stop-opacity:0.051" />
- <stop
- id="stop3830"
- offset="1"
- style="stop-color:#ffffff;stop-opacity:0.502" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3826"
- id="linearGradient3851-3"
- x1="8.0000019"
- y1="1.5371597"
- x2="8.000001"
- y2="13.462841"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.86666667,0,0,0.92857148,1.0666667,1.0357143)" />
- <linearGradient
id="linearGradient3837">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
@@ -65,11 +44,11 @@
<stop
id="stop3828-2"
offset="0"
- style="stop-color:#adada4;stop-opacity:1" />
+ style="stop-color:#000000;stop-opacity:1" />
<stop
id="stop3830-6"
offset="1"
- style="stop-color:#ebebea;stop-opacity:1" />
+ style="stop-color:#ffffff;stop-opacity:1" />
</linearGradient>
<linearGradient
y2="13.462841"
@@ -89,17 +68,17 @@
borderopacity="1.0"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
- inkscape:zoom="22.627417"
- inkscape:cx="9.2524004"
- inkscape:cy="7.1218558"
+ inkscape:zoom="16"
+ inkscape:cx="14.390702"
+ inkscape:cy="4.7605794"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1920"
inkscape:window-height="1022"
- inkscape:window-x="-10"
- inkscape:window-y="18"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
inkscape:window-maximized="1"
inkscape:snap-nodes="false"
inkscape:snap-bbox="true"
@@ -121,7 +100,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -137,7 +116,7 @@
height="14.499999"
width="14.499999"
id="rect17861-9"
- style="color:#000000;fill:none;stroke:url(#linearGradient3880);stroke-width:1.5;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" />
+ style="color:#000000;fill:none;stroke:url(#linearGradient3880);stroke-width:1.50000000000000000;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;opacity:0.1" />
<rect
ry="2.5"
rx="2.5"
@@ -146,7 +125,7 @@
height="13"
width="13"
id="rect17861"
- style="color:#000000;fill:none;stroke:#729fcf;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:none;stroke:#3465a4;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0" />
<rect
ry="1.5"
rx="1.5"
@@ -155,6 +134,6 @@
height="11"
width="11"
id="rect17861-6"
- style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient3864);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="opacity:0.1;color:#000000;fill:none;stroke:url(#linearGradient3864);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
</svg>
diff --git a/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-dark.svg b/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-dark.svg
index a8a62ca..332638b 100644
--- a/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-dark.svg
+++ b/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-dark.svg
@@ -15,121 +15,50 @@
id="svg33222"
version="1.1"
inkscape:version="0.48.1 r9760"
- sodipodi:docname="lapo-toolbar-border.svg">
+ sodipodi:docname="primary-toolbar-button-border.svg">
<defs
id="defs33224">
<linearGradient
- id="linearGradient3787">
+ id="linearGradient3837">
<stop
- style="stop-color:#adada2;stop-opacity:1"
+ style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
- id="stop3789" />
+ id="stop3839" />
<stop
- id="stop3797"
- offset="0.09922171"
- style="stop-color:#b5b5ac;stop-opacity:1;" />
- <stop
- id="stop3795"
- offset="0.88905489"
- style="stop-color:#d7d7d5;stop-opacity:1" />
- <stop
- style="stop-color:#e0e0de;stop-opacity:1"
- offset="1"
- id="stop3791" />
- </linearGradient>
- <linearGradient
- id="linearGradient3826">
- <stop
- id="stop3828"
- offset="0"
- style="stop-color:#adada4;stop-opacity:1" />
- <stop
- id="stop3830"
- offset="1"
- style="stop-color:#ebebea;stop-opacity:1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3845">
- <stop
- style="stop-color:#898f89;stop-opacity:1"
- offset="0"
- id="stop3847" />
- <stop
- style="stop-color:#bdbfbd;stop-opacity:1"
+ style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
- id="stop3849" />
+ id="stop3841" />
</linearGradient>
<linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3845"
- id="linearGradient3851"
- x1="8.0000019"
- y1="1.5371597"
- x2="8.000001"
- y2="13.462841"
+ gradientTransform="matrix(0.84615379,0,0,0.91666667,1.2307694,1.125)"
+ y2="14.003025"
+ x2="7.999999"
+ y1="1.92503"
+ x1="7.999999"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.86666667,0,0,0.92857148,1.0666667,1.0357143)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3826"
- id="linearGradient3851-3"
- x1="8.0000019"
- y1="1.5371597"
- x2="8.000001"
- y2="13.462841"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.86666667,0,0,0.92857148,1.0666667,1.0357143)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3787"
- id="linearGradient3793"
- x1="102"
- y1="-17.531641"
- x2="108"
- y2="2.46875"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(10.75,0,0,1,-1176,0)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3845-6"
- id="linearGradient3851-8"
- x1="8.0000019"
- y1="1.5371597"
- x2="8.000001"
- y2="13.462841"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(7.4000029,0,0,2.0000001,-141.20001,-12.5)" />
- <linearGradient
- id="linearGradient3845-6">
- <stop
- style="stop-color:#898f89;stop-opacity:1"
- offset="0"
- id="stop3847-7" />
- <stop
- style="stop-color:#bdbfbd;stop-opacity:1"
- offset="1"
- id="stop3849-0" />
- </linearGradient>
+ id="linearGradient3864"
+ xlink:href="#linearGradient3837"
+ inkscape:collect="always" />
<linearGradient
- id="linearGradient3826-8">
+ id="linearGradient3826-9">
<stop
- id="stop3828-4"
+ id="stop3828-2"
offset="0"
- style="stop-color:#000000;stop-opacity:0.051" />
+ style="stop-color:#000000;stop-opacity:1" />
<stop
- id="stop3830-8"
+ id="stop3830-6"
offset="1"
- style="stop-color:#ffffff;stop-opacity:0.502" />
+ style="stop-color:#ffffff;stop-opacity:1" />
</linearGradient>
<linearGradient
y2="13.462841"
x2="8.000001"
y1="1.5371597"
x1="8.0000019"
- gradientTransform="matrix(6.7241384,0,0,1.8891628,-135.79308,-11.668722)"
+ gradientTransform="matrix(0.86666667,0,0,0.92857148,1.0666667,1.0357141)"
gradientUnits="userSpaceOnUse"
- id="linearGradient3819"
- xlink:href="#linearGradient3826-8"
+ id="linearGradient3880"
+ xlink:href="#linearGradient3826-9"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
@@ -139,23 +68,22 @@
borderopacity="1.0"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="-14.77259"
- inkscape:cy="-18.866771"
+ inkscape:zoom="16"
+ inkscape:cx="14.390702"
+ inkscape:cy="4.7605794"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1920"
inkscape:window-height="1022"
- inkscape:window-x="-10"
- inkscape:window-y="18"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
inkscape:window-maximized="1"
inkscape:snap-nodes="false"
inkscape:snap-bbox="true"
inkscape:showpageshadow="false"
- showborder="false"
- inkscape:bbox-paths="false">
+ showborder="false">
<inkscape:grid
type="xygrid"
id="grid2992"
@@ -172,7 +100,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -183,12 +111,12 @@
<rect
ry="3.25"
rx="3.25"
- y="0.75000119"
+ y="0.75000101"
x="0.75000119"
height="14.499999"
width="14.499999"
id="rect17861-9"
- style="color:#000000;fill:none;stroke:url(#linearGradient3851-3);stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0" />
+ style="color:#000000;fill:none;stroke:url(#linearGradient3880);stroke-width:1.50000000000000000;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;opacity:0.1" />
<rect
ry="2.5"
rx="2.5"
@@ -197,6 +125,6 @@
height="13"
width="13"
id="rect17861"
- style="color:#000000;fill:none;stroke:url(#linearGradient3851);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:none;stroke:#24282a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0" />
</g>
</svg>
diff --git a/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-focused-dark.svg b/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-focused-dark.svg
index b8edb66..f1c78b6 100644
--- a/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-focused-dark.svg
+++ b/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-focused-dark.svg
@@ -15,40 +15,19 @@
id="svg33222"
version="1.1"
inkscape:version="0.48.1 r9760"
- sodipodi:docname="lapo-toolbar-border-focused.svg">
+ sodipodi:docname="primary-toolbar-generic-border-focused-dark.svg">
<defs
id="defs33224">
<linearGradient
- id="linearGradient3826">
- <stop
- id="stop3828"
- offset="0"
- style="stop-color:#000000;stop-opacity:0.051" />
- <stop
- id="stop3830"
- offset="1"
- style="stop-color:#ffffff;stop-opacity:0.4" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3826"
- id="linearGradient3851-3"
- x1="8.0000019"
- y1="1.5371597"
- x2="8.000001"
- y2="13.462841"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.86666667,0,0,0.92857148,1.0666667,1.0357143)" />
- <linearGradient
id="linearGradient3826-9">
<stop
id="stop3828-2"
offset="0"
- style="stop-color:#adada4;stop-opacity:1" />
+ style="stop-color:#000000;stop-opacity:1" />
<stop
id="stop3830-6"
offset="1"
- style="stop-color:#ebebea;stop-opacity:1" />
+ style="stop-color:#ffffff;stop-opacity:1" />
</linearGradient>
<linearGradient
y2="13.462841"
@@ -57,7 +36,7 @@
x1="8.0000019"
gradientTransform="matrix(0.86666667,0,0,0.92857148,1.0666667,1.0357141)"
gradientUnits="userSpaceOnUse"
- id="linearGradient3863"
+ id="linearGradient3880"
xlink:href="#linearGradient3826-9"
inkscape:collect="always" />
</defs>
@@ -68,17 +47,17 @@
borderopacity="1.0"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="14.692072"
- inkscape:cy="16.048412"
+ inkscape:zoom="16"
+ inkscape:cx="14.390702"
+ inkscape:cy="4.7605794"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1920"
inkscape:window-height="1022"
- inkscape:window-x="-10"
- inkscape:window-y="18"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
inkscape:window-maximized="1"
inkscape:snap-nodes="false"
inkscape:snap-bbox="true"
@@ -100,7 +79,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -116,7 +95,7 @@
height="14.499999"
width="14.499999"
id="rect17861-9"
- style="color:#000000;fill:none;stroke:url(#linearGradient3863);stroke-width:1.5;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" />
+ style="color:#000000;fill:none;stroke:url(#linearGradient3880);stroke-width:1.50000000000000000;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;opacity:0.1" />
<rect
ry="2.5"
rx="2.5"
@@ -125,6 +104,6 @@
height="13"
width="13"
id="rect17861"
- style="color:#000000;fill:none;stroke:#579eea;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0" />
+ style="color:#000000;fill:none;stroke:#3465a4;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0" />
</g>
</svg>
diff --git a/themes/Adwaita/gtk-3.0/gnome-applications.css b/themes/Adwaita/gtk-3.0/gnome-applications.css
index e18c803..ac55154 100644
--- a/themes/Adwaita/gtk-3.0/gnome-applications.css
+++ b/themes/Adwaita/gtk-3.0/gnome-applications.css
@@ -76,14 +76,10 @@ NautilusSearchBar .entry.image {
}
NautilusFloatingBar {
- background-image: -gtk-gradient (linear,
- left top, left bottom,
- from (shade (@notebook_tab_gradient_a, 0.97)),
- to (shade (@notebook_tab_gradient_b, 0.90)));
+ background-color: @info_bg_color;
+ border-color: darker(@info_bg_color);
- border-color: shade (@notebook_tab_gradient_b, 0.80);
-
- border-radius: 3 3 0 0;
+ border-radius: 0;
border-width: 1;
border-style: solid;
}
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index 50b8e63..117db5a 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -52,7 +52,7 @@
@define-color switch_slider_insensitive_bg @insensitive_border_color;
@define-color switch_trough_active_color @theme_text_color;
- define-color switch_trough_active_bg_a shade (@theme_selected_bg_color, 0.85);
+ define-color switch_trough_active_bg_a shade(@theme_selected_bg_color, 0.6);
@define-color switch_trough_active_bg_b @theme_selected_bg_color;
@define-color highlighted_border @button_border;
@@ -62,7 +62,11 @@
@define-color progressbar_background_a #5893df;
@define-color progressbar_background_b #2465ba;
- define-color progressbar_pattern #000000;
+ define-color progressbar_pattern @switch_slider_active_border;
+ define-color progressbar_border @switch_slider_active_border;
+
+/* define-color progressbar_background_a #76b0ec;
+ define-color progressbar_background_b #1f72c6;*/
@define-color entry_text_color #000000;
@define-color entry_background_a #848684;
@@ -150,7 +154,9 @@
@define-color wm_button_bg_active_b shade (@theme_bg_color, 0.7);
@define-color wm_button_bg_active_c shade (@theme_bg_color, 0.7);
+ import url("gtk-widgets-backgrounds.css");
+ import url("gtk-widgets-borders-dark.css");
@import url("gtk-widgets-assets-dark.css");
+ import url("gnome-applications.css");
@import url("gtk-widgets.css");
@import url("gtk-widgets-dark-overrides.css");
- import url("gnome-applications.css");
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 2282e90..6f71723 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
@@ -96,7 +96,7 @@
background-image: url("assets/sidebar-radio-selected-prelight.svg");
}
-.entry {
+/*.entry {
border-image: url("assets/entry-border-normal-dark.svg") 2 / 2 stretch;
}
@@ -112,9 +112,9 @@ GtkComboBox.combobox-entry .button:hover:active,
GtkComboBox.combobox-entry .button {
border-image: url("assets/entry-border-normal-dark.svg") 2 / 2 2 2 0 stretch;
}
+*/
GtkScale.trough,
-GtkSwitch.trough,
GtkScale.trough.horizontal {
border-image: url("assets/trough-border-horizontal-dark.svg") 2 / 2 stretch;
}
@@ -182,71 +182,4 @@ 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") 2 / 2 stretch;
-}
-
-.button:active,
-.toolbar .button:active,
-.button:hover:active,
-.toolbar .button:hover:active {
- border-image: url("assets/button-active-border-dark.svg") 2 / 2 stretch;
-}
-
-.button.default {
- border-image: url("assets/button-default-border-dark.svg") 3 / 3 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-dark.svg") 4 / 4 stretch;
-}
-
-.toolbar .raised .button,
-.toolbar .raised.button {
- border-image: url("assets/primary-toolbar-raised-button-border-dark.svg") 4 / 4 stretch;
-}
-
-/* nth-child for linked areas */
-.toolbar .raised.linked.button,
-.toolbar .raised.linked.button:active,
-.toolbar .raised.linked.button:active:hover,
-.toolbar .raised.linked .button,
-.toolbar .raised.linked .button:active,
-.toolbar .raised.linked .button:active:hover {
- border-image: url("assets/primary-toolbar-raised-button-border-dark.svg") 4 / 4 0 stretch;
-}
-
-.toolbar .raised.linked.button:nth-child(first) ,
-.toolbar .raised.linked.button:active:nth-child(first),
-.toolbar .raised.linked.button:active:hover:nth-child(first),
-.toolbar .raised.linked:nth-child(first) .button,
-.toolbar .raised.linked:nth-child(first) .button:active,
-.toolbar .raised.linked:nth-child(first) .button:active:hover {
- border-image: url("assets/primary-toolbar-raised-button-border-dark.svg") 4 / 4 0 4 4 stretch;
-}
-
-.toolbar .raised.linked.button:nth-child(last),
-.toolbar .raised.linked.button:active:nth-child(last),
-.toolbar .raised.linked.button:active:hover:nth-child(last),
-.toolbar .raised.linked:nth-child(last) .button,
-.toolbar .raised.linked:nth-child(last) .button:active,
-.toolbar .raised.linked:nth-child(last) .button:active:hover {
- border-image: url("assets/primary-toolbar-raised-button-border-dark.svg") 4 / 4 4 4 0 stretch;
-}
-
-.progressbar,
-.entry.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focused {
- border-image: url("assets/progressbar-border-dark.svg") 3 / 3 stretch;
-}
-
-.progressbar.vertical {
- border-image: url("assets/progressbar-border-vertical-dark.svg") 3 / 3 stretch;
-}
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
new file mode 100644
index 0000000..5bffda8
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
@@ -0,0 +1,161 @@
+/* Borders */
+
+/* generic element borders */
+.entry,
+GtkComboBox.combobox-entry .entry,
+GtkComboBox.combobox-entry .button,
+GtkComboBox.combobox-entry .button:focus,
+.button:active,
+.button:active:hover,
+.button:insensitive,
+.trough,
+.trough row,
+.trough row:hover,
+GtkSwitch.trough,
+GtkSwitch.trough:insensitive {
+ border-image: url("borders/generic-border-dark.svg") 3 3 4 3 / 3 3 4 3 stretch;
+ border-radius: 3;
+ border-width: 1 1 2 1;
+}
+
+/* focused element borders */
+.entry:focus,
+GtkComboBox.combobox-entry .entry:focus,
+.button:focus:active,
+.button.default:active,
+GtkSwitch.trough:active {
+ border-image: url("borders/generic-border-focused-dark.svg") 3 3 4 3 / 3 3 4 3 stretch;
+ border-radius: 3;
+ border-width: 1 1 2 1;
+}
+
+/* generic button borders */
+.button {
+ border-image: url("borders/button-border-dark.svg") 3 3 4 3 / 3 3 4 3 stretch;
+ border-radius: 3;
+ border-width: 1 1 2 1;
+}
+
+/* focused button borders */
+.button:focus,
+.button.default {
+ border-image: url("borders/button-border-focused-dark.svg") 3 3 4 3 / 3 3 4 3 stretch;
+ border-radius: 3;
+ border-width: 1 1 2 1;
+}
+
+/* primary toolbar - generic element borders */
+.primary-toolbar .entry,
+.primary-toolbar GtkComboBox.combobox-entry .entry,
+.primary-toolbar GtkComboBox.combobox-entry .button,
+.primary-toolbar GtkComboBox.combobox-entry .button:prelight,
+.primary-toolbar GtkComboBox.combobox-entry .button:active,
+.primary-toolbar GtkComboBox.combobox-entry .button:focus,
+.primary-toolbar GtkComboBox.combobox-entry .button:insensitive,
+.primary-toolbar .button:active,
+.primary-toolbar .button:active:hover,
+.primary-toolbar .button.raised:insensitive,
+.primary-toolbar .raised .button:insensitive,
+.inline-toolbar.toolbar .button:active,
+.inline-toolbar.toolbar .button:active:hover,
+.inline-toolbar.toolbar .button:insensitive,
+.inline-toolbar.toolbar GtkToolButton .button:active {
+ border-image: url("borders/primary-toolbar-generic-border-dark.svg") 4 / 4 stretch;
+ border-radius: 3;
+ border-width: 2;
+}
+
+/* primary toolbar - focused element borders */
+.primary-toolbar .entry:focus,
+.primary-toolbar GtkComboBox.combobox-entry .entry:focus,
+.primary-toolbar .button.raised:focus:active,
+.primary-toolbar .raised .button:focus:active,
+.primary-toolbar .button.raised:focus:active:hover,
+.primary-toolbar .raised .button:focus:active:hover,
+.primary-toolbar .button.raised.default:active,
+.primary-toolbar .raised .button.default:active,
+.inline-toolbar.toolbar .button:focus:active,
+.inline-toolbar.toolbar .button.default:active {
+ border-image: url("borders/primary-toolbar-generic-border-focused-dark.svg") 4 / 4 stretch;
+ border-radius: 3;
+ border-width: 2;
+}
+
+/* primary toolbar - generic button borders */
+.primary-toolbar .button.raised,
+.primary-toolbar .raised .button,
+.primary-toolbar .button.raised:hover,
+.primary-toolbar .raised .button:hover,
+.inline-toolbar.toolbar .button {
+ border-image: url("borders/primary-toolbar-button-border-dark.svg") 4 / 4 stretch;
+ border-radius: 3;
+ border-width: 2;
+}
+
+/* primary toolbar - focused button borders */
+.primary-toolbar .button.raised:focus,
+.primary-toolbar .button.raised.default,
+.primary-toolbar .raised .button:focus,
+.primary-toolbar .raised .button.default,
+.primary-toolbar .button.raised:focus:hover,
+.primary-toolbar .raised .button:focus:hover,
+.inline-toolbar.toolbar .button:focus,
+.inline-toolbar.toolbar .button.default {
+ border-image: url("borders/primary-toolbar-button-border-focused-dark.svg") 4 / 4 stretch;
+ border-radius: 3;
+ border-width: 2;
+}
+
+GtkScale.trough,
+/*GtkSwitch.trough,*/
+GtkScale.trough.horizontal {
+ border-image: url("assets/trough-border-horizontal-dark.svg") 2 / 2 stretch;
+}
+
+GtkScale.trough.vertical {
+ border-image: url("assets/trough-border-vertical-dark.svg") 2 / 2 stretch;
+}
+
+/*GtkSwitch.trough:active,*/
+GtkScale.progressbar.horizontal {
+ border-image: url("assets/trough-active-border-horizontal-dark.svg") 2 / 2 stretch;
+}
+
+GtkScale.progressbar.vertical {
+ border-image: url("assets/trough-active-border-vertical-dark.svg") 2 / 2 stretch;
+}
+
+/* column-headers borders */
+column-header.button,
+column-header .button,
+column-header.button:hover,
+column-header .button:hover,
+column-header.button:focus,
+column-header .button:focus,
+column-header.button:focus:hover,
+column-header .button:focus:hover,
+column-header.button:active:focus:hover,
+column-header .button:active:focus:hover,
+column-header.button:active:focus,
+column-header .button:active:focus,
+column-header.button:active:hover,
+column-header .button:active:hover {
+ border-image: url("borders/column-header-border-dark.svg") 4 5 4 4 / 4 5 4 4 stretch;
+}
+
+column-header.button:last-child,
+column-header:last-child .button,
+column-header.button:hover:last-child,
+column-header:last-child .button:hover,
+column-header.button:focus:last-child,
+column-header:last-child .button:focus,
+column-header.button:focus:hover:last-child,
+column-header:last-child .button:focus:hover,
+column-header.button:active:focus:hover:last-child,
+column-header:last-child .button:active:focus:hover,
+column-header.button:active:focus:last-child,
+column-header:last-child .button:active:focus,
+column-header.button:active:hover:last-child,
+column-header:last-child .button:active:hover {
+ border-image: url("borders/column-header-border-last-dark.svg") 4 / 4 stretch;
+}
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index 148658a..35f7f1c 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -44,15 +44,6 @@ GtkSwitch.trough:active {
border-width: 1 1 2 1;
}
-/*.primary-toolbar .button:active:window-unfocused,
-.primary-toolbar .raised .button:active:window-unfocused {
- border-width: 1;
- border-style: solid;
- border-color: @theme_unfocused_border_color;
- border-radius: 3;
-}*/
-
-
/* primary toolbar - generic element borders */
.primary-toolbar .entry,
.primary-toolbar GtkComboBox.combobox-entry .entry,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
index 29dbd59..81f33bb 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
@@ -17,4 +17,13 @@ GtkIconView.view.cell:selected:focused {
.entry:insensitive {
background-image: none;
-}
\ No newline at end of file
+}
+
+GtkSwitch.slider {
+ border-color: mix (@button_border, black, 0.4);
+ box-shadow: 0 -1 inset alpha(white, 0.1), 0 1 inset @theme_base_color, 0 2 inset alpha(@button_border, 0.15);
+}
+GtkSwitch.slider:insensitive {
+ border-color:
+ background-color:
+}
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index d96b5e1..271c2de 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -343,10 +343,10 @@ GtkScrolledWindow.frame {
border-color: darker (@theme_bg_color);
border-width: 1;
border-radius: 2;
-
padding: 0;
}
+
/***********
* Buttons *
***********/
@@ -363,7 +363,8 @@ GtkScrolledWindow.frame {
to (alpha (@keyboard_focus_border_b, 0.62)));
-adwaita-focus-border-radius: 1;
-adwaita-focus-border-dashes: 0;
- -GtkWidget-focus-line-width: 2;
+ /*-GtkWidget-focus-line-width: 2; uhm.... */
+ -GtkWidget-focus-line-width: 0;
-GtkButton-child-displacement-x: 0;
-GtkButton-child-displacement-y: 1;
@@ -1382,10 +1383,10 @@ row:selected:focus {
row:selected {
border-width: 0;
- background-image: -gtk-gradient (linear,
+/* background-image: -gtk-gradient (linear,
left top, left bottom,
from (@theme_selected_bg_color),
- to (@theme_selected_bg_color));
+ to (@theme_selected_bg_color)); */
}
.cell {
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index 5587795..4b62181 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -94,7 +94,6 @@
@define-color progressbar_background_a #76b0ec;
@define-color progressbar_background_b #1f72c6;
-/* define-color progressbar_pattern #000000;*/
@define-color progressbar_pattern @switch_slider_active_border;
@define-color progressbar_border @switch_slider_active_border;
@@ -173,4 +172,4 @@
@import url("gtk-widgets-assets.css");
@import url("gnome-applications.css");
@import url("gtk-widgets.css");
-/* @import url("window-unfocused.css"); */
+/* @import url("gtk-widgets-window-unfocused.css"); */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
