diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-28 13:58:11 +0000 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-28 13:58:11 +0000 |
| commit | cf52a04979d7634908c2f0d8eb6a83b7dd614f64 (patch) | |
| tree | 2f8c25f3fab45268400c4ac6addfa15f1f2d37f0 /addons/web/static/src/scss | |
| parent | cd1f57e9ded2e8ca81d7290e4b5b95a8776045c6 (diff) | |
| parent | d3b8422c9c44557256836bdc0da5480f553eec4d (diff) | |
[MERGE] forward port branch saas-12.1 up to d3b8422c9c4
closes odoo/odoo#30614
Diffstat (limited to 'addons/web/static/src/scss')
| -rw-r--r-- | addons/web/static/src/scss/bootstrap_overridden.scss | 10 | ||||
| -rw-r--r-- | addons/web/static/src/scss/kanban_view_mobile.scss | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/addons/web/static/src/scss/bootstrap_overridden.scss b/addons/web/static/src/scss/bootstrap_overridden.scss index b81146a811f..c1f8cbb44d3 100644 --- a/addons/web/static/src/scss/bootstrap_overridden.scss +++ b/addons/web/static/src/scss/bootstrap_overridden.scss @@ -66,11 +66,11 @@ $font-family-sans-serif: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif $font-size-base: $o-font-size-base !default; $line-height-base: $o-line-height-base !default; -$h1-font-size: $o-font-size-base * 2.0 !default; -$h2-font-size: $o-font-size-base * 1.5 !default; -$h3-font-size: $o-font-size-base * 1.3 !default; -$h4-font-size: $o-font-size-base * 1.2 !default; -$h5-font-size: $o-font-size-base * 1.1 !default; +$h1-font-size: $font-size-base * 2.0 !default; +$h2-font-size: $font-size-base * 1.5 !default; +$h3-font-size: $font-size-base * 1.3 !default; +$h4-font-size: $font-size-base * 1.2 !default; +$h5-font-size: $font-size-base * 1.1 !default; $headings-font-weight: bold !default; diff --git a/addons/web/static/src/scss/kanban_view_mobile.scss b/addons/web/static/src/scss/kanban_view_mobile.scss index 1c5a9eab531..b74ae8aaea5 100644 --- a/addons/web/static/src/scss/kanban_view_mobile.scss +++ b/addons/web/static/src/scss/kanban_view_mobile.scss @@ -36,9 +36,6 @@ margin-left: 0; // override the margin-left: -1px of the desktop mode border: none; - &.o_current { - position: initial; - } .o_kanban_header { display: none; } |