summaryrefslogtreecommitdiff
path: root/addons/web/static/lib/bootstrap/scss/_code.scss
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2019-02-25 10:19:20 +0000
committerqsm-odoo <qsm@odoo.com>2019-02-27 10:28:30 +0000
commit4697d7448010376397f7150b84c207978ab3010e (patch)
tree19929461b00b740a6fa1457ebd6392ed4cc71324 /addons/web/static/lib/bootstrap/scss/_code.scss
parent1bd8c1e8462bf1871780f3fd127e2e345e154a2f (diff)
[IMP] web: update bootstrap 4.2.1 -> 4.3.1
See https://blog.getbootstrap.com/2019/02/11/bootstrap-4-3-0/ and https://blog.getbootstrap.com/2019/02/13/bootstrap-4-3-1-and-3-4-1/ Again, some fixes were added in this version and not in a 4.2.x version so there is no clean way to backport them in 12.0 / saas-12.2. If needed, the file bootstrap_review.scss is there for that. Among the new features, two notable ones: - The '.modal-dialog-scrollable' class which does what odoo already implemented for all its modals. So we could remove our custom code in a next update. - Responsive font sizes ! Plan was to develop something similar for the website, so this comes at the right time. The behavior is opt-in, we will enable it in a next update. Part of https://github.com/odoo/odoo/pull/31401 task-1944790
Diffstat (limited to 'addons/web/static/lib/bootstrap/scss/_code.scss')
-rw-r--r--addons/web/static/lib/bootstrap/scss/_code.scss10
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/web/static/lib/bootstrap/scss/_code.scss b/addons/web/static/lib/bootstrap/scss/_code.scss
index 9b2e027f403..74b6e1c89be 100644
--- a/addons/web/static/lib/bootstrap/scss/_code.scss
+++ b/addons/web/static/lib/bootstrap/scss/_code.scss
@@ -1,6 +1,6 @@
// Inline code
code {
- font-size: $code-font-size;
+ @include font-size($code-font-size);
color: $code-color;
word-break: break-word;
@@ -13,7 +13,7 @@ code {
// User input typically entered via keyboard
kbd {
padding: $kbd-padding-y $kbd-padding-x;
- font-size: $kbd-font-size;
+ @include font-size($kbd-font-size);
color: $kbd-color;
background-color: $kbd-bg;
@include border-radius($border-radius-sm);
@@ -21,7 +21,7 @@ kbd {
kbd {
padding: 0;
- font-size: 100%;
+ @include font-size(100%);
font-weight: $nested-kbd-font-weight;
@include box-shadow(none);
}
@@ -30,12 +30,12 @@ kbd {
// Blocks of code
pre {
display: block;
- font-size: $code-font-size;
+ @include font-size($code-font-size);
color: $pre-color;
// Account for some code outputs that place code tags in pre tags
code {
- font-size: inherit;
+ @include font-size(inherit);
color: inherit;
word-break: normal;
}