362 lines
12 KiB
Diff
362 lines
12 KiB
Diff
From 27c660d2a9204bf423103bc83dc8e2f162b4474b Mon Sep 17 00:00:00 2001
|
|
From: Sam Hewitt <sam@snwh.org>
|
|
Date: Fri, 16 Nov 2018 13:44:52 -0500
|
|
Subject: [PATCH 11/25] theme: Replace page indicator assets with css
|
|
|
|
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/297
|
|
---
|
|
data/gnome-shell-theme.gresource.xml | 4 --
|
|
data/theme/gnome-shell-sass/_common.scss | 14 +++--
|
|
data/theme/page-indicator-active.svg | 71 ------------------------
|
|
data/theme/page-indicator-checked.svg | 67 ----------------------
|
|
data/theme/page-indicator-hover.svg | 67 ----------------------
|
|
data/theme/page-indicator-inactive.svg | 67 ----------------------
|
|
6 files changed, 8 insertions(+), 282 deletions(-)
|
|
delete mode 100644 data/theme/page-indicator-active.svg
|
|
delete mode 100644 data/theme/page-indicator-checked.svg
|
|
delete mode 100644 data/theme/page-indicator-hover.svg
|
|
delete mode 100644 data/theme/page-indicator-inactive.svg
|
|
|
|
diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
|
|
index e292d33a3..451d0980e 100644
|
|
--- a/data/gnome-shell-theme.gresource.xml
|
|
+++ b/data/gnome-shell-theme.gresource.xml
|
|
@@ -25,10 +25,6 @@
|
|
<file>no-notifications.svg</file>
|
|
<file>noise-texture.png</file>
|
|
<file>pad-osd.css</file>
|
|
- <file>page-indicator-active.svg</file>
|
|
- <file>page-indicator-inactive.svg</file>
|
|
- <file>page-indicator-checked.svg</file>
|
|
- <file>page-indicator-hover.svg</file>
|
|
<file>process-working.svg</file>
|
|
<file>toggle-off-us.svg</file>
|
|
<file>toggle-off-intl.svg</file>
|
|
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
|
|
index 829791419..c905b3b75 100644
|
|
--- a/data/theme/gnome-shell-sass/_common.scss
|
|
+++ b/data/theme/gnome-shell-sass/_common.scss
|
|
@@ -1446,15 +1446,17 @@ StScrollBar {
|
|
padding: 15px 20px;
|
|
|
|
.page-indicator-icon {
|
|
- width: 18px;
|
|
- height: 18px;
|
|
- background-image: url(resource:///org/gnome/shell/theme/page-indicator-inactive.svg);
|
|
+ width: 12px;
|
|
+ height: 12px;
|
|
+ background-color: transparent;
|
|
+ border: 2px solid rgba(255, 255, 255, 0.4);
|
|
+ border-radius:12px;
|
|
}
|
|
|
|
- &:hover .page-indicator-icon { background-image: url(resource:///org/gnome/shell/theme/page-indicator-hover.svg); }
|
|
- &:active .page-indicator-icon { background-image: url(resource:///org/gnome/shell/theme/page-indicator-active.svg); }
|
|
+ &:hover .page-indicator-icon { border-color: white; }
|
|
+ &:active .page-indicator-icon { border: none; margin: 2px; background-color:#fff; }
|
|
&:checked .page-indicator-icon,
|
|
- &:checked:active { background-image: url(resource:///org/gnome/shell/theme/page-indicator-checked.svg); }
|
|
+ &:checked:active { background-color: #fff;}
|
|
}
|
|
|
|
.no-frequent-applications-label { @extend %status_text; }
|
|
diff --git a/data/theme/page-indicator-active.svg b/data/theme/page-indicator-active.svg
|
|
deleted file mode 100644
|
|
index 51a76024e..000000000
|
|
--- a/data/theme/page-indicator-active.svg
|
|
+++ /dev/null
|
|
@@ -1,71 +0,0 @@
|
|
-<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
- width="18"
|
|
- height="18"
|
|
- id="svg4703"
|
|
- version="1.1"
|
|
- inkscape:version="0.48.4 r9939"
|
|
- sodipodi:docname="page-indicator-pushed.svg">
|
|
- <defs
|
|
- id="defs4705" />
|
|
- <sodipodi:namedview
|
|
- id="base"
|
|
- pagecolor="#ffffff"
|
|
- bordercolor="#666666"
|
|
- borderopacity="1.0"
|
|
- inkscape:pageopacity="0.0"
|
|
- inkscape:pageshadow="2"
|
|
- inkscape:zoom="31.392433"
|
|
- inkscape:cx="1.0245308"
|
|
- inkscape:cy="13.3715"
|
|
- inkscape:current-layer="layer1"
|
|
- showgrid="true"
|
|
- inkscape:grid-bbox="true"
|
|
- inkscape:document-units="px"
|
|
- inkscape:window-width="2560"
|
|
- inkscape:window-height="1374"
|
|
- inkscape:window-x="0"
|
|
- inkscape:window-y="27"
|
|
- inkscape:window-maximized="1">
|
|
- <inkscape:grid
|
|
- type="xygrid"
|
|
- id="grid6140" />
|
|
- </sodipodi:namedview>
|
|
- <metadata
|
|
- id="metadata4708">
|
|
- <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"
|
|
- transform="translate(0,2)">
|
|
- <path
|
|
- transform="matrix(0.54617904,0,0,0.62523128,-1131.9904,-392.39214)"
|
|
- d="m 2099.9808,638.83099 a 10.985409,9.5964489 0 1 1 -21.9708,0 10.985409,9.5964489 0 1 1 21.9708,0 z"
|
|
- sodipodi:ry="9.5964489"
|
|
- sodipodi:rx="10.985409"
|
|
- sodipodi:cy="638.83099"
|
|
- sodipodi:cx="2088.9954"
|
|
- id="path4711"
|
|
- style="fill:#fdffff;fill-opacity:1;stroke:none"
|
|
- sodipodi:type="arc" />
|
|
- </g>
|
|
-</svg>
|
|
diff --git a/data/theme/page-indicator-checked.svg b/data/theme/page-indicator-checked.svg
|
|
deleted file mode 100644
|
|
index 38b720f86..000000000
|
|
--- a/data/theme/page-indicator-checked.svg
|
|
+++ /dev/null
|
|
@@ -1,67 +0,0 @@
|
|
-<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
- width="18"
|
|
- height="18"
|
|
- id="svg4703"
|
|
- version="1.1"
|
|
- inkscape:version="0.48.4 r9939"
|
|
- sodipodi:docname="page-indicator-active.svg">
|
|
- <defs
|
|
- id="defs4705" />
|
|
- <sodipodi:namedview
|
|
- id="base"
|
|
- pagecolor="#ffffff"
|
|
- bordercolor="#666666"
|
|
- borderopacity="1.0"
|
|
- inkscape:pageopacity="0.0"
|
|
- inkscape:pageshadow="2"
|
|
- inkscape:zoom="22.197802"
|
|
- inkscape:cx="2.1522887"
|
|
- inkscape:cy="16.782904"
|
|
- inkscape:current-layer="layer1"
|
|
- showgrid="true"
|
|
- inkscape:grid-bbox="true"
|
|
- inkscape:document-units="px"
|
|
- inkscape:window-width="1920"
|
|
- inkscape:window-height="1021"
|
|
- inkscape:window-x="0"
|
|
- inkscape:window-y="27"
|
|
- inkscape:window-maximized="1" />
|
|
- <metadata
|
|
- id="metadata4708">
|
|
- <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"
|
|
- transform="translate(0,2)">
|
|
- <path
|
|
- transform="matrix(0.72823872,0,0,0.8336417,-1512.2872,-525.55618)"
|
|
- d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
|
|
- sodipodi:ry="9.5964489"
|
|
- sodipodi:rx="10.985409"
|
|
- sodipodi:cy="638.83099"
|
|
- sodipodi:cx="2088.9954"
|
|
- id="path4711"
|
|
- style="fill:#fdffff;fill-opacity:0.94117647;stroke:none"
|
|
- sodipodi:type="arc" />
|
|
- </g>
|
|
-</svg>
|
|
diff --git a/data/theme/page-indicator-hover.svg b/data/theme/page-indicator-hover.svg
|
|
deleted file mode 100644
|
|
index a4ea72ffd..000000000
|
|
--- a/data/theme/page-indicator-hover.svg
|
|
+++ /dev/null
|
|
@@ -1,67 +0,0 @@
|
|
-<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
- width="18"
|
|
- height="18"
|
|
- id="svg5266"
|
|
- version="1.1"
|
|
- inkscape:version="0.48.4 r9939"
|
|
- sodipodi:docname="page-indicator-inactive.svg">
|
|
- <defs
|
|
- id="defs5268" />
|
|
- <sodipodi:namedview
|
|
- id="base"
|
|
- pagecolor="#ffffff"
|
|
- bordercolor="#666666"
|
|
- borderopacity="1.0"
|
|
- inkscape:pageopacity="0"
|
|
- inkscape:pageshadow="2"
|
|
- inkscape:zoom="11.313709"
|
|
- inkscape:cx="-2.307566"
|
|
- inkscape:cy="17.859535"
|
|
- inkscape:current-layer="layer1"
|
|
- showgrid="true"
|
|
- inkscape:grid-bbox="true"
|
|
- inkscape:document-units="px"
|
|
- inkscape:window-width="2560"
|
|
- inkscape:window-height="1374"
|
|
- inkscape:window-x="0"
|
|
- inkscape:window-y="27"
|
|
- inkscape:window-maximized="1" />
|
|
- <metadata
|
|
- id="metadata5271">
|
|
- <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"
|
|
- transform="translate(0,2)">
|
|
- <path
|
|
- sodipodi:type="arc"
|
|
- style="fill:none;fill-opacity:0;stroke:#ffffff;stroke-width:2.93356276000000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
|
- id="path5274"
|
|
- sodipodi:cx="2088.9954"
|
|
- sodipodi:cy="638.83099"
|
|
- sodipodi:rx="10.985409"
|
|
- sodipodi:ry="9.5964489"
|
|
- d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
|
|
- transform="matrix(0.63720887,0,0,0.72943648,-1322.1264,-458.98661)" />
|
|
- </g>
|
|
-</svg>
|
|
diff --git a/data/theme/page-indicator-inactive.svg b/data/theme/page-indicator-inactive.svg
|
|
deleted file mode 100644
|
|
index 4ff2246c8..000000000
|
|
--- a/data/theme/page-indicator-inactive.svg
|
|
+++ /dev/null
|
|
@@ -1,67 +0,0 @@
|
|
-<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
- width="18"
|
|
- height="18"
|
|
- id="svg5266"
|
|
- version="1.1"
|
|
- inkscape:version="0.48.4 r9939"
|
|
- sodipodi:docname="page-indicator-inactive.svg">
|
|
- <defs
|
|
- id="defs5268" />
|
|
- <sodipodi:namedview
|
|
- id="base"
|
|
- pagecolor="#ffffff"
|
|
- bordercolor="#666666"
|
|
- borderopacity="1.0"
|
|
- inkscape:pageopacity="0"
|
|
- inkscape:pageshadow="2"
|
|
- inkscape:zoom="11.313709"
|
|
- inkscape:cx="-2.307566"
|
|
- inkscape:cy="17.859535"
|
|
- inkscape:current-layer="layer1"
|
|
- showgrid="true"
|
|
- inkscape:grid-bbox="true"
|
|
- inkscape:document-units="px"
|
|
- inkscape:window-width="2560"
|
|
- inkscape:window-height="1374"
|
|
- inkscape:window-x="0"
|
|
- inkscape:window-y="27"
|
|
- inkscape:window-maximized="1" />
|
|
- <metadata
|
|
- id="metadata5271">
|
|
- <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"
|
|
- transform="translate(0,2)">
|
|
- <path
|
|
- sodipodi:type="arc"
|
|
- style="fill:none;fill-opacity:0;stroke:#ffffff;stroke-width:2.93356276000000005;stroke-miterlimit:4;stroke-opacity:0.39215686000000000;stroke-dasharray:none"
|
|
- id="path5274"
|
|
- sodipodi:cx="2088.9954"
|
|
- sodipodi:cy="638.83099"
|
|
- sodipodi:rx="10.985409"
|
|
- sodipodi:ry="9.5964489"
|
|
- d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
|
|
- transform="matrix(0.63720887,0,0,0.72943648,-1322.1264,-458.98661)" />
|
|
- </g>
|
|
-</svg>
|
|
--
|
|
2.20.0
|
|
|