diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-02-20 21:11:59 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-02-20 21:11:59 -0500 |
| commit | 8e5c1135c3e2644ea8501eda067e2b994faa44ab (patch) | |
| tree | 6b72038214359dcf8eff040a68874583e7174800 /view | |
| parent | 89a825cd038df7da609d64ef0254ba58caaede31 (diff) | |
| parent | 85a6dd60316eefbdaf072e59621d681a3cf2546b (diff) | |
| download | volse-hubzilla-8e5c1135c3e2644ea8501eda067e2b994faa44ab.tar.gz volse-hubzilla-8e5c1135c3e2644ea8501eda067e2b994faa44ab.tar.bz2 volse-hubzilla-8e5c1135c3e2644ea8501eda067e2b994faa44ab.zip | |
Merge branch 'dev' into oauth2
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/conversation.css | 10 | ||||
| -rw-r--r-- | view/js/main.js | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index 77a600deb..f7ab3dcdd 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -286,7 +286,6 @@ img.smiley.emoji:hover { height: 32px; } - .checklist input { margin: 0px; vertical-align: middle; @@ -296,6 +295,15 @@ img.smiley.emoji:hover { padding: 15px; } +.view-summary { + margin-bottom: 1rem; +} + +.view-article { + margin-top: 1rem; +} + + #filer_save { margin-left: 15px; } diff --git a/view/js/main.js b/view/js/main.js index 4a2bae802..f6fe475d8 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -357,7 +357,9 @@ function closeMenu(theID) { function markRead(notifType) { $.get('ping?f=&markRead='+notifType); $('.' + notifType + '-button').hide(); + $('#nav-' + notifType + '-sub').removeClass('show'); sessionStorage.removeItem(notifType + '_notifications_cache'); + sessionStorage.removeItem('notification_open'); if(timer) clearTimeout(timer); timer = setTimeout(updateInit,2000); } |