diff options
| author | Géry Debongnie <ged@odoo.com> | 2016-02-26 16:32:09 +0100 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2016-03-09 13:01:34 +0100 |
| commit | f970906c9e89da364feaf2654b1a0d242e1bb789 (patch) | |
| tree | 786ea3e4410f13ce2e65a6853a91376a29ede4d7 /addons/web/static/src/css | |
| parent | 3cc96b2a8effac4250c7325dffd6da52042a2316 (diff) | |
[IMP] base,openerp,web: add debug mode === 'assets' and don't split assets by default
This is a rather large change for developers: from this commit on, we
need to use debug=assets instead of just debug to split assets.
The About menu has been slightly improved as well (the link does not
appear when we are already in debug mode), and an option has been added
in the debugging menu to activate the assets debugging mode.
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 25 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 19 |
2 files changed, 4 insertions, 40 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1b8851f7b69..da478d105f9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -704,9 +704,7 @@ color: #a24689; } .openerp .oe_about .user-details { - position: relative; padding: 0; - margin-bottom: 275px; } .openerp .oe_about .user-details .user-image { width: 100%; @@ -714,32 +712,15 @@ } .openerp .oe_about .user-details .user-info-block { width: 100%; - position: absolute; - top: 55px; - padding-top: 35px; + margin-top: -25px; } .openerp .oe_about .user-details .user-info-block .user-heading { text-align: center; margin: 10px 0 0; } -.openerp .oe_about .user-details .user-info-block .navigation li a { - padding: 10px 20px; -} -.openerp .oe_about .user-details .user-info-block .navigation li.active a { - background: #a24689; - color: #fff; -} .openerp .oe_about .user-details .user-info-block .user-body { text-align: center; } -.openerp .oe_about .user-details .user-info-block .user-body .tab-content > div { - float: left; - width: 100%; -} -.openerp .oe_about a.oe_activate_debug_mode { - color: white !important; - font-size: 100%; -} .openerp .oe_about #social i { margin: 10px; } @@ -2039,7 +2020,7 @@ padding-left: 14px; } .openerp ul.oe_form_status li.oe_active, .openerp ul.oe_form_status_clickable li.oe_active { - background-color: #5382b9; + background-color: #5382ba; background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4)); background-image: -webkit-linear-gradient(top, #729fcf, #3465a4); background-image: -moz-linear-gradient(top, #729fcf, #3465a4); @@ -2086,7 +2067,7 @@ color: #7C7BAD; } .openerp ul.oe_form_status_clickable li.oe_active:hover { - background-color: #3a699f; + background-color: #3a69a0; background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d)); background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d); background-image: -moz-linear-gradient(top, #4c85c2, #284d7d); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 814f0a5865a..1c2f61a9fea 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -689,35 +689,18 @@ $sheet-padding: 16px color: $link-color-odoo .user-details - position: relative padding: 0 - margin-bottom: 275px .user-image width: 100% text-align: center .user-info-block width: 100% - position: absolute - top: 55px - padding-top: 35px + margin-top: -25px .user-heading text-align: center margin: 10px 0 0 - .navigation - li - a - padding: 10px 20px - &.active a - background: $link-color-odoo - color: #fff .user-body text-align: center - .tab-content > div - float: left - width: 100% - a.oe_activate_debug_mode - color: white !important - font-size: 100% #social i margin: 10px |
