From 8ea6dcd3973aef84833ed0846d9db84f981ff8c7 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 14 Jan 2017 14:15:00 +0100 Subject: Fix delete buttons issues --- tpl/default/changetag.html | 2 +- tpl/default/css/shaarli.css | 12 ++++++++++++ tpl/default/editlink.html | 6 +++--- tpl/default/js/shaarli.js | 2 +- tpl/default/linklist.html | 4 ++-- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/tpl/default/changetag.html b/tpl/default/changetag.html index 4f98baec..8d263a16 100644 --- a/tpl/default/changetag.html +++ b/tpl/default/changetag.html @@ -28,7 +28,7 @@
- +
diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index 63cf68ac..ed9a86ca 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -760,6 +760,7 @@ pre { text-decoration: none; vertical-align: center; font-weight: normal; + display: inline-block; } @@ -767,6 +768,10 @@ pre { background: #ac2925; } +.page-form .submit-buttons { + margin-bottom: 10px; +} + @media screen and (min-width: 64em) { .page-form .submit-buttons { position: relative; @@ -778,6 +783,13 @@ pre { } } +@media screen and (max-width: 64em) { + .page-form .submit-buttons .button { + display: block; + margin: auto; + } +} + .page-form select { color: #252525; } diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index b17d1038..4f10ffb2 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html @@ -59,11 +59,11 @@ -
- +
+ {if="!$link_is_new"} + title="" name="delete_link" class="button button-red confirm-delete"> {'Delete'|t} {/if} diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index 925f6ce7..a3d40b0d 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js @@ -133,7 +133,7 @@ function toggleFold(button, description, thumb) /** * Confirmation message before deletion. */ -var deleteLinks = document.querySelectorAll('.delete-link'); +var deleteLinks = document.querySelectorAll('.confirm-delete'); [].forEach.call(deleteLinks, function(deleteLink) { deleteLink.addEventListener('click', function(event) { if(! confirm('Are you sure you want to delete this link ?')) { diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 5a601d82..b490fe7c 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -199,7 +199,7 @@ {if="isLoggedIn()"} + title="{'Delete'|t}" class="delete-link pure-u-0 pure-u-lg-visible confirm-delete"> {/if} @@ -215,7 +215,7 @@ {/if} {if="isLoggedIn()"} + title="{'Delete'|t}" class="delete-link confirm-delete"> {/if} -- cgit v1.2.3