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

diff --combined inc/shaarli.css
index f54135249a80da97a14fdc64179db6ae3af94d81,da0c35997a4112443df1df80599f0e9d3e793770..fcd5c6a2b436944ee74f31a9f19019eb51b41873
--- 1/inc/shaarli.css
--- 2/inc/shaarli.css
+++ b/inc/shaarli.css
@@@ -221,17 -221,8 +221,17 @@@ h1 
      margin-left:24px;
  }
  
 +.tagfilter div.awesomplete {
 +    width: inherit;
 +}
 +
  .tagfilter #tagfilter_value {
 -    width: 10%;
 +    width: 100%;
 +    display: inline;
 +}
 +
 +.tagfilter li {
 +    color: black;
  }
  
  .tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton {
@@@ -348,6 -339,16 +348,16 @@@
      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 -985,20 +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;