diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 98c6699bb57..0d48ebdc941 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -30,7 +30,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp.openerp_webclient_container { height: 100%; @@ -1242,7 +1242,7 @@ .openerp .oe_secondary_submenu { padding: 2px 0 8px 0; margin: 0; - width: 100%; + width: 220px; display: inline-block; } .openerp .oe_secondary_submenu li { @@ -1265,7 +1265,7 @@ color: white; padding: 2px 4px; margin: 1px 6px 0 0; - border: 1px solid lightGray; + border: 1px solid lightgrey; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1274,6 +1274,13 @@ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); } +.openerp .oe_secondary_submenu .oe_menu_text { + white-space: nowrap; + overflow: hidden; + display: inline-block; + text-overflow: ellipsis; + max-width: 85%; +} .openerp .oe_secondary_submenu .oe_menu_counter { float: right; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1290,7 +1297,7 @@ transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - border-top: 1px solid lightGray; + border-top: 1px solid lightgrey; border-bottom: 1px solid #dedede; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); @@ -2240,7 +2247,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkGreen; + color: darkgreen; vertical-align: top; position: relative; top: -4px; @@ -3294,7 +3301,6 @@ div.ui-widget-overlay { overflow: hidden !important; } } - .blockUI.blockOverlay { background-color: black; opacity: 0.6; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index fb546341d9a..5141d42a547 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1009,7 +1009,7 @@ $sheet-padding: 16px .oe_secondary_submenu padding: 2px 0 8px 0 margin: 0 - width: 100% + width: 220px display: inline-block li position: relative @@ -1033,6 +1033,12 @@ $sheet-padding: 16px text-shadow: 0 1px 1px rgba(0,0,0,0.2) @include radius(4px) @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2)) + .oe_menu_text + white-space: nowrap + overflow: hidden + display: inline-block + text-overflow: ellipsis + max-width: 85% .oe_menu_counter float: right text-shadow: 0 1px 1px rgba(0,0,0,0.2) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index b3f2364b42b..6d707bb4627 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -385,7 +385,9 @@ t-att-data-menu="menu.id" t-att-data-action-model="menu.action ? menu.action.split(',')[0] : ''" t-att-data-action-id="menu.action ? menu.action.split(',')[1] : ''"> - + + +