358 lines
18 KiB
Diff
358 lines
18 KiB
Diff
From 4d2dce2c52d3570deafbe7420305a7863223144c Mon Sep 17 00:00:00 2001
|
|
From: Sam Hewitt <sam@snwh.org>
|
|
Date: Fri, 16 Nov 2018 11:15:44 -0500
|
|
Subject: [PATCH 12/25] theme: Drop custom assets for window close buttons in
|
|
overview
|
|
|
|
They can be replaced by a themed icon and some CSS styling.
|
|
|
|
https://gitlab.gnome.org/GNOME/gnome-shell/issues/782
|
|
---
|
|
data/gnome-shell-theme.gresource.xml | 3 -
|
|
data/theme/close-window-active.svg | 81 ----------------------
|
|
data/theme/close-window-hover.svg | 81 ----------------------
|
|
data/theme/close-window.svg | 85 ------------------------
|
|
data/theme/gnome-shell-sass/_common.scss | 28 +++++---
|
|
js/ui/workspace.js | 1 +
|
|
6 files changed, 21 insertions(+), 258 deletions(-)
|
|
delete mode 100644 data/theme/close-window-active.svg
|
|
delete mode 100644 data/theme/close-window-hover.svg
|
|
delete mode 100644 data/theme/close-window.svg
|
|
|
|
diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
|
|
index 451d0980e..4a4a0edfc 100644
|
|
--- a/data/gnome-shell-theme.gresource.xml
|
|
+++ b/data/gnome-shell-theme.gresource.xml
|
|
@@ -8,9 +8,6 @@
|
|
<file>checkbox-off-focused.svg</file>
|
|
<file>checkbox-off.svg</file>
|
|
<file>checkbox.svg</file>
|
|
- <file>close-window.svg</file>
|
|
- <file>close-window-active.svg</file>
|
|
- <file>close-window-hover.svg</file>
|
|
<file>dash-placeholder.svg</file>
|
|
<file>gnome-shell.css</file>
|
|
<file>gnome-shell-high-contrast.css</file>
|
|
diff --git a/data/theme/close-window-active.svg b/data/theme/close-window-active.svg
|
|
deleted file mode 100644
|
|
index 6242cb17f..000000000
|
|
--- a/data/theme/close-window-active.svg
|
|
+++ /dev/null
|
|
@@ -1,81 +0,0 @@
|
|
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
|
|
-
|
|
-<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"
|
|
- version="1.0"
|
|
- id="Foreground"
|
|
- x="0px"
|
|
- y="0px"
|
|
- width="32"
|
|
- height="32"
|
|
- viewBox="0 0 32 32"
|
|
- enable-background="new 0 0 16 16"
|
|
- xml:space="preserve"
|
|
- sodipodi:version="0.32"
|
|
- inkscape:version="0.92.2 5c3e80d, 2017-08-06"
|
|
- sodipodi:docname="close-window-active.svg"
|
|
- inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
|
|
- id="metadata2399"><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><defs
|
|
- id="defs2397"><linearGradient
|
|
- id="linearGradient3173"><stop
|
|
- style="stop-color:#c4c4c4;stop-opacity:1;"
|
|
- offset="0"
|
|
- id="stop3175" /><stop
|
|
- style="stop-color:#ffffff;stop-opacity:1;"
|
|
- offset="1"
|
|
- id="stop3177" /></linearGradient><inkscape:perspective
|
|
- sodipodi:type="inkscape:persp3d"
|
|
- inkscape:vp_x="0 : 11 : 1"
|
|
- inkscape:vp_y="0 : 1375 : 0"
|
|
- inkscape:vp_z="22 : 11 : 1"
|
|
- inkscape:persp3d-origin="11 : 7.3333334 : 1"
|
|
- id="perspective2401" /></defs><sodipodi:namedview
|
|
- inkscape:window-height="1106"
|
|
- inkscape:window-width="1700"
|
|
- inkscape:pageshadow="2"
|
|
- inkscape:pageopacity="0"
|
|
- guidetolerance="10.0"
|
|
- gridtolerance="10.0"
|
|
- objecttolerance="10.0"
|
|
- borderopacity="1.0"
|
|
- bordercolor="#666666"
|
|
- pagecolor="#797979"
|
|
- id="base"
|
|
- showgrid="false"
|
|
- inkscape:zoom="4"
|
|
- inkscape:cx="28.483745"
|
|
- inkscape:cy="67.714004"
|
|
- inkscape:window-x="1427"
|
|
- inkscape:window-y="127"
|
|
- inkscape:current-layer="Foreground"
|
|
- showguides="true"
|
|
- inkscape:guide-bbox="true"
|
|
- borderlayer="true"
|
|
- inkscape:showpageshadow="false"
|
|
- inkscape:window-maximized="0"
|
|
- inkscape:document-rotation="0"><inkscape:grid
|
|
- type="xygrid"
|
|
- id="grid11246"
|
|
- empspacing="32"
|
|
- visible="true"
|
|
- enabled="true"
|
|
- snapvisiblegridlinesonly="true" /></sodipodi:namedview><path
|
|
- d="m 4.4362021,16 c 0,-6.410121 5.1728276,-11.60728 11.5529359,-11.60728 6.380109,0 11.552937,5.197159 11.552937,11.60728 0,6.410122 -5.172828,11.607281 -11.552937,11.607281 C 9.6090297,27.607281 4.4362021,22.410122 4.4362021,16 Z"
|
|
- id="path883"
|
|
- style="color:#000000;clip-rule:evenodd;display:inline;overflow:visible;visibility:visible;fill:#a5c8ec;fill-opacity:1;fill-rule:nonzero;stroke:#2975c4;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
|
|
- sodipodi:nodetypes="csssc"
|
|
- inkscape:connector-curvature="0" /><path
|
|
- d="m 11.718386,11.764547 h 1.055207 c 0.01091,-1.26e-4 0.02193,-4.86e-4 0.03298,0 0.269026,0.01183 0.538019,0.135679 0.725455,0.329752 l 2.407192,2.407192 2.440166,-2.407192 c 0.28029,-0.243226 0.471333,-0.322366 0.725455,-0.329752 h 1.055207 v 1.055208 c 0,0.302285 -0.03623,0.581049 -0.263801,0.791405 l -2.407191,2.407191 2.374217,2.374216 c 0.198577,0.198559 0.296768,0.478484 0.296775,0.758432 v 1.055206 h -1.055211 c -0.279947,-10e-6 -0.559877,-0.09824 -0.75843,-0.296777 l -2.407192,-2.407192 -2.407192,2.407192 c -0.198551,0.198579 -0.478493,0.296777 -0.758429,0.296777 H 11.71839 v -1.055206 c -3e-6,-0.279936 0.0982,-0.559873 0.296777,-0.758432 L 14.422359,16.018351 12.015167,13.61116 C 11.79279,13.405784 11.69527,13.116003 11.71839,12.819755 Z"
|
|
- inkscape:connector-curvature="0"
|
|
- id="path887"
|
|
- style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#4a90d9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.87958801;marker:none;enable-background:new"
|
|
- sodipodi:nodetypes="ccsccccccccccccccccccccccc" /></svg>
|
|
\ No newline at end of file
|
|
diff --git a/data/theme/close-window-hover.svg b/data/theme/close-window-hover.svg
|
|
deleted file mode 100644
|
|
index 2377bfb94..000000000
|
|
--- a/data/theme/close-window-hover.svg
|
|
+++ /dev/null
|
|
@@ -1,81 +0,0 @@
|
|
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
|
|
-
|
|
-<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"
|
|
- version="1.0"
|
|
- id="Foreground"
|
|
- x="0px"
|
|
- y="0px"
|
|
- width="32"
|
|
- height="32"
|
|
- viewBox="0 0 32 32"
|
|
- enable-background="new 0 0 16 16"
|
|
- xml:space="preserve"
|
|
- sodipodi:version="0.32"
|
|
- inkscape:version="0.92.2 5c3e80d, 2017-08-06"
|
|
- sodipodi:docname="close-window-hover.svg"
|
|
- inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
|
|
- id="metadata2399"><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><defs
|
|
- id="defs2397"><linearGradient
|
|
- id="linearGradient3173"><stop
|
|
- style="stop-color:#c4c4c4;stop-opacity:1;"
|
|
- offset="0"
|
|
- id="stop3175" /><stop
|
|
- style="stop-color:#ffffff;stop-opacity:1;"
|
|
- offset="1"
|
|
- id="stop3177" /></linearGradient><inkscape:perspective
|
|
- sodipodi:type="inkscape:persp3d"
|
|
- inkscape:vp_x="0 : 11 : 1"
|
|
- inkscape:vp_y="0 : 1375 : 0"
|
|
- inkscape:vp_z="22 : 11 : 1"
|
|
- inkscape:persp3d-origin="11 : 7.3333334 : 1"
|
|
- id="perspective2401" /></defs><sodipodi:namedview
|
|
- inkscape:window-height="1106"
|
|
- inkscape:window-width="1700"
|
|
- inkscape:pageshadow="2"
|
|
- inkscape:pageopacity="0"
|
|
- guidetolerance="10.0"
|
|
- gridtolerance="10.0"
|
|
- objecttolerance="10.0"
|
|
- borderopacity="1.0"
|
|
- bordercolor="#666666"
|
|
- pagecolor="#797979"
|
|
- id="base"
|
|
- showgrid="false"
|
|
- inkscape:zoom="4"
|
|
- inkscape:cx="28.483745"
|
|
- inkscape:cy="67.714004"
|
|
- inkscape:window-x="1427"
|
|
- inkscape:window-y="127"
|
|
- inkscape:current-layer="Foreground"
|
|
- showguides="true"
|
|
- inkscape:guide-bbox="true"
|
|
- borderlayer="true"
|
|
- inkscape:showpageshadow="false"
|
|
- inkscape:window-maximized="0"
|
|
- inkscape:document-rotation="0"><inkscape:grid
|
|
- type="xygrid"
|
|
- id="grid11246"
|
|
- empspacing="32"
|
|
- visible="true"
|
|
- enabled="true"
|
|
- snapvisiblegridlinesonly="true" /></sodipodi:namedview><path
|
|
- inkscape:connector-curvature="0"
|
|
- sodipodi:nodetypes="csssc"
|
|
- style="color:#000000;clip-rule:evenodd;display:inline;overflow:visible;visibility:visible;fill:#2975c4;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
|
|
- id="path822"
|
|
- d="m 4.4362021,16 c 0,-6.410121 5.1728276,-11.60728 11.5529359,-11.60728 6.380109,0 11.552937,5.197159 11.552937,11.60728 0,6.410122 -5.172828,11.607281 -11.552937,11.607281 C 9.6090297,27.607281 4.4362021,22.410122 4.4362021,16 Z" /><path
|
|
- sodipodi:nodetypes="ccsccccccccccccccccccccccc"
|
|
- style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.87958801;marker:none;enable-background:new"
|
|
- id="path826"
|
|
- inkscape:connector-curvature="0"
|
|
- d="m 11.718386,11.764547 h 1.055207 c 0.01091,-1.26e-4 0.02193,-4.86e-4 0.03298,0 0.269026,0.01183 0.538019,0.135679 0.725455,0.329752 l 2.407192,2.407192 2.440166,-2.407192 c 0.28029,-0.243226 0.471333,-0.322366 0.725455,-0.329752 h 1.055207 v 1.055208 c 0,0.302285 -0.03623,0.581049 -0.263801,0.791405 l -2.407191,2.407191 2.374217,2.374216 c 0.198577,0.198559 0.296768,0.478484 0.296775,0.758432 v 1.055206 h -1.055211 c -0.279947,-10e-6 -0.559877,-0.09824 -0.75843,-0.296777 l -2.407192,-2.407192 -2.407192,2.407192 c -0.198551,0.198579 -0.478493,0.296777 -0.758429,0.296777 H 11.71839 v -1.055206 c -3e-6,-0.279936 0.0982,-0.559873 0.296777,-0.758432 L 14.422359,16.018351 12.015167,13.61116 C 11.79279,13.405784 11.69527,13.116003 11.71839,12.819755 Z" /></svg>
|
|
\ No newline at end of file
|
|
diff --git a/data/theme/close-window.svg b/data/theme/close-window.svg
|
|
deleted file mode 100644
|
|
index e716f7649..000000000
|
|
--- a/data/theme/close-window.svg
|
|
+++ /dev/null
|
|
@@ -1,85 +0,0 @@
|
|
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
|
|
-
|
|
-<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"
|
|
- version="1.0"
|
|
- id="Foreground"
|
|
- x="0px"
|
|
- y="0px"
|
|
- width="32"
|
|
- height="32"
|
|
- viewBox="0 0 32 32"
|
|
- enable-background="new 0 0 16 16"
|
|
- xml:space="preserve"
|
|
- sodipodi:version="0.32"
|
|
- inkscape:version="0.92.2 5c3e80d, 2017-08-06"
|
|
- sodipodi:docname="close-window.svg"
|
|
- inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
|
|
- id="metadata2399"><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><defs
|
|
- id="defs2397"><linearGradient
|
|
- id="linearGradient3173"><stop
|
|
- style="stop-color:#c4c4c4;stop-opacity:1;"
|
|
- offset="0"
|
|
- id="stop3175" /><stop
|
|
- style="stop-color:#ffffff;stop-opacity:1;"
|
|
- offset="1"
|
|
- id="stop3177" /></linearGradient><inkscape:perspective
|
|
- sodipodi:type="inkscape:persp3d"
|
|
- inkscape:vp_x="0 : 11 : 1"
|
|
- inkscape:vp_y="0 : 1375 : 0"
|
|
- inkscape:vp_z="22 : 11 : 1"
|
|
- inkscape:persp3d-origin="11 : 7.3333334 : 1"
|
|
- id="perspective2401" /></defs><sodipodi:namedview
|
|
- inkscape:window-height="1106"
|
|
- inkscape:window-width="1700"
|
|
- inkscape:pageshadow="2"
|
|
- inkscape:pageopacity="0"
|
|
- guidetolerance="10.0"
|
|
- gridtolerance="10.0"
|
|
- objecttolerance="10.0"
|
|
- borderopacity="1.0"
|
|
- bordercolor="#666666"
|
|
- pagecolor="#797979"
|
|
- id="base"
|
|
- showgrid="false"
|
|
- inkscape:zoom="4"
|
|
- inkscape:cx="28.483745"
|
|
- inkscape:cy="67.714004"
|
|
- inkscape:window-x="1427"
|
|
- inkscape:window-y="127"
|
|
- inkscape:current-layer="Foreground"
|
|
- showguides="true"
|
|
- inkscape:guide-bbox="true"
|
|
- borderlayer="true"
|
|
- inkscape:showpageshadow="false"
|
|
- inkscape:window-maximized="0"
|
|
- inkscape:document-rotation="0"><inkscape:grid
|
|
- type="xygrid"
|
|
- id="grid11246"
|
|
- empspacing="32"
|
|
- visible="true"
|
|
- enabled="true"
|
|
- snapvisiblegridlinesonly="true" /></sodipodi:namedview><path
|
|
- d="m 4.4362021,15.860384 c 0,-6.410121 5.1728276,-11.60728 11.5529359,-11.60728 6.380109,0 11.552937,5.197159 11.552937,11.60728 0,6.410122 -5.172828,11.607281 -11.552937,11.607281 -6.3801083,0 -11.5529359,-5.197159 -11.5529359,-11.607281 z"
|
|
- id="path2394-32"
|
|
- style="color:#000000;clip-rule:evenodd;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#2975c4;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
|
|
- sodipodi:nodetypes="csssc"
|
|
- inkscape:connector-curvature="0" /><path
|
|
- style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.49900004;fill:#4a90d9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.74932218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
|
|
- d="m 6.4654832,15.001321 c -0.025906,0.288419 -0.044417,0.579469 -0.044417,0.874662 0,5.313347 4.2883848,9.621271 9.5768588,9.621271 5.288466,0 9.575143,-4.307924 9.575143,-9.621271 0,-0.295193 -0.01852,-0.586243 -0.04441,-0.874662 -0.440376,4.903023 -4.536071,8.746611 -9.53073,8.746611 -4.994659,0 -9.0920617,-3.843588 -9.5324391,-8.746611 z"
|
|
- id="path2561"
|
|
- inkscape:connector-curvature="0" /><path
|
|
- d="m 11.718386,11.639547 h 1.055207 c 0.01091,-1.26e-4 0.02193,-4.86e-4 0.03298,0 0.269026,0.01183 0.538019,0.135679 0.725455,0.329752 l 2.407192,2.407192 2.440166,-2.407192 c 0.28029,-0.243226 0.471333,-0.322366 0.725455,-0.329752 h 1.055207 v 1.055208 c 0,0.302285 -0.03623,0.581049 -0.263801,0.791405 l -2.407191,2.407191 2.374217,2.374216 c 0.198577,0.198559 0.296768,0.478484 0.296775,0.758432 v 1.055206 h -1.055211 c -0.279947,-10e-6 -0.559877,-0.09824 -0.75843,-0.296777 l -2.407192,-2.407192 -2.407192,2.407192 c -0.198551,0.198579 -0.478493,0.296777 -0.758429,0.296777 H 11.71839 v -1.055206 c -3e-6,-0.279936 0.0982,-0.559873 0.296777,-0.758432 L 14.422359,15.893351 12.015167,13.48616 C 11.79279,13.280784 11.69527,12.991003 11.71839,12.694755 Z"
|
|
- inkscape:connector-curvature="0"
|
|
- id="path27279-0-5"
|
|
- style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#4a90d9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.87958801;marker:none;enable-background:new"
|
|
- sodipodi:nodetypes="ccsccccccccccccccccccccccc" /></svg>
|
|
\ No newline at end of file
|
|
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
|
|
index c905b3b75..528202161 100644
|
|
--- a/data/theme/gnome-shell-sass/_common.scss
|
|
+++ b/data/theme/gnome-shell-sass/_common.scss
|
|
@@ -1160,14 +1160,26 @@ StScrollBar {
|
|
//close buttons
|
|
|
|
.window-close {
|
|
- background-image: url("resource:///org/gnome/shell/theme/close-window.svg");
|
|
- background-size: 32px;
|
|
- height: 32px;
|
|
- width: 32px;
|
|
- -shell-close-overlap: 16px;
|
|
-
|
|
- &:hover { background-image: url("resource:///org/gnome/shell/theme/close-window-hover.svg"); }
|
|
- &:active { background-image: url("resource:///org/gnome/shell/theme/close-window-active.svg"); }
|
|
+ background-color: white;
|
|
+ border-radius: 24px;
|
|
+ border: 4px solid $selected_bg_color;
|
|
+ box-shadow: inset 0 -4px 0 0 transparentize($selected_bg_color, 0.5);
|
|
+ color: $selected_bg_color;
|
|
+ height: 24px;
|
|
+ width: 24px;
|
|
+ -shell-close-overlap: 14px;
|
|
+
|
|
+ &:hover {
|
|
+ background-color: $selected_bg_color;
|
|
+ border-color: white;
|
|
+ color: white;
|
|
+ }
|
|
+
|
|
+ &:active {
|
|
+ background-color: mix(white, $selected_bg_color, 75%);
|
|
+ border-color: $selected_bg_color;
|
|
+ color: $selected_bg_color;
|
|
+ }
|
|
}
|
|
|
|
/* NETWORK DIALOGS */
|
|
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
|
|
index 97c2d3a58..baa8a4380 100644
|
|
--- a/js/ui/workspace.js
|
|
+++ b/js/ui/workspace.js
|
|
@@ -473,6 +473,7 @@ var WindowOverlay = new Lang.Class({
|
|
});
|
|
|
|
let button = new St.Button({ style_class: 'window-close' });
|
|
+ button.add_actor(new St.Icon({ icon_name: 'window-close-symbolic' }));
|
|
button._overlap = 0;
|
|
|
|
this._idleToggleCloseId = 0;
|
|
--
|
|
2.20.0
|
|
|