Merge lp:~openerp-dev/openerp-web/7.0-bug-1098829-bth into lp:openerp-web/7.0

Proposed by Bhumi Thakkar (Open ERP)
Status: Rejected
Rejected by: Xavier (Open ERP)
Proposed branch: lp:~openerp-dev/openerp-web/7.0-bug-1098829-bth
Merge into: lp:openerp-web/7.0
Diff against target: 71 lines (+5/-6)
3 files modified
addons/web/static/src/css/base.css (+2/-3)
addons/web/static/src/css/base.sass (+2/-3)
addons/web/static/src/js/chrome.js (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-bug-1098829-bth
Reviewer Review Type Date Requested Status
Xavier (Open ERP) (community) Needs Fixing
Review via email: mp+143296@code.launchpad.net

Description of the change

Hello,

  Fixed issue of layout : for short user names the pull down menu causes horizontal scrolling and shows cut off text.

Thanks.

To post a comment you must log in.
Revision history for this message
Xavier (Open ERP) (xmo-deactivatedaccount) wrote :

* Why is right: −0.5px?
* Breaks "More" submenu when many modules installed, not correctly positioned anymore
* Why javascript code?

review: Needs Fixing

Unmerged revisions

3702. By Bhumi Thakkar (Open ERP)

[FIX] Layout issue - short user names - cut off text.--fixes:lp1098829

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2013-01-09 13:18:48 +0000
+++ addons/web/static/src/css/base.css 2013-01-15 12:50:32 +0000
@@ -669,7 +669,6 @@
669 display: none;669 display: none;
670 position: absolute;670 position: absolute;
671 top: 26px;671 top: 26px;
672 left: 0;
673 z-index: 3;672 z-index: 3;
674 margin: 0;673 margin: 0;
675 padding: 0;674 padding: 0;
@@ -710,7 +709,7 @@
710 display: block;709 display: block;
711 color: #4c4c4c;710 color: #4c4c4c;
712 text-decoration: none;711 text-decoration: none;
713 width: 200px;712 width: auto;
714 text-overflow: ellipsis;713 text-overflow: ellipsis;
715 overflow: hidden;714 overflow: hidden;
716}715}
@@ -1174,7 +1173,7 @@
1174 float: left;1173 float: left;
1175}1174}
1176.openerp .oe_user_menu .oe_dropdown_menu {1175.openerp .oe_user_menu .oe_dropdown_menu {
1177 right: -1px;1176 right: -0.5px;
1178}1177}
1179.openerp .oe_systray > div {1178.openerp .oe_systray > div {
1180 float: left;1179 float: left;
11811180
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass 2013-01-09 13:18:48 +0000
+++ addons/web/static/src/css/base.sass 2013-01-15 12:50:32 +0000
@@ -578,7 +578,6 @@
578 display: none578 display: none
579 position: absolute579 position: absolute
580 top: 26px580 top: 26px
581 left: 0
582 z-index: 3581 z-index: 3
583 margin: 0582 margin: 0
584 padding: 0583 padding: 0
@@ -604,7 +603,7 @@
604 display: block603 display: block
605 color: #4c4c4c604 color: #4c4c4c
606 text-decoration: none605 text-decoration: none
607 width: 200px606 width: auto
608 text-overflow: ellipsis607 text-overflow: ellipsis
609 overflow: hidden608 overflow: hidden
610 &:hover609 &:hover
@@ -949,7 +948,7 @@
949 list-style-type: none948 list-style-type: none
950 float: left949 float: left
951 .oe_dropdown_menu950 .oe_dropdown_menu
952 right: -1px951 right: -0.5px
953952
954 .oe_systray > div953 .oe_systray > div
955 float: left954 float: left
956955
=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js 2013-01-08 16:41:04 +0000
+++ addons/web/static/src/js/chrome.js 2013-01-15 12:50:32 +0000
@@ -1111,6 +1111,7 @@
1111 var x = doc_width - offset.left - menu_width - 2;1111 var x = doc_width - offset.left - menu_width - 2;
1112 if (x < 0) {1112 if (x < 0) {
1113 $menu.offset({ left: offset.left + x }).width(menu_width);1113 $menu.offset({ left: offset.left + x }).width(menu_width);
1114 $menu.css({'left' : ''});
1114 }1115 }
1115 }1116 }
1116 }, 0);1117 }, 0);