From 8369cfbd753513c996b32c3741bdbd35a878db48 Mon Sep 17 00:00:00 2001
From: gaelle morin <gmorin.dev@gmail.com>
Date: Thu, 17 Sep 2020 19:41:39 +0200
Subject: [PATCH] update: styles for project- and circle-edit
---
"\033" | 30 +++++++++++++++++++++++++
src/dependencies.pug | 10 ++++-----
src/styles/base/form.scss | 7 +++++-
src/styles/base/table.scss | 9 ++++----
src/styles/base/user-thumb.scss | 3 ++-
src/views/circle/page-circle-edit.pug | 4 ++--
src/views/project/page-project-edit.pug | 4 ++--
7 files changed, 52 insertions(+), 15 deletions(-)
create mode 100644 "\033"
diff --git "a/\033" "b/\033"
new file mode 100644
index 00000000..2e964438
--- /dev/null
+++ "b/\033"
@@ -0,0 +1,30 @@
+[1mdiff --git a/src/dependencies.pug b/src/dependencies.pug[m
+[1mindex 7ceee9a..d4a7c72 100644[m
+[1m--- a/src/dependencies.pug[m
+[1m+++ b/src/dependencies.pug[m
+[36m@@ -19,12 +19,12 @@[m [mif endpoints.events || (endpoints.get && endpoints.get.events)[m
+ //- script(type="module" src="/lib/sib-event/sib-event.js" defer)[m
+ [m
+ if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)[m
+[31m- script(type="module" src="https://unpkg.com/@startinblox/component-job-board@beta" defer)[m
+[31m- //- script(type="module" src="/lib/solid-job-board/dist/index.js" defer)[m
+[32m+[m[32m //- script(type="module" src="https://unpkg.com/@startinblox/component-job-board@beta" defer)[m
+[32m+[m[32m script(type="module" src="/lib/solid-job-board/dist/index.js" defer)[m
+ [m
+ if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users))[m
+[31m- script(type="module" src="https://unpkg.com/@startinblox/component-directory@beta" defer)[m
+[31m- //- script(type="module" src="/lib/solid-directory/dist/index.js" defer)[m
+[32m+[m[32m //- script(type="module" src="https://unpkg.com/@startinblox/component-directory@beta" defer)[m
+[32m+[m[32m script(type="module" src="/lib/solid-directory/dist/index.js" defer)[m
+ [m
+ if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)[m
+ script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@beta" defer)[m
+[36m@@ -32,7 +32,7 @@[m [mif endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)[m
+ [m
+ if endpoints.users || (endpoints.get && endpoints.get.users)[m
+ //- script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.8" defer)[m
+[31m- //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)[m
+[32m+[m[32m script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)[m
+ [m
+ script(src="/scripts/index.js" defer)[m
+ [m
diff --git a/src/dependencies.pug b/src/dependencies.pug
index 7ceee9a9..d4a7c72c 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -19,12 +19,12 @@ if endpoints.events || (endpoints.get && endpoints.get.events)
//- script(type="module" src="/lib/sib-event/sib-event.js" defer)
if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
- script(type="module" src="https://unpkg.com/@startinblox/component-job-board@beta" defer)
- //- script(type="module" src="/lib/solid-job-board/dist/index.js" defer)
+ //- script(type="module" src="https://unpkg.com/@startinblox/component-job-board@beta" defer)
+ script(type="module" src="/lib/solid-job-board/dist/index.js" defer)
if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users))
- script(type="module" src="https://unpkg.com/@startinblox/component-directory@beta" defer)
- //- script(type="module" src="/lib/solid-directory/dist/index.js" defer)
+ //- script(type="module" src="https://unpkg.com/@startinblox/component-directory@beta" defer)
+ script(type="module" src="/lib/solid-directory/dist/index.js" defer)
if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@beta" defer)
@@ -32,7 +32,7 @@ if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
if endpoints.users || (endpoints.get && endpoints.get.users)
//- script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.8" defer)
- //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)
+ script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)
script(src="/scripts/index.js" defer)
diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss
index 52822b95..86e89b78 100644
--- a/src/styles/base/form.scss
+++ b/src/styles/base/form.scss
@@ -132,6 +132,10 @@ solid-form-dropdown-autocompletion-label,
solid-form-multipleselect-autocompletion-label,
hubl-status {
+ label {
+ display: none;
+ }
+
.ss-main {
font-weight: normal;
text-transform: none;
@@ -143,7 +147,6 @@ hubl-status {
border-radius: 0px;
color: var(--color-input-text);
font-weight: normal;
- margin-top: 0.8rem;
min-height: 4.6rem;
padding-left: 1.2rem;
@@ -178,6 +181,7 @@ hubl-status {
display: flex;
flex-direction: row;
margin-bottom: 2.6rem;
+ margin-top: 1.8rem;
}
label {
@@ -198,6 +202,7 @@ hubl-status {
width: 100%;
@include breakpoint(lg) {
+ height: 32px;
margin: auto 0 auto 2.2rem;
width: auto;
}
diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss
index 6ecc645b..9616f777 100644
--- a/src/styles/base/table.scss
+++ b/src/styles/base/table.scss
@@ -46,13 +46,14 @@
&>* {
border-bottom: 1px solid var(--color-table-border);
display: table-cell;
+ text-align: center;
vertical-align: middle;
}
}
}
- &>solid-multiple {
- display: contents;
+ /*&>solid-multiple {
+ display: contents;*/
&>div {
display: contents;
@@ -68,7 +69,7 @@
}
}
}
- }
+ /*}*/
}
}
}
@@ -163,7 +164,7 @@
/* Styles of elements inside cells */
-.user-thumb>div,
+.user-thumb,
[name='user-thumb'] {
vertical-align: middle;
text-align: left;
diff --git a/src/styles/base/user-thumb.scss b/src/styles/base/user-thumb.scss
index 8814efb3..7d7166b9 100644
--- a/src/styles/base/user-thumb.scss
+++ b/src/styles/base/user-thumb.scss
@@ -79,6 +79,7 @@
/* Apply the grids to all user-thumbs */
.user-thumb>div,
+.user-thumb>[name='classGrid'],
[name='user-thumb'] {
@extend %user-thumb__grid;
@@ -92,7 +93,7 @@
}
/* Add extra spaces to user-thumbs that are inside a table */
-.user-thumb.is-spaced>div,
+.user-thumb.is-spaced,
[name='user-thumb'] {
padding: 0.8rem 2.2rem;
}
diff --git a/src/views/circle/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug
index d772f8f0..5f7c066f 100644
--- a/src/views/circle/page-circle-edit.pug
+++ b/src/views/circle/page-circle-edit.pug
@@ -57,7 +57,7 @@ div.content-box__info
fields='user'
range-user=`${endpoints.users || endpoints.get.users}`
- class-user='team form-label is-light'
+ class-user='team'
label-user=''
widget-user='solid-form-dropdown-autocompletion-label'
@@ -74,7 +74,7 @@ div.content-box__info
class='table-body'
bind-resources
nested-field='members'
- fields='classGroup(user.account.picture, sup(user.name, user.groups), sub(user.profile.city)), self'
+ fields='classGroup(classGrid(user.account.picture, sup(user.name, user.groups), sub(user.profile.city))), self'
loader-id='loader-circle-edit'
class-classGroup='w280 cell border cell-with-id-card user-thumb is-spaced'
diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug
index 62f8e4f9..5ab03dee 100644
--- a/src/views/project/page-project-edit.pug
+++ b/src/views/project/page-project-edit.pug
@@ -49,7 +49,7 @@ div.content-box__info
fields='user'
range-user=`${endpoints.users || endpoints.get.users}`
- class-user='team form-label is-light'
+ class-user='team'
label-user=''
widget-user='solid-form-dropdown-autocompletion-label'
@@ -67,7 +67,7 @@ div.content-box__info
class='table-body'
bind-resources
nested-field='members'
- fields='classGroup(user.account.picture, sup(user.name, user.groups), sub(user.profile.city)), self'
+ fields='classGroup(classGrid(user.account.picture, sup(user.name, user.groups), sub(user.profile.city))), self'
loader-id='loader-project-edit'
class-classGroup='w280 cell border cell-with-id-card user-thumb is-spaced'
--
GitLab