From 541335d90fff494519bbd0b3eae4be5ac43cfd33 Mon Sep 17 00:00:00 2001 From: Moriel Schottlender Date: Thu, 3 Mar 2016 12:54:11 -0800 Subject: [PATCH] Styling adjustments for notifications Bug: T125969 Bug: T128444 Change-Id: I3dba4fcddf5262450cce4ba384abfdc3518b7cb8 --- .../styles/mw.echo.ui.MenuItemWidget.less | 2 ++ ...w.echo.ui.NotificationGroupItemWidget.less | 2 +- .../mw.echo.ui.NotificationItemWidget.less | 20 +++++++++---------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/modules/ooui/styles/mw.echo.ui.MenuItemWidget.less b/modules/ooui/styles/mw.echo.ui.MenuItemWidget.less index dbe31c3fc..52457d703 100644 --- a/modules/ooui/styles/mw.echo.ui.MenuItemWidget.less +++ b/modules/ooui/styles/mw.echo.ui.MenuItemWidget.less @@ -30,7 +30,9 @@ } &-prioritized { + .mw-echo-ui-mixin-hover-opacity(); display: inline-block; + padding: 0; } // Correct for when inside the popup menu diff --git a/modules/ooui/styles/mw.echo.ui.NotificationGroupItemWidget.less b/modules/ooui/styles/mw.echo.ui.NotificationGroupItemWidget.less index 71d65c13d..b677da8ac 100644 --- a/modules/ooui/styles/mw.echo.ui.NotificationGroupItemWidget.less +++ b/modules/ooui/styles/mw.echo.ui.NotificationGroupItemWidget.less @@ -13,7 +13,7 @@ } &-content { - margin-bottom: 0.5em; + margin-bottom: 1em; padding-right: 0.8em; padding-left: ~"calc(30px + 1.6em)"; // 30px+0.8em from ItemWidget, plus 0.8em } diff --git a/modules/ooui/styles/mw.echo.ui.NotificationItemWidget.less b/modules/ooui/styles/mw.echo.ui.NotificationItemWidget.less index 1a9a070b3..d9be2c9d4 100644 --- a/modules/ooui/styles/mw.echo.ui.NotificationItemWidget.less +++ b/modules/ooui/styles/mw.echo.ui.NotificationItemWidget.less @@ -6,7 +6,6 @@ background-color: #F1F1F1; border-bottom: 1px solid #DDDDDD; white-space: normal; - line-height: 16px; &:hover > a { text-decoration: none; @@ -33,6 +32,7 @@ width: 100%; &-message { + line-height: 16px; &-header { color: @notification-text-color; } @@ -55,20 +55,18 @@ & > &-buttons.oo-ui-buttonSelectWidget { display: table-cell; - vertical-align: top; - width: 100%; + vertical-align: middle; } .mw-echo-ui-menuItemWidget { - &:not(:last-child) { - margin-right: 1em; - } + margin-right: 1.2em; } &-menu { + .mw-echo-ui-mixin-hover-opacity(); display: table-cell; - vertical-align: top; - padding: 0 0.5em; + vertical-align: middle; + padding: 0; .oo-ui-popupWidget-popup { font-size: 1 / 0.8em; @@ -78,10 +76,12 @@ &-timestamp { display: table-cell; - vertical-align: top; + vertical-align: middle; + text-align: right; color: black; opacity: @opacity-low; white-space: nowrap; + width: 100%; } } @@ -155,7 +155,7 @@ float: right; font-size: 1em; margin-top: -0.5em; - margin-right: -0.5em; + margin-right: -0.4em; padding: 0; .mw-echo-ui-notificationItemWidget-bundle & {