summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src/scss/web_editor.variables.scss
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2019-02-14 15:40:13 +0000
committerqsm-odoo <qsm@odoo.com>2019-02-14 16:24:35 +0000
commitbbc24e3f76752149dd9811b8a54431bbcd498b6f (patch)
treed30f5e08a58c800b7670f2bb847ec743dddb2692 /addons/web_editor/static/src/scss/web_editor.variables.scss
parente2e0135a753feca96e2de0010b693fc5026cdaf3 (diff)
[FIX] website, *: restore and enforce Odoo UI design
* web_editor BS conflicts with our UI again: btn sizes and form controls are more difficult to force with BS4, this commit adapts the controls to use less problematic sizes, and adds/adapts some more forcing rules. Part of https://github.com/odoo/odoo/pull/31117 task-1941156
Diffstat (limited to 'addons/web_editor/static/src/scss/web_editor.variables.scss')
-rw-r--r--addons/web_editor/static/src/scss/web_editor.variables.scss38
1 files changed, 21 insertions, 17 deletions
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 9bb6b705c8d..ef75f0f2cc9 100644
--- a/addons/web_editor/static/src/scss/web_editor.variables.scss
+++ b/addons/web_editor/static/src/scss/web_editor.variables.scss
@@ -112,10 +112,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 {
@@ -138,10 +145,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;
}
}
@@ -149,23 +160,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;
+ }
}
}
}
@@ -177,7 +188,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);
@@ -202,13 +213,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);
- }
}
}