Commit c7e5072e authored by Ujvari Gergely's avatar Ujvari Gergely

Polishing notifications:

- Added font family
- Bottombar has it's height decreased
- Centering the changes for the center of the speech bubble icon
parent e78f7b53
...@@ -110,8 +110,9 @@ svg { -webkit-tap-highlight-color: rgba(255, 255, 255, 0); } ...@@ -110,8 +110,9 @@ svg { -webkit-tap-highlight-color: rgba(255, 255, 255, 0); }
} }
.notification-counter { .notification-counter {
font-family: $sansFontFamily;
position: absolute; position: absolute;
margin-left: 1em; margin-left: .8em;
float: left; float: left;
margin-top: 0.37em; margin-top: 0.37em;
z-index: 2; z-index: 2;
...@@ -123,7 +124,7 @@ svg { -webkit-tap-highlight-color: rgba(255, 255, 255, 0); } ...@@ -123,7 +124,7 @@ svg { -webkit-tap-highlight-color: rgba(255, 255, 255, 0); }
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
left: 39px; //17 + $heatmap_width left: 39px; //17 + $heatmap_width
height: 5em; height: 3.7em;
width: 100%; width: 100%;
.notif-list { .notif-list {
...@@ -137,6 +138,10 @@ svg { -webkit-tap-highlight-color: rgba(255, 255, 255, 0); } ...@@ -137,6 +138,10 @@ svg { -webkit-tap-highlight-color: rgba(255, 255, 255, 0); }
.bottom-padding { .bottom-padding {
padding-bottom: .5em; padding-bottom: .5em;
} }
.notif-text {
font-family: $sansFontFamily;
}
} }
//CONTROLBAR STUFF//////////////////////////////// //CONTROLBAR STUFF////////////////////////////////
......
...@@ -454,9 +454,11 @@ class App ...@@ -454,9 +454,11 @@ class App
$scope.addUpdateNotification = -> $scope.addUpdateNotification = ->
# Do not add an update notification twice # Do not add an update notification twice
unless $scope.new_updates > 0 unless $scope.new_updates > 0
if $scope.new_updates < 2 then text = 'change.'
else text = 'changes.'
notification = notification =
type: 'update' type: 'update'
text: 'Click to load ' + $scope.new_updates + ' changes.' text: 'Click to load ' + $scope.new_updates + ' ' + text
callback: => callback: =>
$scope.reloadAnnotations() $scope.reloadAnnotations()
$scope.removeNotificationUpdate() $scope.removeNotificationUpdate()
...@@ -464,15 +466,16 @@ class App ...@@ -464,15 +466,16 @@ class App
$scope.notifications.unshift notification $scope.notifications.unshift notification
$element.find('.tri').toggle('fg_highlight',{color:'lightblue'})
$timeout ->
$element.find('.tri').toggle('fg_highlight',{color:'lightblue'})
,500
$scope.$watch 'new_updates', (updates) -> $scope.$watch 'new_updates', (updates) ->
for notif in $scope.notifications for notif in $scope.notifications
if notif.type is 'update' if notif.type is 'update'
notif.text = 'Click to load ' + updates + ' changes.' if $scope.new_updates < 2 then text = 'change.'
else text = 'changes.'
notif.text = 'Click to load ' + updates + ' ' + text
$element.find('.tri').toggle('fg_highlight',{color:'lightblue'})
$timeout ->
$element.find('.tri').toggle('fg_highlight',{color:'lightblue'})
,500
$scope.initUpdater = -> $scope.initUpdater = ->
$scope.new_updates = 0 $scope.new_updates = 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment