diff options
author | Timm Bäder <mail@baedert.org> | 2020-01-13 14:12:51 +0000 |
---|---|---|
committer | Timm Bäder <mail@baedert.org> | 2020-01-13 14:12:51 +0000 |
commit | 3e51966ea907deca2f05a8e5e6ad2b96e5bb8a20 (patch) | |
tree | b03e87f0713f1c9d5703206cb7e991333d3cef24 | |
parent | 75c433fb5f4ca6af0319689cee4f9f6a6b1967b6 (diff) | |
parent | e292767a013fb17a66986c0500942be1b140e7bd (diff) | |
download | gtk+-3e51966ea907deca2f05a8e5e6ad2b96e5bb8a20.tar.gz |
Merge branch 'wip/jimmac/updated-checkmark' into 'master'
Adwaita: update checkbox & radio
Closes #2291
See merge request GNOME/gtk!1289
-rw-r--r-- | gtk/theme/Adwaita/assets/bullet-symbolic.svg | 26 | ||||
-rw-r--r-- | gtk/theme/Adwaita/assets/bullet-symbolic.symbolic.png | bin | 147 -> 165 bytes | |||
-rw-r--r-- | gtk/theme/Adwaita/assets/bullet@2-symbolic.symbolic.png | bin | 227 -> 268 bytes | |||
-rw-r--r-- | gtk/theme/Adwaita/assets/check-symbolic.svg | 39 | ||||
-rw-r--r-- | gtk/theme/Adwaita/assets/check-symbolic.symbolic.png | bin | 231 -> 246 bytes | |||
-rw-r--r-- | gtk/theme/Adwaita/assets/check@2-symbolic.symbolic.png | bin | 286 -> 381 bytes |
6 files changed, 33 insertions, 32 deletions
diff --git a/gtk/theme/Adwaita/assets/bullet-symbolic.svg b/gtk/theme/Adwaita/assets/bullet-symbolic.svg index c0299734fc..acf880adb4 100644 --- a/gtk/theme/Adwaita/assets/bullet-symbolic.svg +++ b/gtk/theme/Adwaita/assets/bullet-symbolic.svg @@ -17,7 +17,7 @@ height="14" id="svg7384" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" width="14"> <metadata id="metadata90"> @@ -37,8 +37,8 @@ bordercolor="#666666" borderopacity="1" inkscape:current-layer="layer9" - inkscape:cx="9.6493349" - inkscape:cy="5.5864571" + inkscape:cx="6.1684486" + inkscape:cy="5.9327595" gridtolerance="10" inkscape:guide-bbox="true" guidetolerance="10" @@ -47,10 +47,10 @@ inkscape:object-paths="false" objecttolerance="10" pagecolor="#3a3b39" - inkscape:pageopacity="1" + inkscape:pageopacity="0" inkscape:pageshadow="2" showborder="true" - showgrid="false" + showgrid="true" showguides="true" inkscape:snap-bbox="true" inkscape:snap-bbox-midpoints="false" @@ -59,12 +59,12 @@ inkscape:snap-nodes="false" inkscape:snap-others="false" inkscape:snap-to-guides="true" - inkscape:window-height="1016" + inkscape:window-height="1376" inkscape:window-maximized="1" - inkscape:window-width="1920" + inkscape:window-width="3440" inkscape:window-x="0" - inkscape:window-y="27" - inkscape:zoom="22.005438" + inkscape:window-y="639" + inkscape:zoom="62.240778" inkscape:showpageshadow="false"> <inkscape:grid dotted="false" @@ -74,8 +74,8 @@ originx="-139.99995" originy="120" snapvisiblegridlinesonly="true" - spacingx="1px" - spacingy="1px" + spacingx="1" + spacingy="1" type="xygrid" visible="true" /> </sodipodi:namedview> @@ -101,10 +101,10 @@ transform="translate(-381.00015,-339)"> <path inkscape:connector-curvature="0" - d="m 388.00015,343.01754 c -1.64587,0 -2.98246,1.33658 -2.98246,2.98246 0,1.64587 1.33659,2.98246 2.98246,2.98246 1.64587,0 2.98246,-1.33659 2.98246,-2.98246 0,-1.64588 -1.33659,-2.98246 -2.98246,-2.98246 z" + d="m 388.00015,341.99995 c -2.20743,0 -4.00005,1.79261 -4.00005,4.00005 0,2.20743 1.79262,4.00005 4.00005,4.00005 2.20743,0 4.00005,-1.79262 4.00005,-4.00005 0,-2.20744 -1.79262,-4.00005 -4.00005,-4.00005 z" id="path9555" sodipodi:nodetypes="csssc" - 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';text-indent:0pt;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78125;marker:none" /> + 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';text-indent:0pt;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.38899732;marker:none" /> </g> <g inkscape:groupmode="layer" diff --git a/gtk/theme/Adwaita/assets/bullet-symbolic.symbolic.png b/gtk/theme/Adwaita/assets/bullet-symbolic.symbolic.png Binary files differindex 2ccb0e861a..8e6925a5f8 100644 --- a/gtk/theme/Adwaita/assets/bullet-symbolic.symbolic.png +++ b/gtk/theme/Adwaita/assets/bullet-symbolic.symbolic.png diff --git a/gtk/theme/Adwaita/assets/bullet@2-symbolic.symbolic.png b/gtk/theme/Adwaita/assets/bullet@2-symbolic.symbolic.png Binary files differindex 6703b5359b..e9df4256c0 100644 --- a/gtk/theme/Adwaita/assets/bullet@2-symbolic.symbolic.png +++ b/gtk/theme/Adwaita/assets/bullet@2-symbolic.symbolic.png diff --git a/gtk/theme/Adwaita/assets/check-symbolic.svg b/gtk/theme/Adwaita/assets/check-symbolic.svg index bac5cd6aaa..4fdce5226c 100644 --- a/gtk/theme/Adwaita/assets/check-symbolic.svg +++ b/gtk/theme/Adwaita/assets/check-symbolic.svg @@ -11,13 +11,13 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="check-symbolic.svg" - inkscape:export-filename="/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" + inkscape:export-filename="/home/jimmac/Projects/gtk/gtk/theme/Adwaita/assets/check@2-symbolic.symbolic.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192" height="14" id="svg7384" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.4 5da689c313, 2019-01-14" width="14"> <metadata id="metadata90"> @@ -37,8 +37,8 @@ bordercolor="#666666" borderopacity="1" inkscape:current-layer="layer9" - inkscape:cx="-15.966869" - inkscape:cy="8.8415069" + inkscape:cx="7.0525573" + inkscape:cy="8.5476141" gridtolerance="10" inkscape:guide-bbox="true" guidetolerance="10" @@ -47,10 +47,10 @@ inkscape:object-paths="false" objecttolerance="10" pagecolor="#3a3b39" - inkscape:pageopacity="1" + inkscape:pageopacity="0" inkscape:pageshadow="2" showborder="true" - showgrid="false" + showgrid="true" showguides="true" inkscape:snap-bbox="true" inkscape:snap-bbox-midpoints="false" @@ -59,12 +59,12 @@ inkscape:snap-nodes="false" inkscape:snap-others="false" inkscape:snap-to-guides="true" - inkscape:window-height="1016" - inkscape:window-maximized="1" - inkscape:window-width="1920" - inkscape:window-x="0" - inkscape:window-y="27" - inkscape:zoom="15.238496" + inkscape:window-height="791" + inkscape:window-maximized="0" + inkscape:window-width="1611" + inkscape:window-x="1011" + inkscape:window-y="1032" + inkscape:zoom="1" inkscape:showpageshadow="false"> <inkscape:grid dotted="false" @@ -74,8 +74,8 @@ originx="-159.99995" originy="120" snapvisiblegridlinesonly="true" - spacingx="1px" - spacingy="1px" + spacingx="1" + spacingy="1" type="xygrid" visible="true" /> </sodipodi:namedview> @@ -100,10 +100,11 @@ style="display:inline;opacity:1" transform="translate(-401.00015,-339)"> <path - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" - d="m 415.00015,339.98047 -6.5,6.39453 -2.9375,-2.9375 -2.125,2.125 5.0625,5.0625 6.5,-6.60547 0,-4.03906 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;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;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" + d="m 411.89132,341.94772 -4.39702,4.34915 -3.3125,-3.1875 -2.39063,2.45313 5.21718,5.46025 6.77589,-7.31969 c 1.13568,-1.31246 -0.63533,-3.01292 -1.89292,-1.75534 z" id="path8913-6-7-1-5-1" - inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> </g> <g inkscape:groupmode="layer" diff --git a/gtk/theme/Adwaita/assets/check-symbolic.symbolic.png b/gtk/theme/Adwaita/assets/check-symbolic.symbolic.png Binary files differindex eed1f45a58..b41bc80cf4 100644 --- a/gtk/theme/Adwaita/assets/check-symbolic.symbolic.png +++ b/gtk/theme/Adwaita/assets/check-symbolic.symbolic.png diff --git a/gtk/theme/Adwaita/assets/check@2-symbolic.symbolic.png b/gtk/theme/Adwaita/assets/check@2-symbolic.symbolic.png Binary files differindex df11544a06..f7c143fcc7 100644 --- a/gtk/theme/Adwaita/assets/check@2-symbolic.symbolic.png +++ b/gtk/theme/Adwaita/assets/check@2-symbolic.symbolic.png |