aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2017-01-06 15:38:31 +0100
committerArthurHoaro <arthur@hoa.ro>2017-01-06 15:38:31 +0100
commitd2592219c6a454400a9115a24147d0b48f12b1cb (patch)
tree429ccabef82e82600f58abd399a7ebf20ebf6172
parentb057607f1b8a242c5c0325ceaf7c963632b960aa (diff)
downloadShaarli-d2592219c6a454400a9115a24147d0b48f12b1cb.tar.gz
Shaarli-d2592219c6a454400a9115a24147d0b48f12b1cb.tar.zst
Shaarli-d2592219c6a454400a9115a24147d0b48f12b1cb.zip
Simplify admin fields, change home icon
-rw-r--r--tpl/default/css/shaarli.css21
-rw-r--r--tpl/default/img/icon.pngbin0 -> 530 bytes
-rw-r--r--tpl/default/img/logo.pngbin6252 -> 0 bytes
-rw-r--r--tpl/default/js/shaarli.js4
-rw-r--r--tpl/default/linklist.html3
-rw-r--r--tpl/default/page.header.html3
6 files changed, 16 insertions, 15 deletions
diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css
index fafe7351..36d848d8 100644
--- a/tpl/default/css/shaarli.css
+++ b/tpl/default/css/shaarli.css
@@ -86,6 +86,9 @@ pre {
86 background-color: #1b926c; 86 background-color: #1b926c;
87} 87}
88 88
89.anchor:target {
90 padding-top: 35px;
91}
89/** 92/**
90 * MENU 93 * MENU
91 **/ 94 **/
@@ -107,9 +110,9 @@ pre {
107 height: inherit; 110 height: inherit;
108} 111}
109 112
110.shaarli-menu.open { 113.head-logo {
111 max-height: 500px; 114 float: left;
112 transition: max-height 0.75s; 115 margin: 0 5px 0 0;
113} 116}
114 117
115.pure-menu-link, 118.pure-menu-link,
@@ -612,10 +615,7 @@ pre {
612} 615}
613 616
614.linklist-item-infos .label-tag { 617.linklist-item-infos .label-tag {
615 font-size: 0.9em; 618 font-size: 1em;
616}
617
618.linklist-item-infos .label-tag:hover {
619} 619}
620 620
621.linklist-item-infos-dateblock { 621.linklist-item-infos-dateblock {
@@ -727,10 +727,9 @@ pre {
727 padding: 5px 5px 3px 15px; 727 padding: 5px 5px 3px 15px;
728 height: 35px; 728 height: 35px;
729 width: 90%; 729 width: 90%;
730 background: #ebebeb; 730 background: #eeeeee;
731 border: medium none currentColor; 731 border: solid 1px #d8d8d8;
732 border-radius: 2px; 732 border-radius: 2px;
733 box-shadow: 0 1px 0 rgba(255, 255, 255, 0.078), 0 1px 4px rgba(0, 0, 0, 0.298) inset;
734 color: #252525; 733 color: #252525;
735} 734}
736 735
@@ -886,7 +885,7 @@ pre {
886 text-align: left; 885 text-align: left;
887 margin: 10px 0 0 0; 886 margin: 10px 0 0 0;
888 } 887 }
889 888
890 .timezone-continent:after { 889 .timezone-continent:after {
891 content:"\a\a"; 890 content:"\a\a";
892 white-space: pre; 891 white-space: pre;
diff --git a/tpl/default/img/icon.png b/tpl/default/img/icon.png
new file mode 100644
index 00000000..474edec3
--- /dev/null
+++ b/tpl/default/img/icon.png
Binary files differ
diff --git a/tpl/default/img/logo.png b/tpl/default/img/logo.png
deleted file mode 100644
index ef0e09ac..00000000
--- a/tpl/default/img/logo.png
+++ /dev/null
Binary files differ
diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js
index 287d157c..a382a7eb 100644
--- a/tpl/default/js/shaarli.js
+++ b/tpl/default/js/shaarli.js
@@ -103,7 +103,7 @@ var foldButtons = document.querySelectorAll('.fold-button');
103var deleteLinks = document.querySelectorAll('.delete-link'); 103var deleteLinks = document.querySelectorAll('.delete-link');
104[].forEach.call(deleteLinks, function(deleteLink) { 104[].forEach.call(deleteLinks, function(deleteLink) {
105 deleteLink.addEventListener('click', function(event) { 105 deleteLink.addEventListener('click', function(event) {
106 if(!confirm('Are you sure you want to delete this link ?')) { 106 if(! confirm('Are you sure you want to delete this link ?')) {
107 event.preventDefault(); 107 event.preventDefault();
108 } 108 }
109 }); 109 });
@@ -178,4 +178,4 @@ if (openers != null) {
178 178
179function removeClass(element, classname) { 179function removeClass(element, classname) {
180 element.className = element.className.replace(new RegExp('(?:^|\\s)'+ classname + '(?:\\s|$)'), ' '); 180 element.className = element.className.replace(new RegExp('(?:^|\\s)'+ classname + '(?:\\s|$)'), ' ');
181} \ No newline at end of file 181}
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index 459a7c33..5bd8a12e 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -100,6 +100,7 @@
100 <div class="pure-u-lg-2-24 pure-u-1-24"></div> 100 <div class="pure-u-lg-2-24 pure-u-1-24"></div>
101 <div class="pure-u-lg-20-24 pure-u-22-24"> 101 <div class="pure-u-lg-20-24 pure-u-22-24">
102 {loop="links"} 102 {loop="links"}
103 <div class="anchor" id="{$value.shorturl}"></div>
103 <div class="linklist-item{if="$value.class"} {$value.class}{/if}"> 104 <div class="linklist-item{if="$value.class"} {$value.class}{/if}">
104 105
105 <div class="linklist-item-title"> 106 <div class="linklist-item-title">
@@ -115,7 +116,7 @@
115 {/if} 116 {/if}
116 117
117 <h2> 118 <h2>
118 <a href="{$value.real_url}" id="{$value.shorturl}" class=""> 119 <a href="{$value.real_url}">
119 {if="strpos($value.url, $value.shorturl) === false"} 120 {if="strpos($value.url, $value.shorturl) === false"}
120 <i class="fa fa-external-link"></i> 121 <i class="fa fa-external-link"></i>
121 {else} 122 {else}
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index ba643cac..a2f1e4bb 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -13,7 +13,8 @@
13 <ul class="pure-menu-list pure-u-lg-5-6 pure-u-1"> 13 <ul class="pure-menu-list pure-u-lg-5-6 pure-u-1">
14 <li class="pure-menu-item pure-u-0 pure-u-lg-visible"> 14 <li class="pure-menu-item pure-u-0 pure-u-lg-visible">
15 <a href="{$titleLink}" class="pure-menu-link"> 15 <a href="{$titleLink}" class="pure-menu-link">
16 <i class="fa fa-home"></i> {$shaarlititle} 16 <img src="img/icon.png" width="16" height="16" class="head-logo" />
17 {$shaarlititle}
17 </a> 18 </a>
18 </li> 19 </li>
19 {if="isLoggedIn() || $openshaarli"} 20 {if="isLoggedIn() || $openshaarli"}