diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-07-12 14:44:53 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:36:54 +0200 |
| commit | 702499430fef35b7faede1ef5c9ca4d611287836 (patch) | |
| tree | e270f9fe43a539b337bce57224692a75735ab4a6 /addons/web_editor/static/src | |
| parent | 8c32bfb45d6bb0e5c5b0f01b073f694f95b2692e (diff) | |
[REF] web_editor, website: BS4, adapt website UI
Diffstat (limited to 'addons/web_editor/static/src')
| -rw-r--r-- | addons/web_editor/static/src/js/editor/snippets.options.js | 4 | ||||
| -rw-r--r-- | addons/web_editor/static/src/scss/web_editor.ui.scss | 13 | ||||
| -rw-r--r-- | addons/web_editor/static/src/xml/snippets.xml | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/addons/web_editor/static/src/js/editor/snippets.options.js b/addons/web_editor/static/src/js/editor/snippets.options.js index 059a0524ab4..199c3a0b8ad 100644 --- a/addons/web_editor/static/src/js/editor/snippets.options.js +++ b/addons/web_editor/static/src/js/editor/snippets.options.js @@ -666,10 +666,10 @@ registry.colorpicker = SnippetOption.extend({ var $palette_def = $tabs.find('div[data-name="' + self.data.paletteDefault + '"]'); var pos = $tabs.find('> div').index($palette_def); - $toggles.children('li').eq(pos).addClass('active'); + $toggles.children('li').eq(pos).find('a').addClass('active'); $palette_def.addClass('active'); } else { - $toggles.find('li').first().addClass('active'); + $toggles.find('li').first().find('a').addClass('active'); $tabs.find('div').first().addClass('active'); } diff --git a/addons/web_editor/static/src/scss/web_editor.ui.scss b/addons/web_editor/static/src/scss/web_editor.ui.scss index e85f04e8327..eee93913dc2 100644 --- a/addons/web_editor/static/src/scss/web_editor.ui.scss +++ b/addons/web_editor/static/src/scss/web_editor.ui.scss @@ -59,10 +59,10 @@ } &.btn-primary { - @include button-variant(white, $o-brand-odoo, $o-brand-odoo); + @include button-variant($o-brand-odoo, $o-brand-odoo); } &.btn-secondary { - @include button-variant(white, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0)); + @include button-variant(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0)); &:hover { background: rgba(black, 0.5); @@ -910,14 +910,13 @@ table.colorpicker { &:focus, &:active, &:focus:active { outline: none; } - } - &:hover, &.active { - > a { + &.active { + background-color: $o-we-tab-active-bg!important; color: white; } } - &.active > a { - background-color: $o-we-tab-active-bg!important; + &:hover > a { + color: white; } } } diff --git a/addons/web_editor/static/src/xml/snippets.xml b/addons/web_editor/static/src/xml/snippets.xml index a0c35288b93..93fc31c7de9 100644 --- a/addons/web_editor/static/src/xml/snippets.xml +++ b/addons/web_editor/static/src/xml/snippets.xml @@ -32,7 +32,7 @@ </div> </div> <div class="o_colorpicker_sections"> - <ul class="nav nav-pills o_colorpicker_section_menu"/> + <ul class="nav nav-pills flex-column o_colorpicker_section_menu"/> <div class="tab-content o_colorpicker_section_tabs"/> </div> </div> |