From d281bd52def6350167b400f8eb607189f0e088de Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 31 Dec 2014 10:39:39 -0800 Subject: [PATCH] Fixing inadvertant breakage of super-menu Fixing inadvertant breakage of super-menu from changes to .pane classes related to split-pane CSS changes WTD-618 --- .../commonUI/general/res/css/theme-espresso.css | 15 ++++++++------- .../general/res/sass/controls/_menus.scss | 14 +++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index b900296e7f..6110f15cab 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -1377,8 +1377,8 @@ label.checkbox.custom { left: 10px; } /* line 47, ../sass/controls/_menus.scss */ .menu-element .super-menu { - width: 400px; - height: 420px; } + width: 450px; + height: 430px; } /* line 54, ../sass/controls/_menus.scss */ .menu-element .super-menu .contents { overflow: none; } @@ -1393,7 +1393,7 @@ label.checkbox.custom { left: 0; padding-right: 5px; right: auto; - width: 220.0px; + width: 225px !important; overflow-x: hidden; overflow-y: auto; } /* line 67, ../sass/controls/_menus.scss */ @@ -1413,10 +1413,10 @@ label.checkbox.custom { left: 5px; } /* line 83, ../sass/controls/_menus.scss */ .menu-element .super-menu .pane.right { - left: 220.0px; + left: 225px; right: 0; - padding: 15px; - width: auto; } + padding: 25px; + width: 225px !important; } /* line 94, ../sass/controls/_menus.scss */ .menu-element .menu-item-description .desc-area.icon { position: relative; @@ -1424,7 +1424,8 @@ label.checkbox.custom { font-size: 8em; left: 0; height: 150px; - line-height: 150px; } + line-height: 150px; + text-align: center; } /* line 107, ../sass/controls/_menus.scss */ .menu-element .menu-item-description .desc-area.description { color: #8c8c8c; diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index 939b823970..8fce287f47 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -45,9 +45,9 @@ } } .super-menu { - $w: 400px; - $h: $w + 20; - $plw: $w * 0.55; + $w: 450px; + $h: $w - 20; + $plw: $w * 0.5; $prw: $w - $plw; width: $w; height: $h; @@ -60,7 +60,7 @@ left: 0; padding-right: $interiorMargin; right: auto; - width: $plw; + width: $plw !important; overflow-x: hidden; overflow-y: auto; ul { @@ -83,8 +83,8 @@ &.right { left: $plw; right: 0; - padding: $interiorMargin * 3; - width: auto; + padding: $interiorMargin * 5; + width: $prw !important; } } } @@ -102,7 +102,7 @@ line-height: $h; // top: 0; right: 0; bottom: 5em; left: 0; // height: 5em; -// text-align: center; + text-align: center; } &.description { color: lighten($bg, 30%);