From: nodiscc <nodiscc@gmail.com>
Date: Tue, 23 Jun 2015 13:03:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'nicolasdanelon/master' into next
X-Git-Tag: v0.5.0~35
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=adb1d6c213e64f7a6f4559adbc4d1f69f5a74e62;hp=-c;p=github%2Fshaarli%2FShaarli.git

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

adb1d6c213e64f7a6f4559adbc4d1f69f5a74e62
diff --combined inc/shaarli.css
index f5413524,da0c3599..fcd5c6a2
--- a/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;