From 68961182ffeddc5bd4272ddcfe7332db592ed113 Mon Sep 17 00:00:00 2001
From: gaelle morin <gmorin.dev@gmail.com>
Date: Mon, 24 Feb 2020 15:10:02 +0100
Subject: [PATCH] CSS fixup
---
src/styles/base/main.scss | 2 +-
src/styles/base/menu-left.scss | 10 +++++-----
src/styles/layout/project-profile/project-profile.scss | 8 ++++++++
src/templates/hd-customer.pug | 4 ++--
src/views/admin/page-admin-circles.pug | 2 +-
src/views/circle/page-circle-profile.pug | 2 +-
6 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss
index 5de18046..32b1174e 100644
--- a/src/styles/base/main.scss
+++ b/src/styles/base/main.scss
@@ -475,7 +475,7 @@ a,
}
}
- &.test {
+ &.flex {
display: flex;
}
diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss
index 0ff6c1e4..c1a38a87 100644
--- a/src/styles/base/menu-left.scss
+++ b/src/styles/base/menu-left.scss
@@ -29,7 +29,7 @@
display: flex;
flex-direction: row-reverse;
font-weight: bold;
- padding: 1.6rem;
+ padding: 1.2rem;
&[active] {
background-color: $color-46-100-67;
@@ -97,10 +97,9 @@
.project-tab>div>sib-display>div:nth-child(1) {
sib-set-default[name='project'] {
- padding: 1rem 1rem 1rem 3.2rem;
.project-customer,
- .project-name {
+ .project-name>div {
display: block;
overflow: hidden;
text-overflow: ellipsis;
@@ -113,6 +112,7 @@
}
.project-name {
+ display: block;
padding-left: 14px;
width: calc(150px - 10px);
/* 10px = padding of the sib-set-default = better alignment */
@@ -126,7 +126,7 @@
/* End of specific styles of "Projects" tab */
>sib-display.nosub>div>sib-display>div {
- padding: 1rem 1rem 1rem 3.2rem;
+ padding: 1rem 1rem 1rem 3rem;
}
sib-display>div {
@@ -147,7 +147,7 @@
cursor: pointer;
>menu-fix-url-circle>sib-display>div,
>menu-fix-url-project>sib-display>div {
- padding: 1rem 1rem 1rem 3.2rem;
+ padding: 1rem 1rem 1rem 3rem;
}
}
diff --git a/src/styles/layout/project-profile/project-profile.scss b/src/styles/layout/project-profile/project-profile.scss
index ab8f6cb1..f2126457 100644
--- a/src/styles/layout/project-profile/project-profile.scss
+++ b/src/styles/layout/project-profile/project-profile.scss
@@ -163,6 +163,14 @@
span {
font-weight: bold;
+
+ &.link-color {
+ color: $color-244-73-62;
+ }
+
+ &.norm-weight {
+ font-weight: normal;
+ }
}
}
}
diff --git a/src/templates/hd-customer.pug b/src/templates/hd-customer.pug
index 51563c2f..813aa81a 100644
--- a/src/templates/hd-customer.pug
+++ b/src/templates/hd-customer.pug
@@ -12,6 +12,6 @@ sib-widget(name='hd-customer')
ul
li #[span(class='mdi-account-outline') ${await value.firstName} ${await value.lastName ? await value.lastName : ""}]${await value.role ? `, ${await value.role}` : ""}
li
- span(class='mdi-email-outline')
+ span(class='link-color norm-weight mdi-email-outline')
a(href='mailto:${await value.email}') ${await value.email}
- span ${await value.phone ? `<li><span class='mdi-cellphone-iphone'>${await value.phone}</span></li>` : ``}
+ span ${await value.phone ? `<li><span class='norm-weight mdi-cellphone-iphone'>${await value.phone}</span></li>` : ``}
diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug
index fd9c3356..c4428bdc 100644
--- a/src/views/admin/page-admin-circles.pug
+++ b/src/views/admin/page-admin-circles.pug
@@ -69,7 +69,7 @@
sib-widget(name='admin-circle-join-button')
template
- sib-form.button.text-bold.text-uppercase.reversed.button-blue.bordered.with-icon.icon-arrow-right-circle.test(
+ sib-form.button.text-bold.text-uppercase.reversed.button-blue.bordered.with-icon.icon-arrow-right-circle.flex(
data-src='${value}'
fields='user.@id'
diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug
index 70c49026..61725902 100644
--- a/src/views/circle/page-circle-profile.pug
+++ b/src/views/circle/page-circle-profile.pug
@@ -49,7 +49,7 @@ sib-router(default-route='circle-profile', hidden)
sib-widget(name='circle-join-button')
template
- button.button.btn-margin-left.text-bold.text-uppercase.reversed.button-dark.bordered.with-icon.icon-arrow-right-circle.test
+ button.button.btn-margin-left.text-bold.text-uppercase.reversed.button-dark.bordered.with-icon.icon-arrow-right-circle.flex
sib-form(
data-src=''
nested-field='members'
--
GitLab