diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-08-15 23:08:33 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-08-15 23:08:33 +0200 |
| commit | aef1d2a774599b46bb98238f0acdff5287b1ad8e (patch) | |
| tree | 7ad9ee1f4da727d6574056798ff574ed85d131b1 | |
| parent | a0230ad70b0e1d5cef7423f101adeba1e1fe34b3 (diff) | |
| parent | 1d6c71e216898729cf2cc8330130b568ab198f2a (diff) | |
Merge pull request #1217 from Alkarex/read_all-bug
Read-all bug fixed
| -rw-r--r-- | p/scripts/main.js | 4 | ||||
| -rw-r--r-- | p/themes/BlueLagoon/BlueLagoon.css | 2 | ||||
| -rw-r--r-- | p/themes/Screwdriver/screwdriver.css | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/p/scripts/main.js b/p/scripts/main.js index 6f1f40642..8980fe2f6 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -993,12 +993,12 @@ function load_more_posts() { box_load_more.children('.flux:last').after($('#stream', data).children('.flux, .day')); $('.pagination').replaceWith($('.pagination', data)); if (context.display_order === 'ASC') { - $('#nav_menu_read_all > .read_all').attr( + $('#nav_menu_read_all .read_all').attr( 'formaction', $('#bigMarkAsRead').attr('formaction') ); } else { $('#bigMarkAsRead').attr( - 'formaction', $('#nav_menu_read_all > .read_all').attr('formaction') + 'formaction', $('#nav_menu_read_all .read_all').attr('formaction') ); } diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css index d64ffd9a0..27bae5404 100644 --- a/p/themes/BlueLagoon/BlueLagoon.css +++ b/p/themes/BlueLagoon/BlueLagoon.css @@ -753,7 +753,7 @@ a.btn { border: 1px solid #CCC; box-shadow: 0px 1px #FFF; } -#panel > .nav_menu > #nav_menu_read_all > .dropdown > .btn.dropdown-toggle{ +#panel > .nav_menu > #nav_menu_read_all .dropdown > .btn.dropdown-toggle { border-radius: 0 4px 4px 0; border:none; border-left: solid 1px #ccc; diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css index b7bbd923e..9dbe523a1 100644 --- a/p/themes/Screwdriver/screwdriver.css +++ b/p/themes/Screwdriver/screwdriver.css @@ -748,7 +748,7 @@ a.btn { border: 1px solid #CCC; box-shadow: 0px 1px #FFF; } -#panel > .nav_menu > #nav_menu_read_all > .dropdown > .btn.dropdown-toggle{ +#panel > .nav_menu > #nav_menu_read_all .dropdown > .btn.dropdown-toggle { border-radius: 0 4px 4px 0; border:none; border-left: solid 1px #ccc; |