[MERGE] forward port branch 12.0 up to 84143a34b31

3 files changed, 27 insertions, 23 deletions

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 922a76fdb6f..c98d0245f7f 100644
--- a/addons/web_editor/static/src/scss/web_editor.ui.scss
+++ b/addons/web_editor/static/src/scss/web_editor.ui.scss
@@ -1086,7 +1086,7 @@ body.editor_enable {
 
         &:checked + span {
             box-shadow: none;
-            background-image: linear-gradient(0deg, $o-we-color-success, darken($o-we-color-success, 10%));
+            background: $o-we-color-success;
 
             &:after {
                 margin-left: ($o-we-switch-size*1.8 - $o-we-switch-size) + 0.1;
@@ -1097,7 +1097,7 @@ body.editor_enable {
         > input {
             &:not(:checked) + span {
                 box-shadow: none;
-                background-image: linear-gradient(0deg, lighten(theme-color('danger'), 5%), darken(theme-color('danger'), 5%));
+                background: $o-we-color-danger;
             }
         }
     }
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 e556d6e5e4e..679b82c10fc 100644
--- a/addons/web_editor/static/src/scss/web_editor.variables.scss
+++ b/addons/web_editor/static/src/scss/web_editor.variables.scss
@@ -111,10 +111,17 @@ $o-we-switch-inactive-color: $o-we-color-paper !default;
         color: #555;
         background-color: #fff;
         border-radius: 0;
+
         &.is-invalid {
             border-color: $danger;
         }
     }
+    .input-group .form-control {
+        height: auto;
+    }
+    .input-group-text {
+        background-color: #e9ecef;
+    }
 
     .was-validated {
         .form-control:invalid {
@@ -137,10 +144,14 @@ $o-we-switch-inactive-color: $o-we-color-paper !default;
         border-radius: 0;
         background-color: $o-we-color-paper;
 
+        .modal-header {
+            border-bottom-color: #e9ecef;
+        }
         .modal-body {
             background-color: white;
         }
         .modal-footer {
+            border-top-color: #e9ecef;
             text-align: left;
         }
     }
@@ -148,23 +159,23 @@ $o-we-switch-inactive-color: $o-we-color-paper !default;
 
 @mixin o-w-preserve-tabs {
     .nav-tabs {
-        border-bottom: 1px solid gray('200');
+        border-bottom: 1px solid #e9ecef;
 
         > li  {
             > a {
                 line-height: 1.5;
                 color: $o-we-color-light;
+
                 &:hover {
-                    border-color: gray('200');
+                    border-color: #dee2e6;
                 }
-            }
 
-            &.active > a {
-                &, &:hover, &:focus {
-                    color: $o-we-color-normal;
-                    background-color: $o-we-color-paper;
-                    border-color: gray('200');
-                    border-bottom-color: transparent;
+                &.active {
+                    &, &:hover, &:focus {
+                        color: $o-we-color-normal;
+                        background-color: $o-we-color-paper;
+                        border-color: #dee2e6 #dee2e6 #FFFFFF;
+                    }
                 }
             }
         }
@@ -176,7 +187,7 @@ $o-we-switch-inactive-color: $o-we-color-paper !default;
         border-radius: 0;
         font-weight: normal;
         text-transform: none;
-        @include button-size(.375rem, .75rem, 1rem, 1.5, 0);
+        @include button-size(.375rem, .75rem, 0.875rem, 1.5, 0);
 
         &.btn-primary {
             @include button-variant($o-brand-primary, $o-brand-primary);
@@ -201,13 +212,6 @@ $o-we-switch-inactive-color: $o-we-color-paper !default;
         &.btn-danger {
             @include button-variant($o-we-color-danger, $o-we-color-danger);
         }
-
-        &.btn-lg {
-            @include button-size(.5rem, 1rem, 1.25rem, 1.5, 0);
-        }
-        &.btn-sm {
-            @include button-size(.25rem, .5rem, .875rem, 1.5, 0);
-        }
     }
 }
 
diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 5fcfac2f4aa..2760ed1b0ab 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -417,7 +417,7 @@
                     <label class="col-md-3 col-form-label" for="o_bg_img_opt_custom_size_x">Background width</label>
                     <div class="col-md-5">
                         <div class="input-group">
-                            <input type="number" min="0" max="100" class="form-control form-control-sm" id="o_bg_img_opt_custom_size_x" placeholder="auto"/>
+                            <input type="number" min="0" max="100" class="form-control" id="o_bg_img_opt_custom_size_x" placeholder="auto"/>
                             <div class="input-group-append">
                                 <div class="input-group-text">%</div>
                             </div>
@@ -428,7 +428,7 @@
                     <label class="col-md-3 col-form-label" for="o_bg_img_opt_custom_size_y">Background height</label>
                     <div class="col-md-5">
                         <div class="input-group">
-                            <input type="number" min="0" max="100" class="form-control form-control-sm" id="o_bg_img_opt_custom_size_y" placeholder="auto"/>
+                            <input type="number" min="0" max="100" class="form-control" id="o_bg_img_opt_custom_size_y" placeholder="auto"/>
                             <div class="input-group-append">
                                 <div class="input-group-text">%</div>
                             </div>
@@ -443,7 +443,7 @@
                     <label class="col-md-3 col-form-label" for="o_bg_img_opt_custom_pos_x">Horizontal</label>
                     <div class="col-md-5">
                         <div class="input-group">
-                            <input type="number" min="0" max="100" class="form-control form-control-sm" id="o_bg_img_opt_custom_pos_x" placeholder="auto"/>
+                            <input type="number" min="0" max="100" class="form-control " id="o_bg_img_opt_custom_pos_x" placeholder="auto"/>
                             <div class="input-group-append">
                                 <div class="input-group-text">%</div>
                             </div>
@@ -454,7 +454,7 @@
                     <label class="col-md-3 col-form-label" for="o_bg_img_opt_custom_pos_y">Vertical</label>
                     <div class="col-md-5">
                         <div class="input-group">
-                            <input type="number" min="0" max="100" class="form-control form-control-sm" id="o_bg_img_opt_custom_pos_y" placeholder="auto"/>
+                            <input type="number" min="0" max="100" class="form-control" id="o_bg_img_opt_custom_pos_y" placeholder="auto"/>
                             <div class="input-group-append">
                                 <div class="input-group-text">%</div>
                             </div>