From 5b1ef760a06dd892a6decf6a621e710b5ae4e7bd Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 11 Dec 2017 16:50:25 +0100 Subject: notification: slight animation for loading... and do not remove public stream items on click (we can not mark them read) --- view/theme/redbasic/css/style.css | 43 +++++++++++++++++++++++++++++++++++++++ view/tpl/navbar_tucson.tpl | 12 +++++------ view/tpl/notifications_widget.tpl | 6 ++++-- 3 files changed, 53 insertions(+), 8 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5728d7948..e46d31ef8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -306,6 +306,49 @@ nav { /* spinner end */ +/* jumping dots */ +.jumping-dots span { + position: relative; + bottom: 0px; + transition-timing-function: ease-in-out; + -webkit-animation: jump 1s infinite; + animation: jump 1s infinite; +} + +.jumping-dots .dot-1 { + -webkit-animation-delay: 200ms; + animation-delay: 200ms; +} + +.jumping-dots .dot-2 { + -webkit-animation-delay: 400ms; + animation-delay: 400ms; +} + +.jumping-dots .dot-3 { + -webkit-animation-delay: 600ms; + animation-delay: 600ms; +} + +@-webkit-keyframes jump { + 0% { + bottom: 0px; + } + 20% { + bottom: 3px; + } + 40% { + bottom: 0px; + } +} + +@keyframes jump { + 0% {bottom: 0px;} + 20% {bottom: 3px;} + 40% {bottom: 0px;} +} +/* jumping dots end */ + /* footer */ footer { diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl index 4e045571f..08fc40656 100755 --- a/view/tpl/navbar_tucson.tpl +++ b/view/tpl/navbar_tucson.tpl @@ -113,7 +113,7 @@ {{/if}} @@ -126,7 +126,7 @@ {{/if}} @@ -139,7 +139,7 @@ {{/if}} @@ -152,7 +152,7 @@ {{/if}} @@ -164,7 +164,7 @@ {{/if}} @@ -177,7 +177,7 @@ {{/if}} diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 9751f2e75..0974045fe 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -43,7 +43,9 @@ e.preventDefault(); if(! page_load) { - $(this).fadeOut(); + if($(this).parent().attr('id') !== 'nav-pubs-menu') + $(this).fadeOut(); + getData(b64mid, notify_id); } @@ -110,7 +112,7 @@ {{$notification.filter.label}} {{/if}} - {{$loading}} + {{$loading}}... {{/foreach}} -- cgit v1.2.3