diff options
| author | Simon Lejeune <sle@openerp.com> | 2014-09-10 14:59:00 +0200 |
|---|---|---|
| committer | Simon Lejeune <sle@openerp.com> | 2014-09-11 11:55:30 +0200 |
| commit | 92c0dbb8ae6041d370a3d7a48f8d1fe35a83846b (patch) | |
| tree | f93ae665bb12fc64827b91c6a3d77fd14b2c055b /addons/web/static/src | |
| parent | f4896fc4f435880e1e7309c4222ff381d5da81ee (diff) | |
[FIX] web: about odoo: correct bootstrap structure inside the modal
Bootstrap's container class has a fixed width, using it in a modal
with the previous commit allowing an horizontal scrollbar makes the
layout goes crazy. Use container-fluid instead and cleaned some css.
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 14 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 10 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 15 |
3 files changed, 9 insertions, 30 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 71eeea9526c..fb02252e548 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1000,20 +1000,8 @@ text-align: center; margin: 10px 0 0; } -.openerp .oe_about .user-details .user-info-block .navigation { - float: left; - width: auto; - padding: 0; - margin-left: 25%; - list-style: none; - border: 1px solid #a24689; -} -.openerp .oe_about .user-details .user-info-block .navigation li { - float: left; -} .openerp .oe_about .user-details .user-info-block .navigation li a { - padding: 20px 30px; - float: left; + padding: 10px 20px; } .openerp .oe_about .user-details .user-info-block .navigation li.active a { background: #a24689; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 51d931a5fda..9205683eeb4 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -869,17 +869,9 @@ $sheet-padding: 16px text-align: center margin: 10px 0 0 .navigation - float: left - width: auto - padding: 0 - margin-left: 25% - list-style: none - border: 1px solid $link-color-odoo li - float: left a - padding: 20px 30px - float: left + padding: 10px 20px &.active a background: $link-color-odoo color: #fff diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index cfaa54e5282..32ef66d697b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -366,13 +366,13 @@ <t t-name="UserMenu.about"> <div class="oe_about"> - <a class="oe_activate_debug_mode oe_right label label-primary" href="?debug" >Activate the developer mode</a> - - - <div class="container"> - <div class=""> - <div class="col-sm-6 col-md-6 user-details"> + <div class="container-fluid"> + <div class="row"> + <a class="oe_activate_debug_mode oe_right label label-primary" href="?debug" >Activate the developer mode</a> + </div> + <div class="row"> + <div class="col-sm-offset-2 col-md-offset-2 col-sm-8 col-md-8 user-details"> <div class="user-image"> <img src="/web/static/src/img/logo2.png" alt="Odoo (Formerly OpenERP)" title="Odoo (Formerly OpenERP)" class="img-circle"/> </div> @@ -382,7 +382,7 @@ <h3>Version <t t-esc="version_info.server_version"/></h3> </div> - <ul class="navigation"> + <ul class="list-inline text-center navigation"> <li class="active"> <a data-toggle="tab" href="#settings"> <span class="glyphicon glyphicon-cog"></span> @@ -440,7 +440,6 @@ </div> </div> </div> - </t> <t t-name="WebClient.timezone_notification"> |