summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--addons/portal/static/src/scss/bootstrap_overridden.scss1
-rw-r--r--addons/portal/static/src/scss/primary_variables.scss2
-rw-r--r--addons/web/static/src/scss/bootstrap_overridden_frontend.scss5
-rw-r--r--addons/web/static/src/scss/primary_variables.scss3
-rw-r--r--addons/web_editor/static/src/js/tours/rte.js2
5 files changed, 9 insertions, 4 deletions
diff --git a/addons/portal/static/src/scss/bootstrap_overridden.scss b/addons/portal/static/src/scss/bootstrap_overridden.scss
index 1ea204f9dd4..057349a08bf 100644
--- a/addons/portal/static/src/scss/bootstrap_overridden.scss
+++ b/addons/portal/static/src/scss/bootstrap_overridden.scss
@@ -2,7 +2,6 @@
//
// Font, line-height, and color for body text, headings, and more.
-$font-size-base: $o-theme-font-size-base;
$font-size-sm: (12 / 16) * 1rem;
// Buttons
diff --git a/addons/portal/static/src/scss/primary_variables.scss b/addons/portal/static/src/scss/primary_variables.scss
index 96c6aab32c3..e69de29bb2d 100644
--- a/addons/portal/static/src/scss/primary_variables.scss
+++ b/addons/portal/static/src/scss/primary_variables.scss
@@ -1,2 +0,0 @@
-
-$o-theme-font-size-base: (14 / 16) * 1rem;
diff --git a/addons/web/static/src/scss/bootstrap_overridden_frontend.scss b/addons/web/static/src/scss/bootstrap_overridden_frontend.scss
index e69de29bb2d..f803cf3e72d 100644
--- a/addons/web/static/src/scss/bootstrap_overridden_frontend.scss
+++ b/addons/web/static/src/scss/bootstrap_overridden_frontend.scss
@@ -0,0 +1,5 @@
+// Fonts
+//
+// Font, line-height, and color for body text, headings, and more.
+
+$font-size-base: $o-theme-font-size-base;
diff --git a/addons/web/static/src/scss/primary_variables.scss b/addons/web/static/src/scss/primary_variables.scss
index 6c0b2187a09..7601c2225a7 100644
--- a/addons/web/static/src/scss/primary_variables.scss
+++ b/addons/web/static/src/scss/primary_variables.scss
@@ -106,3 +106,6 @@ $o-kanban-mobile-tabs-height: 40px;
// Used to manage spacing in complex dropdown menu
$o-kanban-dashboard-dropdown-complex-gap: 5px;
+
+// For the frontend part
+$o-theme-font-size-base: (14 / 16) * 1rem;
diff --git a/addons/web_editor/static/src/js/tours/rte.js b/addons/web_editor/static/src/js/tours/rte.js
index b997944a98b..abdcd39f35b 100644
--- a/addons/web_editor/static/src/js/tours/rte.js
+++ b/addons/web_editor/static/src/js/tours/rte.js
@@ -314,7 +314,7 @@ tour.register('rte_inline', {
trigger: '#wrapwrap img:first[width][height][style*="-radius"][style*="1px"][style*="padding"]',
}, {
content: "check the font image src",
- trigger: '#wrapwrap img:eq(1)[src^="/web_editor/font_to_img/"][src$="/rgb(0,160,157)/32"]',
+ trigger: '#wrapwrap img:eq(1)[src^="/web_editor/font_to_img/"][src$="/rgb(0,160,157)/28"]',
}, {
content: "check the font class to css",
trigger: '#wrapwrap img:eq(1)[height]:not([class*="fa"])',