diff options
author | Jay Sitter <jsitter@gmail.com> | 2014-10-31 13:47:45 -0400 |
---|---|---|
committer | Jay Sitter <jsitter@gmail.com> | 2014-10-31 13:47:45 -0400 |
commit | 15eb5ca4b83710059c1bb7a7a6aa270ed3cb704c (patch) | |
tree | 5cc06a2a014a6b29e9b0e2ef98fef05fa7e86bd0 /themes/default | |
parent | 4bc70ed4012bcefa6a3a01a051fcbd18456403df (diff) | |
parent | 224528f1debb06b40524fd84ed9a324c0b6131e2 (diff) | |
download | wallabag-15eb5ca4b83710059c1bb7a7a6aa270ed3cb704c.tar.gz wallabag-15eb5ca4b83710059c1bb7a7a6aa270ed3cb704c.tar.zst wallabag-15eb5ca4b83710059c1bb7a7a6aa270ed3cb704c.zip |
Merging changes with dev
Diffstat (limited to 'themes/default')
-rw-r--r-- | themes/default/css/messages.css | 5 | ||||
-rwxr-xr-x | themes/default/css/style.css | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/themes/default/css/messages.css b/themes/default/css/messages.css index 3ad4e34e..46b54795 100644 --- a/themes/default/css/messages.css +++ b/themes/default/css/messages.css | |||
@@ -8,11 +8,6 @@ | |||
8 | border-radius: 4px; | 8 | border-radius: 4px; |
9 | } | 9 | } |
10 | 10 | ||
11 | /* Search form message needs a little more width, depending on translations */ | ||
12 | #search-form { | ||
13 | width: 420px; | ||
14 | } | ||
15 | |||
16 | .messages a.closeMessage { | 11 | .messages a.closeMessage { |
17 | display: none; | 12 | display: none; |
18 | float: right; | 13 | float: right; |
diff --git a/themes/default/css/style.css b/themes/default/css/style.css index e254d481..b25373d6 100755 --- a/themes/default/css/style.css +++ b/themes/default/css/style.css | |||
@@ -417,6 +417,15 @@ a.add-to-wallabag-link-after:after { | |||
417 | padding-left: 10px; | 417 | padding-left: 10px; |
418 | } | 418 | } |
419 | 419 | ||
420 | /* ========================================================================== | ||
421 | "Search" popup div related styles | ||
422 | ========================================================================== */ | ||
423 | |||
424 | /* Search form message needs a little more width, depending on translations */ | ||
425 | #search-form { | ||
426 | width: 420px; | ||
427 | } | ||
428 | |||
420 | .opacity03 { | 429 | .opacity03 { |
421 | /*opacity: 0.3;*/ | 430 | /*opacity: 0.3;*/ |
422 | } | 431 | } |
@@ -435,4 +444,4 @@ pre code { | |||
435 | font-family: "Courier New", Courier, monospace; | 444 | font-family: "Courier New", Courier, monospace; |
436 | border: 1px solid #ddd; | 445 | border: 1px solid #ddd; |
437 | font-size: 0.96em; | 446 | font-size: 0.96em; |
438 | } \ No newline at end of file | 447 | } |