diff options
author | Andreas Hoegger | 2018-07-18 14:03:45 +0000 |
---|---|---|
committer | Andreas Hoegger | 2018-07-18 14:04:38 +0000 |
commit | 02fab532f5a556d417c53813cc77ce84305170c7 (patch) | |
tree | c85da550e215a9550ebfa30197471eb1f259910a | |
parent | c72c779d70bef7f26d8a3ffa23251489f82b580d (diff) | |
download | org.eclipse.scout.rt-02fab532f5a556d417c53813cc77ce84305170c7.tar.gz org.eclipse.scout.rt-02fab532f5a556d417c53813cc77ce84305170c7.tar.xz org.eclipse.scout.rt-02fab532f5a556d417c53813cc77ce84305170c7.zip |
Styling simplifications of menu items
removes unnecessary not selectors.
Change-Id: I04031186399b7f01052e15e818662ce05fe879a9
3 files changed, 17 insertions, 15 deletions
diff --git a/org.eclipse.scout.rt.ui.html/src/main/js/scout/desktop/viewbutton/ViewMenuTab.less b/org.eclipse.scout.rt.ui.html/src/main/js/scout/desktop/viewbutton/ViewMenuTab.less index bbd4d67043..18e66f108d 100644 --- a/org.eclipse.scout.rt.ui.html/src/main/js/scout/desktop/viewbutton/ViewMenuTab.less +++ b/org.eclipse.scout.rt.ui.html/src/main/js/scout/desktop/viewbutton/ViewMenuTab.less @@ -37,9 +37,10 @@ background-color: @view-button-tab-background-color; color: @view-button-tab-color; -} + &.menu-item:hover { + color: @text-color; + } -.view-menu { &.view-menu-popup-head { position: absolute; background-color: @view-menu-popup-background-color; diff --git a/org.eclipse.scout.rt.ui.html/src/main/js/scout/menu/Menu.less b/org.eclipse.scout.rt.ui.html/src/main/js/scout/menu/Menu.less index 57769d3984..50a8a00adf 100644 --- a/org.eclipse.scout.rt.ui.html/src/main/js/scout/menu/Menu.less +++ b/org.eclipse.scout.rt.ui.html/src/main/js/scout/menu/Menu.less @@ -13,23 +13,19 @@ display: inline-block; vertical-align: middle; white-space: nowrap; - color: @text-color; + cursor: pointer; #scout.vertical-align-helper-before(); - &:not(.form-field-menu) { - cursor: pointer; - } - & > .key-box { bottom: -3px; } - &:not(.disabled):not(.form-field-menu):not(.view-menu):hover { + &:hover { color: @hover-color; } - &:not(.disabled):active { + &:active { color: @active-color; } diff --git a/org.eclipse.scout.rt.ui.html/src/main/js/scout/menu/form/field/FormFieldMenu.less b/org.eclipse.scout.rt.ui.html/src/main/js/scout/menu/form/field/FormFieldMenu.less index 09150e1436..17c7096a50 100644 --- a/org.eclipse.scout.rt.ui.html/src/main/js/scout/menu/form/field/FormFieldMenu.less +++ b/org.eclipse.scout.rt.ui.html/src/main/js/scout/menu/form/field/FormFieldMenu.less @@ -9,6 +9,17 @@ * BSI Business Systems Integration AG - initial API and implementation ******************************************************************************/ .form-field-menu { + cursor: default; + + &:hover { + color: @text-color; + } + + &:not(.has-text):not(.has-icon) { + & > .form-field > label { + margin-left: 0; + } + } & > .form-field { display: inline-block; @@ -32,10 +43,4 @@ /* Use same disabled color as for menu items */ color: @menu-item-disabled-color; } - - &:not(.has-text):not(.has-icon) { - & > .form-field > label { - margin-left: 0; - } - } } |