From 72ba708bfed3a1c87159dc910bab85e9a8c13c54 Mon Sep 17 00:00:00 2001 From: wmwragg Date: Fri, 5 Aug 2016 16:35:59 +0100 Subject: [PATCH] Menu separator styling --- .../views/context_menus/RoomTagContextMenu.js | 10 ++++++--- .../context_menus/RoomTagContextMenu.css | 22 ++++++++++++++----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/components/views/context_menus/RoomTagContextMenu.js b/src/components/views/context_menus/RoomTagContextMenu.js index 1d5bd554..1e6363c8 100644 --- a/src/components/views/context_menus/RoomTagContextMenu.js +++ b/src/components/views/context_menus/RoomTagContextMenu.js @@ -100,17 +100,20 @@ module.exports = React.createClass({ var favouriteClasses = classNames({ 'mx_RoomTagContextMenu_field': true, - 'mx_RoomTagContextMenu_fieldDisabled': true, + 'mx_RoomTagContextMenu_fieldSet': false, + 'mx_RoomTagContextMenu_fieldDisabled': false, }); var lowPriorityClasses = classNames({ 'mx_RoomTagContextMenu_field': true, - 'mx_RoomTagContextMenu_fieldSet': true, + 'mx_RoomTagContextMenu_fieldSet': false, + 'mx_RoomTagContextMenu_fieldDisabled': false, }); var leaveClasses = classNames({ 'mx_RoomTagContextMenu_field': true, - 'mx_RoomTagContextMenu_fieldDisabled': true, + 'mx_RoomTagContextMenu_fieldSet': false, + 'mx_RoomTagContextMenu_fieldDisabled': false, }); return ( @@ -123,6 +126,7 @@ module.exports = React.createClass({ Low Priority +
Leave diff --git a/src/skins/vector/css/vector-web/views/context_menus/RoomTagContextMenu.css b/src/skins/vector/css/vector-web/views/context_menus/RoomTagContextMenu.css index 47d7381e..a7c74ce4 100644 --- a/src/skins/vector/css/vector-web/views/context_menus/RoomTagContextMenu.css +++ b/src/skins/vector/css/vector-web/views/context_menus/RoomTagContextMenu.css @@ -16,9 +16,8 @@ limitations under the License. .mx_RoomTagContextMenu_field { padding-top: 4px; - padding-right: 6px; + padding-right: 20px; padding-bottom: 10px; - padding-left: 20px; cursor: pointer; white-space: nowrap; display: flex; @@ -27,7 +26,6 @@ limitations under the License. .mx_RoomTagContextMenu_field.mx_RoomTagContextMenu_fieldSet { font-weight: bold; - padding-left: 8px; } .mx_RoomTagContextMenu_field.mx_RoomTagContextMenu_fieldDisabled { @@ -35,10 +33,22 @@ limitations under the License. } .mx_RoomTagContextMenu_icon { - padding-right: 4px; + padding-right: 8px; padding-left: 4px; } -.mx_RoomTagContextMenu_fieldSet .mx_RoomTagContextMenu_icon { - +.mx_RoomTagContextMenu_separator { + margin-top: 0; + margin-bottom: 0; + border-bottom-style: none; + border-left-style: none; + border-right-style: none; + border-top-style: solid; + border-top-width: 1px; + border-color: #bbbbbb; + opacity: 0.4; +} + +.mx_RoomTagContextMenu_fieldSet .mx_RoomTagContextMenu_icon { + /* Something to indicate that the icon is the set tag */ }