From c98e473bc3d0e1807f5f35fb34ad81221f881024 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Wed, 17 Aug 2016 10:31:05 +0100 Subject: [PATCH] Fix layout of notifications --- .../app/views/project/list/notifications.jade | 7 +++---- .../public/stylesheets/app/project-list.less | 20 ++++++++++++++++--- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/services/web/app/views/project/list/notifications.jade b/services/web/app/views/project/list/notifications.jade index dd6886fba6..8dba0852ff 100644 --- a/services/web/app/views/project/list/notifications.jade +++ b/services/web/app/views/project/list/notifications.jade @@ -9,10 +9,9 @@ span(ng-controller="NotificationsController").userNotifications .row(ng-hide="unreadNotification.hide") .col-xs-12 .alert.alert-info - .row - .col-xs-11 - span(ng-bind-html="unreadNotification.html") - .col-xs-1 + div.notification_inner + span(ng-bind-html="unreadNotification.html").notification_body + span().notification_close button(ng-click="dismiss(unreadNotification)").close.pull-right span(aria-hidden="true") × span.sr-only #{translate("close")} diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index 53c780dbe4..d3131f136c 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -32,10 +32,24 @@ ul { margin-bottom:0px; } - .alert { - .box-shadow(2px 4px 6px rgba(0, 0, 0, 0.25)); + .notification_entry { + .alert { + .box-shadow(2px 4px 6px rgba(0, 0, 0, 0.25)); + .notification_inner { + display: table-row; + .notification_body { + display: table-cell; + width: 99%; + padding-right: 15px; + vertical-align: middle; + } + .notification_close { + display: table-cell; + vertical-align: middle; + } + } + } } - } ul.folders-menu {