Merge remote-tracking branch 'nicolasdanelon/master' into next

1 files changed, 24 insertions, 0 deletions

diff --git a/inc/shaarli.css b/inc/shaarli.css
index f5413524..fcd5c6a2 100644
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -348,6 +348,16 @@ h1 {
     font-size: inherit;
 }
 
+#headerform label {
+    margin-right: 10px;
+}
+
+#headerform label[for=longlastingsession] {
+    display: block;
+    width: 100%;
+    margin-top: 5px;
+}
+
 #toolsdiv {
     color: #ffffff;
     padding: 5px 5px 5px 5px;
@@ -984,6 +994,20 @@ div.dailyNoEntry {
         margin: 3px;
     }
 
+    #headerform label {
+    width: 100%;
+    display: block;
+    height: auto;
+    line-height: 25px;
+    padding-bottom: 10px;
+    }
+
+    #headerform label input[type=text],
+    #headerform label input[type=password]{
+    float: right;
+    width: 70%;
+    }
+
     .searchform, .tagfilter {
         display: block !important;
         margin: 0px 3px 7px 0px !important;