diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-05-26 17:34:04 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-05-28 14:27:38 +0200 |
| commit | fe2b5f35a40ca8df662130608b0f89427a196362 (patch) | |
| tree | 0c7773f0599f3b1e6dbb869104fad0b04869b269 /addons/website/static/src/css/website.sass | |
| parent | d4d8a2eae31e7a6a45029b84603e055300e3be36 (diff) | |
| parent | bf1e99964cdbc374f8a0c4cec1b338bf7c7c2930 (diff) | |
[MERGE] forward port of branch saas-6 up to bf1e999
Diffstat (limited to 'addons/website/static/src/css/website.sass')
| -rw-r--r-- | addons/website/static/src/css/website.sass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 022b07066ad..223bab94a0b 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -130,6 +130,9 @@ li > * > li > * > li > * > li > * > li > * > li > ol li > p margin: 0 +font[style*='background'], font[class*='bg-'] + padding: 0 2px + .o_ul_toggle_self, .o_ul_toggle_next display: none .o_ul_folded @@ -238,8 +241,9 @@ body > nav.navbar width: 100% position: absolute z-index: 10000 -nav.navbar + #wrapwrap - padding-top: 34px +@media (max-min: 767px) + nav.navbar + #wrapwrap + padding-top: 34px /* ----- BOOTSTRAP FIX ----- */ |