Skip to content

Commit 9472b3f

Browse files
themacboythemacboyjywarren
authored
Opacities action (#1260)
* bug _cornerExceedsMapLats, set positive values * inici OpacitiesAction * actualitzar projecte * afegir carpeta node_modules * intentar carregar llibreries * carregar leaflet desde CDN * afegir icona Opacities * posar icona opacities a la barra * afegir icona opacities, correcció de bugs i rebuild * canvi icona Opacities * probar el sub-menu * sub-menu test 1 * sub-menu test 2 * sub-menu test 3 * sub-menu test 4 * sub-menu test 5 * sub-menu test 6 * sub-menu test 7 * sub-menu test 8 * sub-menu test 9 * sub-menu test 10 * sub-menu test 11 * sub-menu test 12 * sub-menu test 13 * sub-menu test 14 * sub-menu test 15 * sub-menu test 16 * sub-menu test 17 * sub-menu test 18 * sub-menu test 19 * sub-menu test 20 * sub-menu test 21 * sub-menu test 22 * sub-menu test 23 * sub-menu test 24 * sub-menu test 25 * sub-menu test 26 * sub-menu test 26 * sub-menu test 27 * sub-menu test 28 * sub-menu test 29 * sub-menu test 30 * sub-menu test 31 * sub-menu test 32 * sub-menu test 33 * sub-menu test 34 * sub-menu test 35 * sub-menu test 36 * sub-menu test 37 * sub-menu final test, pending a few know issues * correct Opacities icon, incorrect change when OpacityAction is fired * add comment in OpacitiesAction * correct undesired values in opacities array * millorar aplicació dels style al sub-toolbar * ajust css text sub-toolbar * ajust css text sub-toolbar * bug event propagation increase sub-toolbar z-index * re-build after merge for Opacities activation * bug barra colorize mal activada * cleaning * rebuild * afegir icones * The Opacities action has been moved up, above the toolbar * correct some mistakes * correct vertical displacement * re-build * incliude CSS overwrites * correct _opacity assignement after opacities change * mini bug * correct custom CSSStyleSheet * run build * rebuild * Remove CDN in examples * final * update & compile --------- Co-authored-by: themacboy <[email protected]> Co-authored-by: Jeffrey Warren <[email protected]>
1 parent 8cca752 commit 9472b3f

18 files changed

+611
-8420
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ package-lock.json
88
dist/*
99
!dist/leaflet.distortableimage.css
1010
!dist/leaflet.distortableimage.js
11+
!dist/vendor.js
12+
!dist/vendor.css
13+
!dist/leaflet.distortableimage.js.map

‎assets/icons/svg-min/opacities.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎assets/icons/svg/opacities.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎assets/icons/symbol/sprite.symbol.html‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
.svg-lock-dims { width: 18px; height: 18px; }
3535
.svg-opacity-dims { width: 18px; height: 18px; }
3636
.svg-opacity_empty-dims { width: 14px; height: 18px; }
37+
.svg-opacities-dims { width: 14px; height: 18px; }
3738
.svg-restore-dims { width: 18px; height: 18px; }
3839
.svg-rotate-dims { width: 18px; height: 18px; }
3940
.svg-scale-dims { width: 18px; height: 18px; }
@@ -76,6 +77,7 @@
7677
<symbol viewBox="0 0 18 18" id="lock"><path d="M13.5 6h-.75V4.5C12.75 2.43 11.07.75 9 .75 6.93.75 5.25 2.43 5.25 4.5V6H4.5C3.675 6 3 6.675 3 7.5V15c0 .825.675 1.5 1.5 1.5h9c.825 0 1.5-.675 1.5-1.5V7.5c0-.825-.675-1.5-1.5-1.5zM6.75 4.5A2.247 2.247 0 019 2.25a2.247 2.247 0 012.25 2.25V6h-4.5V4.5zM13.5 15h-9V7.5h9V15zM9 12.75c.825 0 1.5-.675 1.5-1.5s-.675-1.5-1.5-1.5-1.5.675-1.5 1.5.675 1.5 1.5 1.5z"/></symbol>
7778
<symbol viewBox="0 0 18 18" id="opacity"><path d="M13.245 6L9 1.763 4.755 6A6.015 6.015 0 003 10.23c0 1.5.585 3.082 1.755 4.252a5.993 5.993 0 008.49 0A6.066 6.066 0 0015 10.23c0-1.5-.585-3.06-1.755-4.23zM4.5 10.5c.008-1.5.465-2.453 1.32-3.3L9 3.952l3.18 3.285c.855.84 1.313 1.763 1.32 3.263h-9z"/></symbol>
7879
<symbol viewBox="0 0 14 18" id="opacity_empty"><path stroke="#0078A8" stroke-width="1.7" d="M10.708 6.25A5.113 5.113 0 0112.2 9.846c0 1.275-.497 2.62-1.492 3.614a5.094 5.094 0 01-7.216 0A5.156 5.156 0 012 9.846c0-1.275.497-2.601 1.492-3.596L7.1 2.648l3.608 3.602zm0 0L7.1 2.648 3.492 6.25A5.113 5.113 0 002 9.846c0 1.275.497 2.62 1.492 3.614a5.094 5.094 0 007.216 0A5.156 5.156 0 0012.2 9.846a5.113 5.113 0 00-1.492-3.596z"/></symbol>
80+
<symbol viewBox="0 0 14 18" id="opacities"><g fill="#0078a8"><path d="m2.1 10.85c.2.98.68 1.89 1.39 2.61 0 0 .01.01.01.01.99.99 2.3 1.49 3.6 1.49h.01c1.3 0 2.6-.5 3.59-1.5.73-.73 1.19-1.66 1.39-2.61z" opacity=".75"/><path d="m2 9.85c0 .34.04.68.1 1.01h9.99c.07-.34.11-.67.11-1.01 0-1.13-.4-2.21-1.08-3.09h-8.04c-.7.91-1.08 2.01-1.08 3.09z" opacity=".5"/><path d="m3.08 6.75h8.03c-.13-.17-.26-.35-.41-.5l-3.6-3.6-3.61 3.6c-.15.16-.27.33-.41.5z" opacity=".25"/></g><path d="m10.71 6.25c.95.96 1.49 2.25 1.49 3.6 0 1.27-.5 2.62-1.49 3.61-1.99 1.99-5.21 2-7.2.01 0 0-.01-.01-.01-.01-.96-.96-1.5-2.26-1.5-3.61 0-1.27.5-2.6 1.49-3.6l3.61-3.6z" fill="none" stroke="#0078a8" stroke-width=".1"/><path d="m10.71 6.25c.95.96 1.49 2.25 1.49 3.6 0 1.27-.5 2.62-1.49 3.61-1.99 1.99-5.21 2-7.2.01 0 0-.01-.01-.01-.01-.96-.96-1.5-2.26-1.5-3.61 0-1.27.5-2.6 1.49-3.6l3.61-3.6z" fill="none" stroke="#0078a8" stroke-width="1.7"/></symbol>
7981
<symbol viewBox="0 0 18 18" id="restore"><path d="M15.67 3.839a.295.295 0 00-.22.103l-5.116 3.249V4.179a.342.342 0 00-.193-.315.29.29 0 00-.338.078L3.806 7.751v-4.63h-.002l.002-.022c0-.277-.204-.502-.456-.502h-.873V2.6c-.253 0-.457.225-.457.503l.002.026v10.883h.005c.021.257.217.454.452.455l.016-.002h.822c.013.001.025.004.038.004.252 0 .457-.225.457-.502a.505.505 0 00-.006-.068V9.318l6.001 3.811a.288.288 0 00.332.074.34.34 0 00.194-.306V9.878l5.12 3.252a.288.288 0 00.332.073.34.34 0 00.194-.306V4.18a.358.358 0 00-.09-.24.296.296 0 00-.218-.1z"/></symbol>
8082
<symbol viewBox="0 0 18 18" id="rotate"><path d="M5.505 4.808L.645 9.675l4.867 4.86 4.868-4.86-4.875-4.868zM2.768 9.675L5.513 6.93 8.25 9.675 5.505 12.42 2.768 9.675zM14.52 4.98A6.713 6.713 0 009.75 3V.57L6.57 3.75l3.18 3.18V4.5a5.23 5.23 0 013.713 1.537 5.255 5.255 0 010 7.426 5.23 5.23 0 01-5.843 1.08L6.503 15.66a6.76 6.76 0 003.247.84c1.725 0 3.457-.66 4.77-1.98a6.735 6.735 0 000-9.54z"/></symbol>
8183
<symbol viewBox="0 0 18 18" id="scale"><path d="M8.25 9h-6a.75.75 0 00-.75.75v6c0 .414.336.75.75.75h6a.75.75 0 00.75-.75v-6A.75.75 0 008.25 9zm-.75 6H3v-4.5h4.5V15zm8.94-13.035a.75.75 0 00-.405-.405.75.75 0 00-.285-.06h-4.5a.75.75 0 000 1.5h2.692L9.967 6.968a.75.75 0 000 1.064.75.75 0 001.065 0L15 4.057V6.75a.75.75 0 101.5 0v-4.5a.75.75 0 00-.06-.285z"/></symbol>
@@ -275,6 +277,17 @@ <h2>opacity</h2>
275277
</div>
276278
<h2>opacity_empty</h2>
277279
</li>
280+
<li title="opacities">
281+
<div class="icon-box">
282+
283+
<!-- opacities -->
284+
<svg class="svg-opacities-dims">
285+
<use xlink:href="#opacities"></use>
286+
</svg>
287+
288+
</div>
289+
<h2>opacities</h2>
290+
</li>
278291
<li title="restore">
279292
<div class="icon-box">
280293

@@ -516,6 +529,17 @@ <h2>opacity</h2>
516529
</div>
517530
<h2>opacity_empty</h2>
518531
</li>
532+
<li title="opacities">
533+
<div class="icon-box">
534+
535+
<!-- opacities -->
536+
<svg class="svg-opacities-dims">
537+
<use xlink:href="sprite.symbol.svg#opacities"></use>
538+
</svg>
539+
540+
</div>
541+
<h2>opacities</h2>
542+
</li>
519543
<li title="restore">
520544
<div class="icon-box">
521545

‎assets/icons/symbol/sprite.symbol.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎dist/leaflet.distortableimage.js‎

Lines changed: 2 additions & 8416 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/leaflet.distortableimage.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vendor.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vendor.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)