From 52e49a1ed64205cd855add10e3c8193cb5167fb7 Mon Sep 17 00:00:00 2001 From: juliandescottes Date: Mon, 17 Sep 2018 22:48:13 +0200 Subject: [PATCH] Add toggle grid icon to minimap --- src/css/toolbox-animated-preview.css | 13 +++++++++++-- src/img/icons/minimap/minimap-grid-gold.png | Bin 0 -> 135 bytes src/img/icons/minimap/minimap-grid-gold@2x.png | Bin 0 -> 192 bytes src/img/icons/minimap/minimap-grid-white.png | Bin 0 -> 135 bytes .../icons/minimap/minimap-grid-white@2x.png | Bin 0 -> 186 bytes src/js/controller/preview/PreviewController.js | 17 +++++++++++++++++ src/templates/preview.html | 2 ++ 7 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 src/img/icons/minimap/minimap-grid-gold.png create mode 100644 src/img/icons/minimap/minimap-grid-gold@2x.png create mode 100644 src/img/icons/minimap/minimap-grid-white.png create mode 100644 src/img/icons/minimap/minimap-grid-white@2x.png diff --git a/src/css/toolbox-animated-preview.css b/src/css/toolbox-animated-preview.css index 7037ee51..3c595389 100644 --- a/src/css/toolbox-animated-preview.css +++ b/src/css/toolbox-animated-preview.css @@ -124,6 +124,14 @@ border-color: var(--highlight-color); } +/** + * If the icon represents an enabled state, the border should always be gold. + */ +.preview-contextual-action-enabled { + color: var(--highlight-color); + border-color: var(--highlight-color); +} + /** * Drop-down in preview size selection */ @@ -195,6 +203,7 @@ @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { - background-image: url(../img/icons/minimap/minimap-popup-preview-arrow-gold@2x.png); - + .icon-minimap-popup-preview-arrow-white:hover { + background-image: url(../img/icons/minimap/minimap-popup-preview-arrow-gold@2x.png); + } } diff --git a/src/img/icons/minimap/minimap-grid-gold.png b/src/img/icons/minimap/minimap-grid-gold.png new file mode 100644 index 0000000000000000000000000000000000000000..ffadd064440ec4071fb808483bffac1b674f4029 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|A5Ry@5DWk0lm$WwOD0+JNU;6g zf9`{Pip63zmp%dcX9BOJSvJoMS$`;ouUzmdPt(qpfEf!;_qScluwqKp{4&L+;*#LX iN}gETtEZG1!tX>0TiA;y0L^9aboFyt=akUIzyJUhh$^)J literal 0 HcmV?d00001 diff --git a/src/img/icons/minimap/minimap-grid-gold@2x.png b/src/img/icons/minimap/minimap-grid-gold@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b9ca0854c173464c0c63eae34f58c79d5deab850 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB+B{txLn7SYPPgVepuppNvass^ z;V%{?y6+NPBPYGu_-W$TM-m-Zb6kvVxgFOjO}nt~dY!z`bzM?Xv^*CK^0yEU zdp`BXac7Q6>)!f%*an`J++H6y-O+>Ni@B+#3*XG|B9>qFFIo2X_}1FplL~L|zAfhz s>2$R|ylns9+v)sk*11nm{=smSV~eV+%C*Bl7cqFc`njxgN@!vL04-@u_W%F@ literal 0 HcmV?d00001 diff --git a/src/img/icons/minimap/minimap-grid-white.png b/src/img/icons/minimap/minimap-grid-white.png new file mode 100644 index 0000000000000000000000000000000000000000..42d3cfb2ee70568cf8f206bb5bc439ab978e55d3 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|Ur!gu5DWk0lm$WwOD0+JNU;6= z|Np=Ji2^q_w+%9ic4ri?m~*5VuZ(NmDf3Qgl_X0s=RyO=>GHgbFP5;J3VNYg`C*B2 i&}WHVRja1DGo;_E5RThEH5X_wgQu&X%Q~loCI$d1&n!v+ literal 0 HcmV?d00001 diff --git a/src/img/icons/minimap/minimap-grid-white@2x.png b/src/img/icons/minimap/minimap-grid-white@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c7d234c77c2954d30be7f8c18c422c8632af36ba GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB8a-VcLn7SYPB-K`puod?^1uAt zb!#QpXm|(7YO_SPCo7!WAb9wT49ia8jV(sT_h-8tS-#AAJ(J*)mhXZ={uaVz&!^sa zs>tGb{ha!ec`u&ztiFFeRX~X8v#&4TMCWI=u6%#>S7!b$&9#4bV#nLNx%>;Y7QWlR mIx7GFx2wFnUkg6ru&a6hL3P>ESvo++FnGH9xvX
Full
+