diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-09-11 08:20:46 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-09-11 08:20:46 +0200 |
| commit | 80c2e5e2e869ea56b13faab596e2e51fad6e2db7 (patch) | |
| tree | 56d08a6c157413f9046e2e351ce1f0921acb69ee /addons/board/static/src/css | |
| parent | 5cf0ec526052fb28f38907c1618162fe8f919954 (diff) | |
| parent | 063c548209a9669fe05f494555521fc92bd51af0 (diff) | |
[MERGE] from trunk
bzr revid: xmo@openerp.com-20120910142154-rp2wv8l84c5cat2x
bzr revid: xmo@openerp.com-20120911062046-r0otrm9pizuv26sv
Diffstat (limited to 'addons/board/static/src/css')
| -rw-r--r-- | addons/board/static/src/css/dashboard.css | 19 | ||||
| -rw-r--r-- | addons/board/static/src/css/dashboard.sass | 17 |
2 files changed, 26 insertions, 10 deletions
diff --git a/addons/board/static/src/css/dashboard.css b/addons/board/static/src/css/dashboard.css index 38e224daf42..ed66e338c81 100644 --- a/addons/board/static/src/css/dashboard.css +++ b/addons/board/static/src/css/dashboard.css @@ -1,3 +1,17 @@ +.openerp .oe_dashboard_layout_selector ul { + white-space: nowrap; +} +.openerp .oe_dashboard_layout_selector li { + margin: 0; + padding: 0; + list-style-type: none; + float: left; +} +.openerp .oe_dashboard_layout_selector li .oe_dashboard_selected_layout { + margin-left: -30px; + vertical-align: bottom; + margin-bottom: 10px; +} .openerp .oe_dashboard_links { text-align: right; margin: 0 4px 6px 0; @@ -5,11 +19,6 @@ .openerp .oe_dashboard { width: 100%; } -.openerp .oe_dashboard .oe_dashboard_layout_selector ul, .openerp .oe_dashboard .oe_dashboard_layout_selector li { - margin: 0; - padding: 0; - list-style-type: none; -} .openerp .oe_dashboard .oe_action { margin: 0 8px 8px 0; background-color: white; diff --git a/addons/board/static/src/css/dashboard.sass b/addons/board/static/src/css/dashboard.sass index 1bfc01a3809..32f0e3b4f3a 100644 --- a/addons/board/static/src/css/dashboard.sass +++ b/addons/board/static/src/css/dashboard.sass @@ -9,16 +9,23 @@ box-shadow: $bsval .openerp + .oe_dashboard_layout_selector + ul + white-space: nowrap + li + margin: 0 + padding: 0 + list-style-type: none + float: left + .oe_dashboard_selected_layout + margin-left: -30px + vertical-align: bottom + margin-bottom: 10px .oe_dashboard_links text-align: right margin: 0 4px 6px 0 .oe_dashboard width: 100% - .oe_dashboard_layout_selector - ul, li - margin: 0 - padding: 0 - list-style-type: none .oe_action margin: 0 8px 8px 0 background-color: white |