From: ArthurHoaro Date: Wed, 2 Nov 2016 14:31:09 +0000 (+0100) Subject: Minor adjustments X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=8fd434886b5d5ec1e2471732d53c92724ab04fa4;p=github%2Fshaarli%2FShaarli.git Minor adjustments --- diff --git a/tpl/default/changetag.html b/tpl/default/changetag.html index cf0e5a9f..0aae9090 100644 --- a/tpl/default/changetag.html +++ b/tpl/default/changetag.html @@ -25,7 +25,7 @@ {loop="$tags"}{/loop} -
{'Case sensitive'|t}
+
{'Case sensitive'|t}
diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index debd25ea..91d801a5 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -112,10 +112,6 @@ pre { transition: max-height 0.75s; } -.pure-menu-selected { - background: #b0ddce; -} - .pure-menu-link, .pure-menu-link:visited, .pure-menu-selected .pure-menu-link, @@ -174,7 +170,7 @@ pre { #header { width: 100%; height: 150px; - background: url(../img/noise.png), #1fa67a url(../img/logo2.png) no-repeat fixed 10px 2.5em; + background: url(../img/noise.png), #1fa67a url(../img/logo.png) no-repeat fixed 10px 2.5em; } #header h1 { @@ -515,6 +511,7 @@ pre { } .linklist-item-thumbnail { + margin-top: 10px; padding: 10px; float: left; } @@ -672,6 +669,7 @@ pre { .page-form select { color: black; } + /** * PAGE FORM - LIGHT */ @@ -717,6 +715,12 @@ pre { font-size: 0.7em; } +.page-form-complete input[type="text"], +.page-form-complete input[type="password"], +.page-form-complete textarea { + margin: 0; +} + .page-form section { margin-top: 20px; } @@ -1133,4 +1137,17 @@ pre { .daily-entry-thumbnail { float: left; margin: 15px 5px 5px 5px; -} \ No newline at end of file +} + +.daily-entry-description a { + text-decoration: none; + color: #1b926c; +} + +.daily-entry-description a:hover { + text-shadow: 1px 1px #ddd; +} + +.daily-entry-description a:visited { + color: #20b988; +} diff --git a/tpl/default/img/logo2.png b/tpl/default/img/logo2.png deleted file mode 100644 index ef0e09ac..00000000 Binary files a/tpl/default/img/logo2.png and /dev/null differ diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index 53ec20c5..3afec7f3 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js @@ -68,16 +68,18 @@ var searchInputs = document.querySelectorAll('#search input[type="text"]'); }); /** - * Fold/Expand shaares description. + * Fold/Expand shaares description and thumbnail. */ var foldButtons = document.querySelectorAll('.fold-button'); [].forEach.call(foldButtons, function(foldButton) { // Retrieve description var description = null; + var thumbnail = null; var linklistItem = getParentByClass(foldButton, 'linklist-item'); if (linklistItem != null) { description = linklistItem.querySelector('.linklist-item-description'); - if (description != null) { + thumbnail = linklistItem.querySelector('.linklist-item-thumbnail'); + if (description != null || thumbnail != null) { foldButton.style.display = 'inline'; } } @@ -88,11 +90,21 @@ var foldButtons = document.querySelectorAll('.fold-button'); // Switch fold/expand - up = fold if (event.target.classList.contains('fa-chevron-up')) { event.target.title = 'Expand'; - description.style.display = 'none'; + if (description != null) { + description.style.display = 'none'; + } + if (thumbnail != null) { + thumbnail.style.display = 'none'; + } } else { event.target.title = 'Fold'; - description.style.display = 'block'; + if (description != null) { + description.style.display = 'block'; + } + if (thumbnail != null) { + thumbnail.style.display = 'block'; + } } event.target.classList.toggle('fa-chevron-down'); event.target.classList.toggle('fa-chevron-up'); diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html index 3e5a5868..4dbfb324 100644 --- a/tpl/default/linklist.paging.html +++ b/tpl/default/linklist.paging.html @@ -47,7 +47,7 @@ 20 50 100 -
+
diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html index b9d4389b..527c0504 100644 --- a/tpl/default/page.footer.html +++ b/tpl/default/page.footer.html @@ -1,8 +1,8 @@