[REF] *: BS4, adapt font-size and padding variables

BS variables were renamed or changed and all (most) variables now
use 'rem' units instead of 'px' unit.

10 files changed, 22 insertions, 18 deletions

diff --git a/addons/web/static/src/scss/base_settings.scss b/addons/web/static/src/scss/base_settings.scss
index 36a38f5fc1e..b6615a39f80 100644
--- a/addons/web/static/src/scss/base_settings.scss
+++ b/addons/web/static/src/scss/base_settings.scss
@@ -1,5 +1,5 @@
 // MIXINS
-@mixin o-base-settings-horizontal-padding($padding-base: $padding-small-vertical) {
+@mixin o-base-settings-horizontal-padding($padding-base: $input-btn-padding-y-sm) {
     padding: $padding-base $o-horizontal-padding;
 
     @include media-breakpoint-up(xl) {
@@ -60,7 +60,7 @@
             border: 0;
 
             .btn-primary, .btn-link  {
-                padding: $padding-small-vertical $padding-small-horizontal;
+                padding: $btn-padding-y-sm $btn-padding-x-sm;
             }
 
             .btn-link {
diff --git a/addons/web/static/src/scss/bootstrap_overridden.scss b/addons/web/static/src/scss/bootstrap_overridden.scss
index 356433b2182..20c99bf341b 100644
--- a/addons/web/static/src/scss/bootstrap_overridden.scss
+++ b/addons/web/static/src/scss/bootstrap_overridden.scss
@@ -57,14 +57,13 @@ $component-active-bg: $gray-200;
 $font-family-sans-serif: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
 
 $font-size-base: $o-font-size-base;
-
 $line-height-base: $o-line-height-base;
 
-$h1-font-size: $o-font-size-base + 13px;
-$h2-font-size: $o-font-size-base + 7px;
-$h3-font-size: $o-font-size-base + 3px;
-$h4-font-size: $o-font-size-base + 2px;
-$h5-font-size: $o-font-size-base + 1px;
+$h1-font-size: $o-font-size-base * 2.0;
+$h2-font-size: $o-font-size-base * 1.5;
+$h3-font-size: $o-font-size-base * 1.3;
+$h4-font-size: $o-font-size-base * 1.2;
+$h5-font-size: $o-font-size-base * 1.1;
 
 $headings-font-weight: bold;
 
diff --git a/addons/web/static/src/scss/fields.scss b/addons/web/static/src/scss/fields.scss
index 080bf33760f..22a392b762b 100644
--- a/addons/web/static/src/scss/fields.scss
+++ b/addons/web/static/src/scss/fields.scss
@@ -418,7 +418,7 @@
         position: relative;
         border-radius: 5px;
         border: 1px solid $btn-primary-border;
-        font-size: $font-size-small;
+        font-size: $font-size-sm;
         color: $o-brand-optional;
         font-weight: $badge-font-weight;
         text-align: center;
diff --git a/addons/web/static/src/scss/form_view.scss b/addons/web/static/src/scss/form_view.scss
index 51c584c916e..26431b969e6 100644
--- a/addons/web/static/src/scss/form_view.scss
+++ b/addons/web/static/src/scss/form_view.scss
@@ -377,7 +377,7 @@
 
     // Separators
     .o_horizontal_separator {
-        font-size: $font-size-h2;
+        font-size: $h2-font-size;
         margin: $o-form-spacing-unit 0;
         &:empty {
             height: $o-form-spacing-unit * 2;
diff --git a/addons/web/static/src/scss/kanban_column_progressbar.scss b/addons/web/static/src/scss/kanban_column_progressbar.scss
index a96f1037c6d..e6a62f5230f 100644
--- a/addons/web/static/src/scss/kanban_column_progressbar.scss
+++ b/addons/web/static/src/scss/kanban_column_progressbar.scss
@@ -63,7 +63,7 @@
 
     > .o_kanban_counter_progress {
         width: 76%;
-        height: $font-size-small;
+        height: $font-size-sm;
         margin-bottom: 0;
         background-color: $gray-lighter-dark;
         box-shadow: none;
diff --git a/addons/web/static/src/scss/kanban_dashboard.scss b/addons/web/static/src/scss/kanban_dashboard.scss
index 0bf1a5cdc52..e9f6c0d74fc 100644
--- a/addons/web/static/src/scss/kanban_dashboard.scss
+++ b/addons/web/static/src/scss/kanban_dashboard.scss
@@ -70,9 +70,9 @@
                     padding-right: $o-kanban-dashboard-dropdown-complex-gap;
 
                     > .o_kanban_card_manage_title {
-                        margin: ($line-height-computed / 2) 0;
+                        margin: (($font-size-base * $line-height-base) / 2) 0;
                         color: $headings-color;
-                        font-size: $font-size-h5;
+                        font-size: $h5-font-size;
                         font-weight: 500;
                         line-height: $headings-line-height;
                     }
@@ -137,7 +137,7 @@
         // Identify subtitles without classes
         .o_kanban_primary_left .o_primary > span:nth-child(2) > strong {
             font-weight: 500;
-            font-size: $font-size-small;
+            font-size: $font-size-sm;
             color: $text-muted;
         }
 
diff --git a/addons/web/static/src/scss/kanban_view.scss b/addons/web/static/src/scss/kanban_view.scss
index bd595243d84..749c84d69fc 100644
--- a/addons/web/static/src/scss/kanban_view.scss
+++ b/addons/web/static/src/scss/kanban_view.scss
@@ -270,7 +270,7 @@
                 margin-bottom: $o-kanban-inner-hmargin*0.5;;
                 padding-left: 0;
                 list-style: none;
-                font-size: $font-size-small;
+                font-size: $font-size-sm;
 
                 li {
                     margin-bottom: 2px;
diff --git a/addons/web/static/src/scss/primary_variables.scss b/addons/web/static/src/scss/primary_variables.scss
index c8fd2f05338..2589e201226 100644
--- a/addons/web/static/src/scss/primary_variables.scss
+++ b/addons/web/static/src/scss/primary_variables.scss
@@ -4,8 +4,9 @@
 ///
 
 // Font sizes
-$o-font-size-base: 13px;
-$o-line-height-base: 1.428571429; // This is BS default
+$o-root-font-size: 13px;
+$o-font-size-base: 1rem;
+$o-line-height-base: 1.5; // This is BS default
 
 // Colors
 $o-brand-primary: #7c7bad;
diff --git a/addons/web/static/src/scss/utils.scss b/addons/web/static/src/scss/utils.scss
index a01ba14f5a4..1762e4d34d9 100644
--- a/addons/web/static/src/scss/utils.scss
+++ b/addons/web/static/src/scss/utils.scss
@@ -163,7 +163,7 @@
     display: block;
     text-align: center;
     color: $o-main-text-color;
-    font-size: $font-size-small;
+    font-size: $font-size-sm;
     cursor: pointer;
     @include o-hover-opacity($base-opacity);
 }
diff --git a/addons/web/static/src/scss/webclient.scss b/addons/web/static/src/scss/webclient.scss
index caea4378aa4..a3a007276e6 100644
--- a/addons/web/static/src/scss/webclient.scss
+++ b/addons/web/static/src/scss/webclient.scss
@@ -1,3 +1,7 @@
+:root {
+    font-size: $o-root-font-size;
+}
+
 // ------------------------------------------------------------------
 //  General
 // ------------------------------------------------------------------