cleanup layout of notifications

This commit is contained in:
Henry Oswald 2016-02-04 14:28:31 +00:00
parent 9d61a58710
commit f136486f4b
4 changed files with 24 additions and 19 deletions

View file

@ -14,7 +14,7 @@ module.exports =
statusCode = if res? then res.statusCode else 500
if err? or statusCode != 200
e = new Error("something went wrong getting notifications, #{err}, #{statusCode}")
logger.err err:err
logger.err err:err, "something went wrong getting notifications"
callback(null, [])
else
if !unreadNotifications?

View file

@ -1,17 +1,15 @@
span(ng-controller="NotificationsController")
.col-md-12
.row
ul.list-unstyled.notifications-list(
ng-if="notifications.length > 0",
ng-cloak
)
li.notification_entry(
ng-repeat="unreadNotification in notifications",
)
.row(ng-hide="unreadNotification.hide")
.col-xs-12
.alert.alert-warning
span(ng-bind-html="unreadNotification.html")
button(ng-click="dismiss(unreadNotification)").close.pull-right
span(aria-hidden="true") ×
span.sr-only #{translate("close")}
span(ng-controller="NotificationsController").userNotifications
ul.list-unstyled.notifications-list(
ng-if="notifications.length > 0",
ng-cloak
)
li.notification_entry(
ng-repeat="unreadNotification in notifications",
)
.row(ng-hide="unreadNotification.hide")
.col-xs-12
.alert.alert-warning
span(ng-bind-html="unreadNotification.html")
button(ng-click="dismiss(unreadNotification)").close.pull-right
span(aria-hidden="true") ×
span.sr-only #{translate("close")}

View file

@ -107,7 +107,7 @@ module.exports =
sixpack:
url: ""
notifications:
url: "http://localhost:3033"
url: "http://localhost:3042"
templates:
user_id: process.env.TEMPLATES_USER_ID or "5395eb7aad1f29a88756c7f2"

View file

@ -28,6 +28,13 @@
}
}
.userNotifications {
ul {
margin-bottom:0px;
}
}
ul.folders-menu {
margin: 0;
.subdued {