summaryrefslogtreecommitdiff
path: root/addons/web_editor/static
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2018-07-16 16:48:59 +0200
committerqsm-odoo <qsm@odoo.com>2018-07-27 12:36:54 +0200
commitc59380bac5bbd47bc7dcd92b38049af29a62c3d1 (patch)
treed7d2597657a11138e243f228ebef98cd4ffc4cf6 /addons/web_editor/static
parent81f359c81c69af2a5ec0645602e2bb43b2e16721 (diff)
[REF] *: BS4, rename btn-default to btn-secondary
BS4 "btn-default" class was replaced with "btn-secondary", which makes more sense.
Diffstat (limited to 'addons/web_editor/static')
-rw-r--r--addons/web_editor/static/lib/summernote/src/js/Renderer.js2
-rw-r--r--addons/web_editor/static/src/js/editor/rte.summernote.js2
-rw-r--r--addons/web_editor/static/src/js/widgets/widgets.js4
-rw-r--r--addons/web_editor/static/src/scss/web_editor.ui.scss2
-rw-r--r--addons/web_editor/static/src/scss/web_editor.variables.scss2
-rw-r--r--addons/web_editor/static/src/xml/ace.xml2
-rw-r--r--addons/web_editor/static/src/xml/backend.xml2
-rw-r--r--addons/web_editor/static/src/xml/editor.xml26
-rw-r--r--addons/web_editor/static/src/xml/snippets.xml10
9 files changed, 26 insertions, 26 deletions
diff --git a/addons/web_editor/static/lib/summernote/src/js/Renderer.js b/addons/web_editor/static/lib/summernote/src/js/Renderer.js
index 7fa1afe3adc..4886a76377b 100644
--- a/addons/web_editor/static/lib/summernote/src/js/Renderer.js
+++ b/addons/web_editor/static/lib/summernote/src/js/Renderer.js
@@ -36,7 +36,7 @@ define([
return (dropdown ? '<div class="btn-group' +
(className ? ' ' + className : '') + '">' : '') +
'<button type="button"' +
- ' class="btn btn-default btn-sm' +
+ ' class="btn btn-secondary btn-sm' +
((!dropdown && className) ? ' ' + className : '') +
(dropdown ? ' dropdown-toggle' : '') +
'"' +
diff --git a/addons/web_editor/static/src/js/editor/rte.summernote.js b/addons/web_editor/static/src/js/editor/rte.summernote.js
index b0669f4b390..cd482a18d7c 100644
--- a/addons/web_editor/static/src/js/editor/rte.summernote.js
+++ b/addons/web_editor/static/src/js/editor/rte.summernote.js
@@ -168,7 +168,7 @@ renderer.tplPopovers = function (lang, options) {
var $alt = $('<div class="btn-group"/>');
$alt.appendTo($imagePopover.find('.popover-content'));
- $alt.append('<button class="btn btn-default" data-event="alt"><strong>' + _t('Description') + ': </strong><span class="o_image_alt"/></button>');
+ $alt.append('<button class="btn btn-secondary" data-event="alt"><strong>' + _t('Description') + ': </strong><span class="o_image_alt"/></button>');
//////////////// link popover
diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js
index 8148f61a4f8..9e04c9dbe7d 100644
--- a/addons/web_editor/static/src/js/widgets/widgets.js
+++ b/addons/web_editor/static/src/js/widgets/widgets.js
@@ -613,7 +613,7 @@ var ImageWidget = MediaWidget.extend({
var $input = $(ev.currentTarget);
var $button = $input.next('button');
var emptyValue = ($input.val() === '');
- $button.toggleClass('btn-default', emptyValue).toggleClass('btn-primary', !emptyValue)
+ $button.toggleClass('btn-secondary', emptyValue).toggleClass('btn-primary', !emptyValue)
.prop('disabled', emptyValue);
},
/**
@@ -1477,7 +1477,7 @@ var LinkDialog = Dialog.extend({
this.data.text = data.label;
this.data.url = data.url;
this.data.className = data.classes.replace(/\s+/gi, ' ').replace(/^\s+|\s+$/gi, '');
- if (data.classes.replace(/(^|[ ])(btn-default|btn-success|btn-primary|btn-info|btn-warning|btn-danger)([ ]|$)/gi, ' ')) {
+ if (data.classes.replace(/(^|[ ])(btn-secondary|btn-success|btn-primary|btn-info|btn-warning|btn-danger)([ ]|$)/gi, ' ')) {
this.data.style = {'background-color': '', 'color': ''};
}
this.data.isNewWindow = data.isNewWindow;
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 585f134afb7..e82ad579fe8 100644
--- a/addons/web_editor/static/src/scss/web_editor.ui.scss
+++ b/addons/web_editor/static/src/scss/web_editor.ui.scss
@@ -61,7 +61,7 @@
&.btn-primary {
@include button-variant(white, $o-brand-primary, $o-brand-primary);
}
- &.btn-default {
+ &.btn-secondary {
@include button-variant(white, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0));
&:hover {
diff --git a/addons/web_editor/static/src/scss/web_editor.variables.scss b/addons/web_editor/static/src/scss/web_editor.variables.scss
index 196af3ff0ad..0e65ea99afa 100644
--- a/addons/web_editor/static/src/scss/web_editor.variables.scss
+++ b/addons/web_editor/static/src/scss/web_editor.variables.scss
@@ -177,7 +177,7 @@ $o-we-switch-inactive-color: $o-we-color-paper !default;
&.btn-primary {
@include button-variant(white, $o-brand-optional, darken($o-brand-optional,5%));
}
- &.btn-default {
+ &.btn-secondary {
@include button-variant($o-we-color-normal, white, $o-we-color-text-light);
}
&.btn-link {
diff --git a/addons/web_editor/static/src/xml/ace.xml b/addons/web_editor/static/src/xml/ace.xml
index 4380a73ae54..257ce6af707 100644
--- a/addons/web_editor/static/src/xml/ace.xml
+++ b/addons/web_editor/static/src/xml/ace.xml
@@ -27,7 +27,7 @@
</label>
<div class="o_button_section">
<button data-action="save" type="submit" class="btn btn-primary">Save</button>
- <button data-action="close" type="button" class="btn btn-default">Close</button>
+ <button data-action="close" type="button" class="btn btn-secondary">Close</button>
</div>
</div>
<div id="ace-view-id">
diff --git a/addons/web_editor/static/src/xml/backend.xml b/addons/web_editor/static/src/xml/backend.xml
index 76663cc9fbc..c4666a1aa96 100644
--- a/addons/web_editor/static/src/xml/backend.xml
+++ b/addons/web_editor/static/src/xml/backend.xml
@@ -9,7 +9,7 @@
<t t-name="web_editor.FieldTextHtml.button.translate">
<div class="btn-group pull-right">
- <button t-if="widget.field.translate" class="o_field_translate btn btn-default" style="height: 24px; padding: 1px 17px 0px 5px" aria-label="Translate" title="Translate">
+ <button t-if="widget.field.translate" class="o_field_translate btn btn-secondary" style="height: 24px; padding: 1px 17px 0px 5px" aria-label="Translate" title="Translate">
<span class="fa fa-language fa-lg oe_input_icon"/>
</button>
</div>
diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 01a4af11ac4..1928572fc0d 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -9,7 +9,7 @@
<div id="web_editor-top-edit">
<div id="web_editor-toolbars"/>
<form class="navbar-form text-muted">
- <button type="button" class="btn btn-default" data-action="cancel"><i class="fa fa-times"/> Discard</button>
+ <button type="button" class="btn btn-secondary" data-action="cancel"><i class="fa fa-times"/> Discard</button>
<button type="button" class="btn btn-primary" data-action="save"><i class="fa fa-floppy-o"/> Save</button>
</form>
</div>
@@ -54,10 +54,10 @@
<li class="search pull-right">
<ul class="pager mb0 mt0">
<li class="previous">
- <a role="button" class="btn btn-default disabled" href="#"><i class="fa fa-angle-left"/>&#32;Previous</a>
+ <a role="button" class="btn btn-secondary disabled" href="#"><i class="fa fa-angle-left"/>&#32;Previous</a>
</li>
<li class="next">
- <a role="button" class="btn btn-default disabled" href="#">Next&#32;<i class="fa fa-angle-right"/></a>
+ <a role="button" class="btn btn-secondary disabled" href="#">Next&#32;<i class="fa fa-angle-right"/></a>
</li>
</ul>
</li>
@@ -110,7 +110,7 @@
<label for="imageurl">Add an image URL</label>
<div class="form-group btn-group">
<input type="text" class="form-control url pull-left" id="imageurl" name="url" placeholder="https://www.odoo.com/logo.png" style="width: 250px;"/>
- <button type="button" class="btn btn-default o_upload_image_url_button" disabled="disabled">Add</button>
+ <button type="button" class="btn btn-secondary o_upload_image_url_button" disabled="disabled">Add</button>
</div>
</div>
</div>
@@ -271,7 +271,7 @@
<input class="d-none link-style" name="link_style_color" type="radio" value=""/>
<i class="fa"/>
</label>
- <t t-foreach="['primary', 'default', 'success', 'info', 'warning', 'danger', 'alpha', 'beta', 'gamma', 'delta', 'epsilon']" t-as="color">
+ <t t-foreach="['primary', 'secondary', 'success', 'info', 'warning', 'danger', 'alpha', 'beta', 'gamma', 'delta', 'epsilon']" t-as="color">
<label role="button" t-attf-class="o_link_dialog_color_item o_btn_preview btn btn-#{color}" t-attf-aria-label="Color for #{color}" t-attf-title="Color for #{color}">
<input type="radio" name="link_style_color" class="d-none link-style" t-att-value="color"/>
<i class="fa"/>
@@ -319,25 +319,25 @@
<div class="btn-group" title="Aspect Ratio" data-toggle="buttons">
<t t-foreach="widget.aspectRatioList" t-as="ratio">
<t t-set="is_active" t-value="ratio[1] === widget.imageData.aspectRatio"/>
- <a href="#" t-attf-class="btn btn-default#{is_active and ' active' or ''}" data-event="ratio" t-att-data-label="ratio[1]" t-att-data-value="ratio[2]">
+ <a href="#" t-attf-class="btn btn-secondary#{is_active and ' active' or ''}" data-event="ratio" t-att-data-label="ratio[1]" t-att-data-value="ratio[2]">
<t t-esc="ratio[0]"/>
</a>
</t>
</div>
<div class="btn-group" role="group">
- <a href="#" class="btn btn-default" title="Zoom In" data-event="zoom" data-value="0.1"><i class="fa fa-search-plus"/></a>
- <a href="#" class="btn btn-default" title="Zoom Out" data-event="zoom" data-value="-0.1"><i class="fa fa-search-minus"/></a>
+ <a href="#" class="btn btn-secondary" title="Zoom In" data-event="zoom" data-value="0.1"><i class="fa fa-search-plus"/></a>
+ <a href="#" class="btn btn-secondary" title="Zoom Out" data-event="zoom" data-value="-0.1"><i class="fa fa-search-minus"/></a>
</div>
<div class="btn-group" role="group">
- <a href="#" class="btn btn-default" title="Rotate Left" data-event="rotate" data-value="-45"><i class="fa fa-rotate-left"/></a>
- <a href="#" class="btn btn-default" title="Rotate Right" data-event="rotate" data-value="45"><i class="fa fa-rotate-right"/></a>
+ <a href="#" class="btn btn-secondary" title="Rotate Left" data-event="rotate" data-value="-45"><i class="fa fa-rotate-left"/></a>
+ <a href="#" class="btn btn-secondary" title="Rotate Right" data-event="rotate" data-value="45"><i class="fa fa-rotate-right"/></a>
</div>
<div class="btn-group" role="group">
- <a href="#" class="btn btn-default" title="Flip Horizontal" data-event="flip" data-value="horizontal" data-x="1"><i class="fa fa-arrows-h"/></a>
- <a href="#" class="btn btn-default" title="Flip Vertical" data-event="flip" data-value="vertical" data-y="1"><i class="fa fa-arrows-v"/></a>
+ <a href="#" class="btn btn-secondary" title="Flip Horizontal" data-event="flip" data-value="horizontal" data-x="1"><i class="fa fa-arrows-h"/></a>
+ <a href="#" class="btn btn-secondary" title="Flip Vertical" data-event="flip" data-value="vertical" data-y="1"><i class="fa fa-arrows-v"/></a>
</div>
<div class="btn-group" role="group">
- <a href="#" class="btn btn-default" title="Reset Image" data-event="reset"><i class="fa fa-refresh"/> Reset Image</a>
+ <a href="#" class="btn btn-secondary" title="Reset Image" data-event="reset"><i class="fa fa-refresh"/> Reset Image</a>
</div>
</div>
</t>
diff --git a/addons/web_editor/static/src/xml/snippets.xml b/addons/web_editor/static/src/xml/snippets.xml
index 3c368ebaaf2..586b920edf0 100644
--- a/addons/web_editor/static/src/xml/snippets.xml
+++ b/addons/web_editor/static/src/xml/snippets.xml
@@ -10,14 +10,14 @@
</div>
<div class="oe_overlay_options" contentEditable="false">
<div class="btn-group">
- <a role="button" href="#" class="btn btn-default oe_snippet_parent" title="Select Parent Container" aria-label="Select Parent Container"><i class="fa fa-lg fa-level-up"/></a>
+ <a role="button" href="#" class="btn btn-secondary oe_snippet_parent" title="Select Parent Container" aria-label="Select Parent Container"><i class="fa fa-lg fa-level-up"/></a>
<div class="dropdown oe_options d-none btn-group">
<a role="button" href="#" data-toggle="dropdown" class="btn btn-primary" title="Customize">Customize</a>
<ul class="dropdown-menu" role="menu"/>
</div>
- <a role="button" href="#" class="btn btn-default oe_snippet_move" title="Drag to Move" aria-label="Drag to Move"><i class="fa fa-arrows ml4 mr4"></i></a>
- <a role="button" href="#" class="btn btn-default oe_snippet_clone" title="Duplicate Container" aria-label="Duplicate Container"><i class="fa fa-files-o ml4 mr4"></i></a>
- <a role="button" href="#" class="btn btn-default oe_snippet_remove" title="Remove Block" aria-label="Remove Block"><i class="fa fa-trash-o ml4 mr4"></i></a>
+ <a role="button" href="#" class="btn btn-secondary oe_snippet_move" title="Drag to Move" aria-label="Drag to Move"><i class="fa fa-arrows ml4 mr4"></i></a>
+ <a role="button" href="#" class="btn btn-secondary oe_snippet_clone" title="Duplicate Container" aria-label="Duplicate Container"><i class="fa fa-files-o ml4 mr4"></i></a>
+ <a role="button" href="#" class="btn btn-secondary oe_snippet_remove" title="Remove Block" aria-label="Remove Block"><i class="fa fa-trash-o ml4 mr4"></i></a>
</div>
</div>
</div>
@@ -40,7 +40,7 @@
<!-- t-field options -->
<t t-name="web_editor.many2one.button">
<div class="btn-group">
- <a role="button" href="#" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="Search Contact" aria-label="Search Contact"><i class="fa fa-search"></i></a>
+ <a role="button" href="#" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="Search Contact" aria-label="Search Contact"><i class="fa fa-search"></i></a>
<ul class="dropdown-menu contact_menu" role="menu">
<li><a role="menuitem"><input href="#" type="email" placeholder="Search"/></a></li>
</ul>