3 files changed, 47 insertions, 21 deletions

diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css
index c9229c3c..2f2f142d 100644
--- a/tpl/default/css/shaarli.css
+++ b/tpl/default/css/shaarli.css
@@ -112,7 +112,7 @@ pre {
 }
 
 .pure-menu-selected {
-    background: #1A694C;
+    background: #b0ddce;
 }
 
 .pure-menu-link,
@@ -535,12 +535,12 @@ pre {
     color: #000;
 }
 
-.linklist-item-tags {
+.linklist-item-infos .linklist-item-tags {
     margin: 0 0 5px 0;
     font-size: 0.8em;
 }
 
-.linklist-item-infos .label-tag {
+.linklist-item-infos .linklist-item-infos .label-tag {
     border: 1px solid #505050;
     font-size: 0.9em;
 }
@@ -766,12 +766,12 @@ pre {
     margin: 0 0 5px 0;
 }
 
-.linklist-item-infos .label-tag {
+.label-tag {
     border: 1px solid #505050;
     font-size: 0.9em;
 }
 
-.linklist-item-infos .label-tag:hover {
+.label-tag:hover {
     border: 1px solid #000;
 }
 
@@ -788,6 +788,24 @@ pre {
 }
 
 /**
+ * Search results
+ */
+.search-result a {
+    color: white;
+    text-decoration: none;
+}
+
+.search-result .label-tag {
+    border-color: white;
+}
+
+.search-result .label-tag .remove {
+    border-left: white 1px solid;
+    padding: 0 0 0 5px;
+    margin: 0 0 0 5px;
+}
+
+/**
  * TOOLS
  */
 .tools-item {
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index 174ab44b..19a0c3c7 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -21,22 +21,30 @@
   </div>
 
   {if="count($links)==0"}
-    <div id="searchcriteria">Nothing found.</div>
+    <div class="pure-g pure-alert pure-alert-error search-result">
+      <div class="pure-u-2-24"></div>
+      <div class="pure-u-20-24">
+        <div id="searchcriteria">Nothing found.</div>
+      </div>
+    </div>
   {elseif="!empty($search_term) or !empty($search_tags)"}
-    <div id="searchcriteria">
-      {$result_count} results
-      {if="!empty($search_term)"}
-        for <em>{$search_term}</em>
-      {/if}
-      {if="!empty($search_tags)"}
-        {$exploded_tags=explode(' ', $search_tags)}
-        tagged
-        {loop="$exploded_tags"}
-          <span class="linktag" title="Remove tag">
-            <a href="?removetag={function="urlencode($value)"}">{$value} <span class="remove">x</span></a>
-          </span>
-        {/loop}
-      {/if}
+    <div class="pure-g pure-alert pure-alert-success search-result">
+      <div class="pure-u-2-24"></div>
+      <div class="pure-u-20-24">
+        {$result_count} results
+        {if="!empty($search_term)"}
+          for <em><strong>{$search_term}</strong></em>
+        {/if}
+        {if="!empty($search_tags)"}
+          {$exploded_tags=explode(' ', $search_tags)}
+          tagged
+          {loop="$exploded_tags"}
+              <span class="label label-tag" title="Remove tag">
+                <a href="?removetag={function="urlencode($value)"}">{$value}<span class="remove"><i class="fa fa-times"></i></span></a>
+              </span>
+          {/loop}
+        {/if}
+      </div>
     </div>
   {/if}
 
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index bf5a65e8..dfec763a 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -134,7 +134,7 @@
         <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="6">
         <label for="longlastingsession">Remember me</label>
       </div>
-      <input type="hidden" name="token" value="{$token}">
+      <!--<input type="hidden" name="token" value="{$token}">-->
       <input type="hidden" name="returnurl">
       <input type="submit" value="Login" tabindex="7">
     </div>