diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2014-05-29 12:50:28 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2014-05-29 12:50:28 +0200 |
commit | 87f01ea2e97715ac5df4ef7a6741cc26f3a5cd1b (patch) | |
tree | 558818975ac41403e7d55ad07c5b0ac29806e907 /themes | |
parent | ab157bbb75ba226917145c9bf906cbf764a85cd0 (diff) | |
parent | 0b9bb8cb7868f24137c5d8b85c39cc88ea877411 (diff) | |
download | wallabag-87f01ea2e97715ac5df4ef7a6741cc26f3a5cd1b.tar.gz wallabag-87f01ea2e97715ac5df4ef7a6741cc26f3a5cd1b.tar.zst wallabag-87f01ea2e97715ac5df4ef7a6741cc26f3a5cd1b.zip |
Merge pull request #707 from mariroz/dev
update to 3.2 version of full-text-rss, issue #694
Diffstat (limited to 'themes')
-rwxr-xr-x[-rw-r--r--] | themes/default/_search-form.twig | 14 | ||||
-rwxr-xr-x | themes/default/css/style.css | 21 |
2 files changed, 19 insertions, 16 deletions
diff --git a/themes/default/_search-form.twig b/themes/default/_search-form.twig index 74f420d0..33bea20d 100644..100755 --- a/themes/default/_search-form.twig +++ b/themes/default/_search-form.twig | |||
@@ -7,17 +7,3 @@ | |||
7 | </p> | 7 | </p> |
8 | </form> | 8 | </form> |
9 | </div> | 9 | </div> |
10 | <script type="text/javascript"> | ||
11 | $(document).ready(function() { | ||
12 | |||
13 | $("#search-form").hide(); | ||
14 | |||
15 | $("#search").click(function(){ | ||
16 | $("#search-form").toggle(); | ||
17 | $("#search").toggleClass("current"); | ||
18 | $("#search-arrow").toggleClass("arrow-down"); | ||
19 | }); | ||
20 | |||
21 | |||
22 | }); | ||
23 | </script> \ No newline at end of file | ||
diff --git a/themes/default/css/style.css b/themes/default/css/style.css index 11a8ea1c..e58ef81a 100755 --- a/themes/default/css/style.css +++ b/themes/default/css/style.css | |||
@@ -384,8 +384,8 @@ a#bagit-form-close { | |||
384 | background-color: #000; | 384 | background-color: #000; |
385 | color: #fff; | 385 | color: #fff; |
386 | padding: 0 4px 1px 3px; | 386 | padding: 0 4px 1px 3px; |
387 | font-weight: bold; | 387 | font-weight: bold; |
388 | font-size: 0.7em; | 388 | font-size: 0.7em; |
389 | border-radius: 4px; | 389 | border-radius: 4px; |
390 | } | 390 | } |
391 | .add-to-wallabag-link-after:hover, .add-to-wallabag-link-after:active { | 391 | .add-to-wallabag-link-after:hover, .add-to-wallabag-link-after:active { |
@@ -394,6 +394,23 @@ a#bagit-form-close { | |||
394 | .add-to-wallabag-link-after:visited { | 394 | .add-to-wallabag-link-after:visited { |
395 | color: #999; | 395 | color: #999; |
396 | } | 396 | } |
397 | a.add-to-wallabag-link-after { | ||
398 | visibility: hidden; | ||
399 | position: absolute; | ||
400 | opacity: 0; | ||
401 | transition-duration: 2s; | ||
402 | transition-timing-function: ease-out; | ||
403 | } | ||
404 | #article article a:hover + a.add-to-wallabag-link-after, a.add-to-wallabag-link-after:hover { | ||
405 | opacity: 1; | ||
406 | visibility: visible; | ||
407 | transition-duration: .3s; | ||
408 | transition-timing-function: ease-in; | ||
409 | } | ||
410 | a.add-to-wallabag-link-after:after { | ||
411 | content: "w"; | ||
412 | } | ||
413 | |||
397 | 414 | ||
398 | #add-link-result { | 415 | #add-link-result { |
399 | display: inline; | 416 | display: inline; |