pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
BS variables were renamed or changed and all (most) variables now
use 'rem' units instead of 'px' unit.
This commit is contained in:
qsm-odoo
2018-07-27 12:36:54 +02:00
parent 1c1c0897e8
commit 4ac446e328
21 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_import/static/src/scss/base_import.scss
Vendored
+1 -1
View File
@@ -122,7 +122,7 @@
/* Field dropdown */
.oe_import_selector {
font-size: $font-size-small;
font-size: $font-size-sm;
ul, li {
margin: 0; padding: 0;
}
addons/hr_attendance/static/src/scss/hr_attendance.scss
+1 -1
View File
@@ -172,7 +172,7 @@
.o_hr_attendance_PINbox {
font-size: 2em;
border: none;
padding: 0 $padding-large-horizontal;
padding: 0 $input-btn-padding-x-lg;
background: fade-out(white, 0.6);
}
}
addons/mail/static/src/scss/composer.scss
+3 -3
View File
@@ -190,7 +190,7 @@
.o_composer_button_send {
border-radius: 0 3px 3px 0;
// Make the button appear as the same size as the subject input
padding: 10px $padding-base-horizontal;
padding: 10px $input-btn-padding-x;
border: 1px solid darken($o-brand-optional, 5%);
border-left-width: 0;
}
@@ -402,7 +402,7 @@ $o-mail-attachment-margin: 5px;
@include o-position-absolute($bottom: 7px);
width: 80%;
@include o-text-overflow(inline-block);
font-size: $font-size-small;
font-size: $font-size-sm;
}
.o_attachment_download {
@@ -449,7 +449,7 @@ $o-mail-attachment-margin: 5px;
.o_close_btn {
@include o-position-absolute(-1px, $grid-gutter-width*0.5);
font-size: $font-size-h1;
font-size: $h1-font-size;
font-weight: 300;
}
}
addons/mail/static/src/scss/discuss.scss
+3 -3
View File
@@ -86,13 +86,13 @@
}
&.o_mail_discuss_title_main {
padding: $padding-base-vertical $o-horizontal-padding;
padding: $input-btn-padding-y $o-horizontal-padding;
margin-bottom: 2px;
}
}
.o_mail_discuss_item + .o_mail_sidebar_title {
margin-top: $padding-base-vertical;
margin-top: $input-btn-padding-y;
}
.o_mail_add_thread {
@@ -214,7 +214,7 @@
.o_mail_sidebar_title {
h4 {
margin: 0;
font-size: $font-size-small;
font-size: $font-size-sm;
text-transform: uppercase;
color: $gray-light;
&.o_mail_open_channels:hover {
addons/mail/static/src/scss/mail_activity.scss
+1 -1
View File
@@ -99,7 +99,7 @@
.o_thread_message_tools {
.o_activity_link {
padding: 0 $padding-base-horizontal;
padding: 0 $input-btn-padding-x;
}
.o_activity_done {
padding-left: 0;
addons/note/static/src/scss/note.scss
+2 -2
View File
@@ -8,7 +8,7 @@
margin-bottom: 0;
}
.oe_form_field.oe_memo {
margin: 0 ($padding-large-horizontal * -1);
margin: 0 ($input-btn-padding-x-lg * -1);
padding: 0;
min-height: 200px;
@@ -18,7 +18,7 @@
}
&.o_form_readonly {
.oe_memo {
padding: $padding-large-horizontal;
padding: $input-btn-padding-x-lg;
border-bottom: 1px solid $legend-border-color;
}
}
addons/web/static/src/scss/base_settings.scss
+2 -2
View File
@@ -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 {
addons/web/static/src/scss/bootstrap_overridden.scss
Vendored
+5 -6
View File
@@ -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;
addons/web/static/src/scss/fields.scss
+1 -1
View File
@@ -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;
addons/web/static/src/scss/form_view.scss
+1 -1
View File
@@ -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;
addons/web/static/src/scss/kanban_column_progressbar.scss
+1 -1
View File
@@ -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;
addons/web/static/src/scss/kanban_dashboard.scss
+3 -3
View File
@@ -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;
}
addons/web/static/src/scss/kanban_view.scss
+1 -1
View File
@@ -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;
addons/web/static/src/scss/primary_variables.scss
+3 -2
View File
@@ -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;
addons/web/static/src/scss/utils.scss
+1 -1
View File
@@ -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);
}
addons/web/static/src/scss/webclient.scss
+4
View File
@@ -1,3 +1,7 @@
:root {
font-size: $o-root-font-size;
}
// ------------------------------------------------------------------
// General
// ------------------------------------------------------------------
addons/web_editor/static/src/scss/web_editor.ui.scss
+1 -1
View File
@@ -709,7 +709,7 @@ html[lang] > body.editor_enable [data-oe-translation-state] {
height: $o-navbar-height;
border: none;
border-radius: 0;
padding: $padding-base-vertical $padding-base-horizontal; // force this because of themes
padding: $btn-padding-y $btn-padding-y; // force this because of themes
background-color: $o-we-color-dark;
color: $o-we-color-text-normal;
border-top: 2px solid transparent;
addons/website_rating/static/src/scss/website_rating.scss
+1 -1
View File
@@ -35,7 +35,7 @@ $o-w-rating-star-color: #FACC2E;
.o_website_rating_table_percent {
text-align: right;
padding-left: 5px;
font-size: $font-size-small;
font-size: $font-size-sm;
}
.o_website_rating_table_reset {
.o_website_rating_select_text {
addons/website_sale/static/src/scss/website_sale_backend.scss
+1 -1
View File
@@ -51,7 +51,7 @@
right: auto;
border-radius: 0 0 2px;
font-weight: normal;
font-size: $font-size-small - 1;
font-size: $font-size-sm - 1;
&.label-normal {
background-color: $gray-lighter;
addons/website_sale/static/src/scss/website_sale_frontend.scss
+6 -6
View File
@@ -2,9 +2,9 @@
//## ----------------------------
// Theming variables
$o-wsale-wizard-thickness: 2px;
$o-wsale-wizard-dot-size: 10px;
$o-wsale-wizard-dot-active-glow: 4px;
$o-wsale-wizard-thickness: 0.125rem;
$o-wsale-wizard-dot-size: 0.625rem;
$o-wsale-wizard-dot-active-glow: 0.25rem;
$o-wsale-wizard-color-inner: white;
$o-wsale-wizard-color-default: $gray-lighter;
@@ -69,11 +69,11 @@ $o-wsale-wizard-label-completed: $state-success-text;
@include media-breakpoint-up(md) {
display: block;
margin: (10px + $tmp-dot-radius) 0 20px 0;
margin: (0.625rem + $tmp-dot-radius) 0 20px 0;
}
@include media-breakpoint-down(sm) {
margin-left: -15px;
font-size:24px;
font-size: 24px;
}
}
@@ -86,7 +86,7 @@ $o-wsale-wizard-label-completed: $state-success-text;
.progress-wizard-dot {
animation: fadeIn 1s ease 0s 1 normal none running;
background: $o-wsale-wizard-dot-active;
box-shadow: 0 0 0 $o-wsale-wizard-dot-active-glow - 1px $o-wsale-wizard-color-inner,
box-shadow: 0 0 0 ($o-wsale-wizard-dot-active-glow - 0.0625rem) $o-wsale-wizard-color-inner,
0 0 0 $o-wsale-wizard-dot-active-glow rgba($o-wsale-wizard-dot-active, 0.5);
}
addons/website_theme_install/static/src/scss/website_theme_install.scss
+1 -1
View File
@@ -87,7 +87,7 @@
visibility: hidden;
> .btn {
padding: $padding-large-vertical $padding-large-horizontal;
padding: $btn-padding-y-lg $btn-padding-x-lg;
}
hr {