summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2018-03-15 12:20:21 +0100
committerqsm-odoo <qsm@odoo.com>2018-07-27 12:36:54 +0200
commitea7c3f4a698bd027c307aef89fa2974916c4b9f5 (patch)
treef28c3a8a691c054cc5979919eedc2bb613db573e
parent193d85152cf721ca86d32e9428b5b75b43b208fc (diff)
[REF] *: BS4, get rid of the removed 'square' mixin
-rw-r--r--addons/hr_attendance/static/src/scss/hr_attendance.scss9
-rw-r--r--addons/hr_org_chart/static/src/scss/hr_org_chart.scss6
-rw-r--r--addons/mail/static/src/scss/discuss.scss3
-rw-r--r--addons/mail/static/src/scss/mail_activity.scss6
-rw-r--r--addons/web/static/src/scss/base_settings.scss3
-rw-r--r--addons/website/static/src/scss/website.ui.scss3
-rw-r--r--addons/website_theme_install/static/src/scss/website_theme_install.scss3
-rw-r--r--odoo/addons/base/static/src/scss/onboarding.scss12
8 files changed, 30 insertions, 15 deletions
diff --git a/addons/hr_attendance/static/src/scss/hr_attendance.scss b/addons/hr_attendance/static/src/scss/hr_attendance.scss
index 79b4c3771d6..c0f83d1f33e 100644
--- a/addons/hr_attendance/static/src/scss/hr_attendance.scss
+++ b/addons/hr_attendance/static/src/scss/hr_attendance.scss
@@ -112,7 +112,8 @@
.hidden-xs.btn-default {
transform: translate(-50%, -50%);
@include o-position-absolute(0, $left:0);
- @include square(2em);
+ width: 2em;
+ height: 2em;
border-radius: 50%;
padding-left: 14px;
line-height: 1.5em;
@@ -133,9 +134,10 @@
background: linear-gradient(linear, left top, right bottom, #77717e, #c9a8a9);
img {
+ width: 50px;
+ height: 50px;
background: white;
border: 1px solid #d7d7d7;
- @include square(50px);
}
@include media-breakpoint-down(sm) {
@@ -152,7 +154,8 @@
transform: translateY(3px);
img {
- @include square(80px);
+ width: 80px;
+ height: 80px;
transform: translateX(-50%)translateY(35%);
@include o-position-absolute($bottom: 0);
}
diff --git a/addons/hr_org_chart/static/src/scss/hr_org_chart.scss b/addons/hr_org_chart/static/src/scss/hr_org_chart.scss
index a13c05a2246..b71fd72539e 100644
--- a/addons/hr_org_chart/static/src/scss/hr_org_chart.scss
+++ b/addons/hr_org_chart/static/src/scss/hr_org_chart.scss
@@ -162,7 +162,8 @@
}
.media-object {
- @include square($o-hr-org-chart-entry-pic-size*0.8);
+ width: $o-hr-org-chart-entry-pic-size*0.8;
+ height: $o-hr-org-chart-entry-pic-size*0.8;
margin: $o-hr-org-chart-entry-pic-size*0.1;
box-shadow: 0 0 0 $o-hr-org-chart-entry-line-w darken($o-hr-org-chart-bg, 20%);
background-size: cover;
@@ -227,7 +228,8 @@
}
.media-object {
- @include square($o-hr-org-chart-entry-pic-size);
+ width: $o-hr-org-chart-entry-pic-size;
+ height: $o-hr-org-chart-entry-pic-size;
margin: 0;
border: $o-hr-org-chart-entry-line-w*2 solid $o-brand-optional;
box-shadow: inset 0 0 0 $o-hr-org-chart-entry-line-w*2 white;
diff --git a/addons/mail/static/src/scss/discuss.scss b/addons/mail/static/src/scss/discuss.scss
index 1df07e40121..e2d5d8eb2f9 100644
--- a/addons/mail/static/src/scss/discuss.scss
+++ b/addons/mail/static/src/scss/discuss.scss
@@ -342,7 +342,8 @@
flex: 0 0 auto;
position: relative;
> img {
- @include square(100%);
+ width: 100%;
+ height: 100%;
border-radius: 50%;
}
&.o_mail_preview_app > img {
diff --git a/addons/mail/static/src/scss/mail_activity.scss b/addons/mail/static/src/scss/mail_activity.scss
index b4bd611f31c..1c8984e0f1e 100644
--- a/addons/mail/static/src/scss/mail_activity.scss
+++ b/addons/mail/static/src/scss/mail_activity.scss
@@ -44,12 +44,14 @@
margin-bottom: 8px;
img {
- @include square(31px);
+ width: 31px;
+ height: 31px;
}
.o_avatar_icon {
@include o-position-absolute($right: -5px, $bottom: -5px);
- @include square(25px);
+ width: 25px;
+ height: 25px;
padding: 6px 5px;
text-align: center;
line-height: 1.2;
diff --git a/addons/web/static/src/scss/base_settings.scss b/addons/web/static/src/scss/base_settings.scss
index 011b0617efa..36a38f5fc1e 100644
--- a/addons/web/static/src/scss/base_settings.scss
+++ b/addons/web/static/src/scss/base_settings.scss
@@ -202,7 +202,8 @@
background-color: $gray-lighter;
.icon {
- @include square(25px);
+ width: 25px;
+ height: 25px;
margin-right: 10px;
}
diff --git a/addons/website/static/src/scss/website.ui.scss b/addons/website/static/src/scss/website.ui.scss
index 605b70a8205..5ee27fe7e34 100644
--- a/addons/website/static/src/scss/website.ui.scss
+++ b/addons/website/static/src/scss/website.ui.scss
@@ -71,7 +71,8 @@ body.o_connected_user {
position: relative;
display: inline-block;
opacity: $opacity;
- @include square($size);
+ width: $size;
+ height: $size;
&:hover, &:focus {
outline: none;
diff --git a/addons/website_theme_install/static/src/scss/website_theme_install.scss b/addons/website_theme_install/static/src/scss/website_theme_install.scss
index 365592fdcf3..ea84164b6e5 100644
--- a/addons/website_theme_install/static/src/scss/website_theme_install.scss
+++ b/addons/website_theme_install/static/src/scss/website_theme_install.scss
@@ -39,7 +39,8 @@
> .fa-check-circle {
@include o-position-absolute(10px, 10px);
- @include square(20px);
+ width: 20px;
+ height: 20px;
font-size: 20px;
}
}
diff --git a/odoo/addons/base/static/src/scss/onboarding.scss b/odoo/addons/base/static/src/scss/onboarding.scss
index 5665b518ed4..c26ce184ec7 100644
--- a/odoo/addons/base/static/src/scss/onboarding.scss
+++ b/odoo/addons/base/static/src/scss/onboarding.scss
@@ -107,7 +107,8 @@ $o-onboarding-violet-ui-2: #FBEEC8;
.o_onboarding_progress {
@include o-position-absolute($o-onboarding-dot-size*0.5 - 2px, calc(50% + 10px));
- @include size(calc(100% - 20px), 4px);
+ width: calc(100% - 20px);
+ height: 4px;
background-color: $gray-lighter;
.progress-bar {
@@ -117,7 +118,8 @@ $o-onboarding-violet-ui-2: #FBEEC8;
}
.o_onboarding_dot {
- @include square($o-onboarding-dot-size);
+ width: $o-onboarding-dot-size;
+ height: $o-onboarding-dot-size;
color: transparent;
padding-top: 5px;
font-size: 11px;
@@ -418,12 +420,14 @@ $o-onboarding-violet-ui-2: #FBEEC8;
}
&.ribbon {
- @include size(.3em, .7em);
+ width: .3em;
+ height: .7em;
border-radius: .1em;
}
&.flake {
- @include square(.3em);
+ width: .3em;
+ height: .3em;
border-radius: 50%;
}