4 files changed, 93 insertions, 54 deletions

diff --git a/COPYING b/COPYING
index ec4f7681..7312abd3 100644
--- a/COPYING
+++ b/COPYING
@@ -18,6 +18,7 @@ Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
            (c) 2011-2015 virtualtam <virtualtam@flibidi.org>
            (c) 2011-2015 qwertygc <champlywood@free.fr>
            (c) 2011-2015 idleman <idleman@idleman.fr>
+           (c) 2015 Miloš Jovanović <mjovanovic@gmail.com>
 
 
 Files: inc/reset.css
diff --git a/images/private.png b/images/private.png
index 1364b355..8919d658 100644
--- a/images/private.png
+++ b/images/private.png
diff --git a/inc/shaarli.css b/inc/shaarli.css
index a88143ca..34c32224 100644
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -17,7 +17,7 @@ input, textarea {
     background: linear-gradient(#dedede, #ffffff);
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
     padding: 5px;
-    border-radius: 5px 5px 5px 5px;
+    border-radius: 3px 3px 3px 3px;
     border: none;
     color: #000;
 }
@@ -84,21 +84,14 @@ h1 {
 
 .linkeditbuttons {
     position: absolute;
-    left: -1px;
+    left: 2px;
     padding: 4px 2px 2px 2px;
-    background-color: #f0f0f0;
 
     -webkit-border-radius: 0px 6px 6px 0px;
     -moz-border-radius: 0px 6px 6px 0px;
     -o-border-radius: 0px 6px 6px 0px;
     -ms-border-radius: 0px 6px 6px 0px;
     border-radius: 0px 6px 6px 0px;
-
-    -webkit-box-shadow: 0px 0px 3px 0px #333333;
-    -moz-box-shadow: 0px 0px 3px 0px #333333;
-    -o-box-shadow: 0px 0px 3px 0px #333333;
-    -ms-box-shadow: 0px 0px 3px 0px #333333;
-    box-shadow: 0px 0px 3px 0px #333333;
 }
 
 #pageheader #logo {
@@ -111,12 +104,48 @@ h1 {
     cursor: pointer;
 }
 
+#pageheader #menu {
+    width: 100%;
+}
+
+#pageheader #menu ul {
+    margin: auto;
+    padding: 7px 0px 0px 0px;
+    float: none;
+}
+
+#pageheader #menu ul li {
+    list-style: none;
+    display: inline;
+    position: relative;
+    box-sizing: border-box;
+}
+
+#pageheader a {
+    background-color: #333333;
+    background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#000000));
+    background: -webkit-linear-gradient(#333333, #000000);
+    background: -moz-linear-gradient(#333333, #000000);
+    background: -ms-linear-gradient(#333333, #000000);
+    background: -o-linear-gradient(#333333, #000000);
+    background: linear-gradient(#333333, #000000);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
+    padding: 5px;
+    border-radius: 3px 3px 3px 3px;
+    margin: 10px 3px 3px 3px;
+    color: #A2DD42;
+    text-decoration: none;
+    line-height: 2.5;
+    white-space: nowrap;
+}
+
 #pageheader #linkcount {
     float: right;
     font-style: italic;
     color: #bbb;
     text-align: right;
     padding-right: 5px;
+    margin: 3px 3px 0px 0px;
 }
 
 #pageheader {
@@ -133,23 +162,6 @@ h1 {
     margin: auto;
 }
 
-#pageheader a {
-    background-color: #333333;
-    background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#000000));
-    background: -webkit-linear-gradient(#333333, #000000);
-    background: -moz-linear-gradient(#333333, #000000);
-    background: -ms-linear-gradient(#333333, #000000);
-    background: -o-linear-gradient(#333333, #000000);
-    background: linear-gradient(#333333, #000000);
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
-    padding: 5px;
-    border-radius: 5px 5px 5px 5px;
-    margin: 10px 3px 3px 3px;
-    color: #A2DD42;
-    float: left;
-    text-decoration: none;
-}
-
 #pageheader .search {
     width: 100%;
     white-space: nowrap;
@@ -179,7 +191,7 @@ h1 {
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
     padding: 5px;
     border: none;
-    border-radius: 5px 5px 5px 5px;
+    border-radius: 3px 3px 3px 3px;
     margin: 10px 3px 3px 3px;
     color: #cecece;
 }
@@ -225,7 +237,7 @@ h1 {
     padding: 0 5px 0 5px;
     margin: 5px 0 5px 0;
     height: 20px;
-    border-radius: 5px 5px 5px 5px;
+    border-radius: 3px 3px 3px 3px;
     cursor: pointer;
 }
 
@@ -291,6 +303,7 @@ h1 {
 .paging_linksperpage {
     float: right;
     padding-right: 5px;
+    margin: 0px 10px 2px 0px;
 }
 
 .paging_linksperpage form.linksperpage {
@@ -388,12 +401,12 @@ a.qrcode img {
 }
 
 #linklist li.private {
-    background: url('../images/private.png') no-repeat 10px center;
-    padding-left: 60px;
+    background: url('../images/private.png') no-repeat 4px center;
+    padding-left: 30px;
 }
 
 #linklist li {
-    padding-left: 26px;
+    padding-left: 30px;
 }
 
 .private .linktitle a {
@@ -468,9 +481,9 @@ a.qrcode img {
     background: -o-linear-gradient(#F2F2F2, #ffffff);
     background: linear-gradient(#F2F2F2, #ffffff);
     box-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
-    padding: 3px 3px 3px 20px;
+    padding: 3px 5px 3px 20px;
     height: 20px;
-    border-radius: 3px 3px 3px 3px;
+    border-radius: 3px;
     cursor: pointer;
     background-image: url('../images/tag_blue.png');
     background-repeat: no-repeat;
@@ -515,9 +528,10 @@ a.qrcode img {
 #footer {
     font-size: 8pt;
     text-align: center;
-    border-top: 1px solid #ddd;
     color: #888;
     clear: both;
+    max-width: 30em;
+    margin: 15px auto 15px auto;
 }
 
 #footer a {
@@ -613,7 +627,12 @@ a.qrcode img {
 
 .thumbnail {
     float: right;
-    margin-left: 10px;
+    margin: 0px 10px 0px 10px;
+}
+
+.thumbnail img {
+    border-radius: 3px;
+    box-shadow: 0.5px 0.5px 0.5px 1px #dde4e6;
 }
 
 /* If you want thumbnails on the left:
@@ -938,17 +957,21 @@ div.dailyNoEntry {
         display: none;
     }
 
-    #pageheader a {
+    #pageheader #menu ul {
+        text-align: center;
+    }
+
+    #pageheader #menu a {
         padding: 5px;
-        border-radius: 5px 5px 5px 5px;
+        border-radius: 3px 3px 3px 3px;
         margin: 3px;
     }
 
     .searchform, .tagfilter {
         display: block !important;
-        margin: 0px !important;
+        margin: 0px 3px 7px 0px !important;
         padding: 0px !important;
-        width: 100% !important;
+        width: 97% !important;
     }
 
     .searchform input, .tagfilter input {
@@ -992,7 +1015,7 @@ div.dailyNoEntry {
         padding: 3px 5px 3px 5px;
         background-color: #666;
         color: #fff;
-        border-radius: 5px 5px 5px 5px;
+        border-radius: 3px 3px 3px 3px;
     }
 
     .thumbnail {
diff --git a/tpl/page.header.html b/tpl/page.header.html
index 17c0c75c..0fd65e40 100644
--- a/tpl/page.header.html
+++ b/tpl/page.header.html
@@ -1,28 +1,43 @@
 
-    <div id="logo" title="Share your links !" onclick="document.location='?';"></div>
-    <div id="linkcount" class="nomobile">Shaare your links...<br>
-        {if="!empty($linkcount)"}{$linkcount} links{/if}</div>
-    <span id="shaarli_title"><a href="{$titleLink}">{$shaarlititle|htmlspecialchars}</a></span>
+<div id="logo" title="Share your links !" onclick="document.location='?';"></div>
+
+<div id="linkcount" class="nomobile">
+    {if="!empty($linkcount)"}{$linkcount} links{/if}
+</div>
+
+<div id="menu">
+  <ul>
+      <li><span id="shaarli_title">
+        <a href="{$titleLink}">{$shaarlititle|htmlspecialchars}</a>
+    </span>
+    </li>
   
 {if="!empty($_GET['source']) && $_GET['source']=='bookmarklet'"}
     {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore}
 {else}
-    <a href="?" class="nomobile">Home</a>
+<li><a href="?" class="nomobile">Home</a></li>
     {if="isLoggedIn()"}
-        <a href="?do=logout">Logout</a><a href="?do=tools">Tools</a><a href="?do=addlink"><b>Add link</b></a>
+    <li><a href="?do=logout">Logout</a></li>
+    <li><a href="?do=tools">Tools</a></li>
+    <li><a href="?do=addlink">Add link</a></li>
     {elseif="$GLOBALS['config']['OPEN_SHAARLI']"}
-        <a href="?do=tools">Tools</a><a href="?do=addlink"><b>Add link</b></a>
+    <li><a href="?do=tools">Tools</a></li>
+    <li><a href="?do=addlink">Add link</a></li>
     {else}
-        <a href="?do=login">Login</a>
+    <li><a href="?do=login">Login</a></li>
     {/if}
-    <a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a>
+    <li><a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a></li>
     {if="$GLOBALS['config']['SHOW_ATOM']"}
-        <a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a>
+    <li><a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a></li>
     {/if}
-    <a href="?do=tagcloud">Tag cloud</a>
-    <a href="?do=picwall{$searchcrits}">Picture wall</a>
-    <a href="?do=daily">Daily</a>
+    <li><a href="?do=tagcloud">Tag cloud</a></li>
+    <li><a href="?do=picwall{$searchcrits}">Picture wall</a></li>
+    <li><a href="?do=daily">Daily</a></li>
 {/if}
-    <div class="clear"></div>
+  </ul>
+</div>
+
+
+<div class="clear"></div>