summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
authorKevin Baptiste <kba@odoo.com>2019-08-12 07:18:23 +0000
committerYannick Tivisse <yti@odoo.com>2019-11-28 10:05:12 +0000
commitff1c35513aecef5fbc30f7c2f3834450e719714e (patch)
tree8149f14df17095845e735d6cccaf9317a1f97af6 /addons/website/static/src
parent4c030311ada2ad19a2ee81b15544b7aed35b642b (diff)
[IMP] web: update to fontawesome 4.7.0 to 5.11.2
FontAwesome 5 introduced new names for some icons as described on https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4#name-changes This commit replaces the old names to the new ones. closes odoo/odoo#35826 Taskid: 2050241 Related: odoo/enterprise#5180 Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/js/editor/snippets.options.js2
-rw-r--r--addons/website/static/src/js/menu/content.js8
-rw-r--r--addons/website/static/src/js/menu/mobile_view.js2
-rw-r--r--addons/website/static/src/js/widgets/theme.js2
-rw-r--r--addons/website/static/src/scss/website.edit_mode.scss6
-rw-r--r--addons/website/static/src/scss/website.scss37
-rw-r--r--addons/website/static/src/scss/website.ui.scss9
-rw-r--r--addons/website/static/src/scss/website.wysiwyg.scss2
-rw-r--r--addons/website/static/src/xml/website.backend.xml2
-rw-r--r--addons/website/static/src/xml/website.contentMenu.xml4
-rw-r--r--addons/website/static/src/xml/website.editor.xml6
-rw-r--r--addons/website/static/src/xml/website.pageProperties.xml4
-rw-r--r--addons/website/static/src/xml/website.seo.xml6
-rw-r--r--addons/website/static/src/xml/website.share.xml2
14 files changed, 47 insertions, 45 deletions
diff --git a/addons/website/static/src/js/editor/snippets.options.js b/addons/website/static/src/js/editor/snippets.options.js
index bf7960cc13d..d159c10ee16 100644
--- a/addons/website/static/src/js/editor/snippets.options.js
+++ b/addons/website/static/src/js/editor/snippets.options.js
@@ -1678,7 +1678,7 @@ options.registry.anchor = options.Class.extend({
buttons.push({
text: _t("Remove"),
classes: 'btn-link ml-auto',
- icon: 'fa-trash',
+ icon: 'fa-trash-alt',
close: true,
click: function () {
self._setAnchorName();
diff --git a/addons/website/static/src/js/menu/content.js b/addons/website/static/src/js/menu/content.js
index 1652dabc9e6..0de22ca0059 100644
--- a/addons/website/static/src/js/menu/content.js
+++ b/addons/website/static/src/js/menu/content.js
@@ -49,7 +49,7 @@ var PagePropertiesDialog = weWidgets.Dialog.extend({
if (options.fromPageManagement) {
buttons.push({
text: _t("Go To Page"),
- icon: 'fa-globe',
+ icon: 'fa-globe-americas',
classes: 'btn-link float-right',
click: function (e) {
window.location.href = '/' + self.page.url;
@@ -58,7 +58,7 @@ var PagePropertiesDialog = weWidgets.Dialog.extend({
}
buttons.push({
text: _t("Delete Page"),
- icon: 'fa-trash',
+ icon: 'far fa-trash-alt',
classes: 'btn-link float-right',
click: function (e) {
_deletePage.call(this, self.page_id, options.fromPageManagement);
@@ -160,8 +160,8 @@ var PagePropertiesDialog = weWidgets.Dialog.extend({
maxDate: moment().add(200, 'y'),
calendarWeeks: true,
icons : {
- time: 'fa fa-clock-o',
- date: 'fa fa-calendar',
+ time: 'far fa-clock',
+ date: 'far fa-calendar-alt',
next: 'fa fa-chevron-right',
previous: 'fa fa-chevron-left',
up: 'fa fa-chevron-up',
diff --git a/addons/website/static/src/js/menu/mobile_view.js b/addons/website/static/src/js/menu/mobile_view.js
index acfd28042c9..9e1745996e0 100644
--- a/addons/website/static/src/js/menu/mobile_view.js
+++ b/addons/website/static/src/js/menu/mobile_view.js
@@ -51,7 +51,7 @@ var MobileMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({
*/
_onMobilePreviewClick: function () {
new MobilePreviewDialog(this, {
- title: _t('Mobile preview') + ' <span class="fa fa-refresh"/>',
+ title: _t('Mobile preview') + ' <span class="fas fa-sync"/>',
}).open();
},
});
diff --git a/addons/website/static/src/js/widgets/theme.js b/addons/website/static/src/js/widgets/theme.js
index 8c544d790d7..14ce5260147 100644
--- a/addons/website/static/src/js/widgets/theme.js
+++ b/addons/website/static/src/js/widgets/theme.js
@@ -709,7 +709,7 @@ var ThemeCustomizeDialog = Dialog.extend({
_updateStyle: function (enable, disable, reload) {
var self = this;
- var $loading = $('<i/>', {class: 'fa fa-refresh fa-spin'});
+ var $loading = $('<i/>', {class: 'fas fa-sync fa-spin'});
this.$modal.find('.modal-title').append($loading);
if (reload || config.isDebug('assets')) {
diff --git a/addons/website/static/src/scss/website.edit_mode.scss b/addons/website/static/src/scss/website.edit_mode.scss
index fd42d78a8bd..90326d9e837 100644
--- a/addons/website/static/src/scss/website.edit_mode.scss
+++ b/addons/website/static/src/scss/website.edit_mode.scss
@@ -109,8 +109,10 @@ table.editorbar-panel {
}
}
-// fontawesome
-.note-editable .fa {
+// 'Font Awesome 5 Free'
+.note-editable .fa,
+.note-editable .far,
+.note-editable .fas {
cursor: pointer;
}
diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss
index 6e29659612c..6b598536d34 100644
--- a/addons/website/static/src/scss/website.scss
+++ b/addons/website/static/src/scss/website.scss
@@ -167,8 +167,7 @@ font[class*='bg-'] {
}
// Icons
-.fa {
- font-family: "FontAwesome" !important;
+.fa, .far, .fas, .fab {
$size: 3rem;
&.rounded-circle,
@@ -492,14 +491,16 @@ table.table_desc tr td {
outline: none;
&:before {
content:'\f056';
- font-family: 'FontAwesome';
+ font-family: 'Font Awesome 5 Free';
display: inline-block;
margin: 0 .5em 0 .75em;
color: $gray-600;
+ font-weight: 900;
}
&.collapsed:before {
content:'\f055';
- font-family: 'FontAwesome';
+ font-family: 'Font Awesome 5 Free';
+ font-weight: 900;
}
&:hover,
&:focus {
@@ -541,7 +542,7 @@ table.table_desc tr td {
background-image: none;
color: $body-color;
&:before {
- font-family: "FontAwesome";
+ font-family: "Font Awesome 5 Free";
display: inline-block;
background-color: #fff;
}
@@ -570,6 +571,7 @@ table.table_desc tr td {
font-size: 2rem;
color: #fff;
text-shadow: $box-shadow-sm;
+ font-weight: 900;
}
// Indicators
.carousel-indicators li {
@@ -1023,28 +1025,27 @@ table.table_desc tr td {
// Rating
.s_rating {
$star: "\f005";
- $star-o: "\f006";
$circle: "\f111";
- $circle-o: "\f10c";
$heart: "\f004";
- $heart-o: "\f08a";
- @mixin s_rating_generate_icons($off, $on) {
+ @mixin s_rating_generate_icons($icon) {
.fa:before {
- content: $off;
+ content: $icon;
+ font-weight: 400;
}
@for $counter from 5 to 0 {
&.s_rating_#{$counter} {
.fa:nth-of-type(-n+#{$counter}):before {
- content: $on;
+ content: $icon;
+ font-weight: 900;
}
}
}
}
- > .s_rating_stars { @include s_rating_generate_icons($star-o, $star); }
- > .s_rating_squares { @include s_rating_generate_icons($circle-o, $circle); }
- > .s_rating_hearts { @include s_rating_generate_icons($heart-o, $heart); }
+ > .s_rating_stars { @include s_rating_generate_icons($star); }
+ > .s_rating_squares { @include s_rating_generate_icons($circle); }
+ > .s_rating_hearts { @include s_rating_generate_icons($heart); }
> .s_rating_bar {
- .fa {
+ .fa, .far, .fas, .fab {
display: none;
}
.s_rating_bar {
@@ -1071,9 +1072,9 @@ table.table_desc tr td {
}
}
}
- > .s_rating_1x { .fa { font-size: 1em; }; }
- > .s_rating_2x { .fa { font-size: 2em; }; }
- > .s_rating_3x { .fa { font-size: 3em; }; }
+ > .s_rating_1x { .fa, .far, .fas, .fab { font-size: 1em; }; }
+ > .s_rating_2x { .fa, .far, .fas, .fab { font-size: 2em; }; }
+ > .s_rating_3x { .fa, .far, .fas, .fab { font-size: 3em; }; }
}
//
diff --git a/addons/website/static/src/scss/website.ui.scss b/addons/website/static/src/scss/website.ui.scss
index 0027d792093..22f18fd9adc 100644
--- a/addons/website/static/src/scss/website.ui.scss
+++ b/addons/website/static/src/scss/website.ui.scss
@@ -34,7 +34,6 @@ body.o_connected_user {
.o_menu_sections {
.o_mobile_preview a {
text-align: center;
- font-size: 20px;
}
}
.o_menu_systray {
@@ -52,7 +51,6 @@ body.o_connected_user {
.o_mobile_preview a {
text-align: center;
- font-size: 20px;
}
}
@include media-breakpoint-down(sm) {
@@ -135,7 +133,7 @@ body .modal {
font-weight: normal;
color: inherit;
- .fa {
+ .fa, .far, .fas {
margin-left: $grid-gutter-width/2;
}
}
@@ -230,7 +228,8 @@ body .modal {
@include o-position-absolute(2px, 3px);
display: inline-block;
content: "\f00c";
- font-family: FontAwesome;
+ font-family: 'Font Awesome 5 Free';
+ font-weight: 900;
color: white;
font-size: 12px;
}
@@ -420,7 +419,7 @@ body .modal {
padding: 0.45rem;
}
td {
- > a.fa {
+ > a.fa, > a.far, > a.fas {
margin-left: 5px;
color: $o-brand-odoo;
}
diff --git a/addons/website/static/src/scss/website.wysiwyg.scss b/addons/website/static/src/scss/website.wysiwyg.scss
index 4e6fa2bc0c9..2d81ceebc32 100644
--- a/addons/website/static/src/scss/website.wysiwyg.scss
+++ b/addons/website/static/src/scss/website.wysiwyg.scss
@@ -41,7 +41,7 @@
border: none;
border-radius: 0;
- .fa {
+ .fa, .far, .fas {
margin-right: $grid-gutter-width/4;
&.fa-times {
diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml
index 1063de39fed..a0cdbb14e26 100644
--- a/addons/website/static/src/xml/website.backend.xml
+++ b/addons/website/static/src/xml/website.backend.xml
@@ -7,7 +7,7 @@
<t t-name="WidgetWebsiteButtonIcon">
<button type="button" class="btn oe_stat_button">
- <i class="fa fa-fw o_button_icon fa-globe"/>
+ <i class="fa fa-fw o_button_icon fa-globe-americas"/>
<div class="o_stat_info">
<span class="o_stat_text">Go to<br/>Website</span>
</div>
diff --git a/addons/website/static/src/xml/website.contentMenu.xml b/addons/website/static/src/xml/website.contentMenu.xml
index af318703b5c..c0b17590828 100644
--- a/addons/website/static/src/xml/website.contentMenu.xml
+++ b/addons/website/static/src/xml/website.contentMenu.xml
@@ -14,8 +14,8 @@
<i t-if="submenu.is_homepage" class="fa fa-home ml-3" role="img" aria-label="Home" title="Home"/>
</span>
<span class="input-group-append">
- <button type="button" class="btn btn-primary js_edit_menu fa fa-pencil-square-o" aria-label="Edit Menu Item" title="Edit Menu Item"/>
- <button type="button" class="btn btn-danger js_delete_menu fa fa-trash-o" aria-label="Delete Menu Item" title="Delete Menu Item"/>
+ <button type="button" class="btn btn-primary js_edit_menu fas fa-edit" aria-label="Edit Menu Item" title="Edit Menu Item"/>
+ <button type="button" class="btn btn-danger js_delete_menu far fa-trash-alt" aria-label="Delete Menu Item" title="Delete Menu Item"/>
</span>
</div>
<t t-set="children" t-value="submenu.children"/>
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 31ffb28704d..8309e9e3777 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -15,7 +15,7 @@
<div id="web_editor-top-edit">
<form class="navbar-form text-muted">
<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>
+ <button type="button" class="btn btn-primary" data-action="save"><i class="far fa-save"/> Save</button>
</form>
</div>
</t>
@@ -51,7 +51,7 @@
<t t-name="website.theme_customize_delete_font">
<t t-set="delete_font_title">Delete this font</t>
<button type="button"
- class="btn btn-link d-flex align-items-center text-danger fa fa-trash-o o_theme_customize_delete_google_font"
+ class="btn btn-link d-flex align-items-center text-danger far fa-trash-alt o_theme_customize_delete_google_font"
t-att-aria-label="delete_font_title"
t-att-title="delete_font_title"
t-att-data-font-index="index"/>
@@ -75,7 +75,7 @@
<div class="o_theme_customize_input"
t-att-data-variable="variable"
t-att-data-unit="unit">
- <i class="fa fa-edit"/>
+ <i class="fas fa-edit"/>
<span/>
</div>
</t>
diff --git a/addons/website/static/src/xml/website.pageProperties.xml b/addons/website/static/src/xml/website.pageProperties.xml
index 2ed91eb541b..2a10cd3ed77 100644
--- a/addons/website/static/src/xml/website.pageProperties.xml
+++ b/addons/website/static/src/xml/website.pageProperties.xml
@@ -110,7 +110,7 @@
<div class="form-group row">
<label class="control-label col-md-4" for="is_indexed">
Indexed
- <i class="fa fa-question-circle-o" title="Hide this page from search results" role="img" aria-label="Info"></i>
+ <i class="far fa-question-circle" title="Hide this page from search results" role="img" aria-label="Info"></i>
</label>
<div class="col-md-2">
<label class="o_switch" for="is_indexed" >
@@ -134,7 +134,7 @@
<div class="input-group date" id="date_publish_container" data-target-input="nearest">
<input type="text" class="form-control datetimepicker-input" data-target="#date_publish_container" id="date_publish"/>
<div class="input-group-append" data-target="#date_publish_container" data-toggle="datetimepicker">
- <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+ <div class="input-group-text"><i class="far fa-calendar-alt"></i></div>
</div>
</div>
</div>
diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index de1fc86fa23..e2563999384 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -33,7 +33,7 @@
<td class="text-center"><i class="js_seo_keyword_description fa fa-check" style="visibility: hidden;" t-attf-title="{{ widget.keyword }} is used in page description"/></td>
<td class="text-center"><i t-if="widget.used_content" class="fa fa-check" t-attf-title="{{ widget.keyword }} is used in page content"/></td>
<td class="o_seo_keyword_suggestion"/>
- <td class="text-center"><a href="#" class="oe_remove" data-action="remove-keyword" t-attf-title="Remove {{ widget.keyword }}"><i class="fa fa-trash"/></a></td>
+ <td class="text-center"><a href="#" class="oe_remove" data-action="remove-keyword" t-attf-title="Remove {{ widget.keyword }}"><i class="far fa-trash-alt"/></a></td>
</tr>
</t>
@@ -60,13 +60,13 @@
<div class="col-lg-6">
<div class="form-group">
<label for="website_meta_title">
- Title <i class="fa fa-question-circle-o" title="The title will take a default value unless you specify one."/>
+ Title <i class="far fa-question-circle" title="The title will take a default value unless you specify one."/>
</label>
<input type="text" name="website_meta_title" id="website_meta_title" class="form-control" placeholder="Keep empty to use default value" maxlength="70" size="70"/>
</div>
<div class="form-group">
<label for="website_meta_description">
- Description <i class="fa fa-question-circle-o" t-att-title="widget.previewDescription"/>
+ Description <i class="far fa-question-circle" t-att-title="widget.previewDescription"/>
</label>
<textarea name="website_meta_description" id="website_meta_description" placeholder="Keep empty to use default value" class="form-control"/>
<div class="alert alert-warning mt16 mb0 small" id="website_meta_description_warning" style="display: none;"/>
diff --git a/addons/website/static/src/xml/website.share.xml b/addons/website/static/src/xml/website.share.xml
index f07a2907492..fda80c2e050 100644
--- a/addons/website/static/src/xml/website.share.xml
+++ b/addons/website/static/src/xml/website.share.xml
@@ -4,7 +4,7 @@
<div class="text-nowrap css_editable_mode_hidden">
<t t-foreach="medias" t-as="media">
<a href="#"
- t-attf-class="fa fa-3x fa-#{media}-square text-#{media} oe_social_#{media}"
+ t-attf-class="fab fa-3x fa-#{media}-square text-#{media} oe_social_#{media}"
t-att-title="media"
t-att-aria-label="media"/>
</t>