diff options
author | nodiscc <nodiscc@gmail.com> | 2015-06-23 20:45:15 +0200 |
---|---|---|
committer | nodiscc <nodiscc@gmail.com> | 2015-06-23 20:45:15 +0200 |
commit | 4c68c20cdd2baec36c03aa6237d2d932605b6252 (patch) | |
tree | e1b5e6bbe83c81af6853622b74d49304ca9dfbb1 | |
parent | c68da3ffbfe1d73681e3d6288a7a74ef7aa8bb03 (diff) | |
parent | 38eb1e7770ca87b481872f17b66fba42ea873432 (diff) | |
download | Shaarli-4c68c20cdd2baec36c03aa6237d2d932605b6252.tar.gz Shaarli-4c68c20cdd2baec36c03aa6237d2d932605b6252.tar.zst Shaarli-4c68c20cdd2baec36c03aa6237d2d932605b6252.zip |
Merge remote-tracking branch 'nicolasdanelon/master' into next
-rw-r--r-- | inc/awesomplete.css | 3 | ||||
-rw-r--r-- | inc/shaarli.css | 11 |
2 files changed, 7 insertions, 7 deletions
diff --git a/inc/awesomplete.css b/inc/awesomplete.css index 76f903f7..0382e139 100644 --- a/inc/awesomplete.css +++ b/inc/awesomplete.css | |||
@@ -8,7 +8,6 @@ | |||
8 | div.awesomplete { | 8 | div.awesomplete { |
9 | display: inline-block; | 9 | display: inline-block; |
10 | position: relative; | 10 | position: relative; |
11 | width: 100%; | ||
12 | } | 11 | } |
13 | 12 | ||
14 | div.awesomplete > input { | 13 | div.awesomplete > input { |
@@ -94,4 +93,4 @@ div.awesomplete li:hover mark { | |||
94 | div.awesomplete li[aria-selected="true"] mark { | 93 | div.awesomplete li[aria-selected="true"] mark { |
95 | background: hsl(86, 102%, 21%); | 94 | background: hsl(86, 102%, 21%); |
96 | color: inherit; | 95 | color: inherit; |
97 | } \ No newline at end of file | 96 | } |
diff --git a/inc/shaarli.css b/inc/shaarli.css index fcd5c6a2..95732da8 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css | |||
@@ -221,12 +221,7 @@ h1 { | |||
221 | margin-left:24px; | 221 | margin-left:24px; |
222 | } | 222 | } |
223 | 223 | ||
224 | .tagfilter div.awesomplete { | ||
225 | width: inherit; | ||
226 | } | ||
227 | |||
228 | .tagfilter #tagfilter_value { | 224 | .tagfilter #tagfilter_value { |
229 | width: 100%; | ||
230 | display: inline; | 225 | display: inline; |
231 | } | 226 | } |
232 | 227 | ||
@@ -349,6 +344,7 @@ h1 { | |||
349 | } | 344 | } |
350 | 345 | ||
351 | #headerform label { | 346 | #headerform label { |
347 | cursor: pointer; | ||
352 | margin-right: 10px; | 348 | margin-right: 10px; |
353 | } | 349 | } |
354 | 350 | ||
@@ -976,6 +972,11 @@ div.dailyNoEntry { | |||
976 | 972 | ||
977 | @media handheld, only screen and (max-width: 480px), only screen and (max-device-width: 854px) { | 973 | @media handheld, only screen and (max-width: 480px), only screen and (max-device-width: 854px) { |
978 | /* A few fixes for mobile devices (far from perfect). */ | 974 | /* A few fixes for mobile devices (far from perfect). */ |
975 | |||
976 | .tagfilter div.awesomplete { | ||
977 | width: 70%; | ||
978 | } | ||
979 | |||
979 | .nomobile { | 980 | .nomobile { |
980 | display: none; | 981 | display: none; |
981 | } | 982 | } |