autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update: styles for project- and circle-edit

Browse Source
This commit is contained in:
gaelle morin 2020-09-17 19:41:39 +02:00
parent 7e99beeb9b
commit 8369cfbd75
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
7 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
 Normal file
View File

@ -0,0 +1,30 @@
diff --git a/src/dependencies.pug b/src/dependencies.pug
index 7ceee9a..d4a7c72 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)


10
src/dependencies.pug
View File

@ -19,12 +19,12 @@ if endpoints.events || (endpoints.get && endpoints.get.events)
//- script(type="module" src="/lib/sib-event/sib-event.js" defer) //- script(type="module" src="/lib/sib-event/sib-event.js" defer)
if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) 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="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="/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)) 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="https://unpkg.com/@startinblox/component-directory@beta" defer)
//- script(type="module" src="/lib/solid-directory/dist/index.js" defer) script(type="module" src="/lib/solid-directory/dist/index.js" defer)
if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@beta" defer) 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) 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="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) script(src="/scripts/index.js" defer)

7
src/styles/base/form.scss
View File

@ -132,6 +132,10 @@ solid-form-dropdown-autocompletion-label,
solid-form-multipleselect-autocompletion-label, solid-form-multipleselect-autocompletion-label,
hubl-status { hubl-status {
label {
display: none;
}
.ss-main { .ss-main {
font-weight: normal; font-weight: normal;
text-transform: none; text-transform: none;
@ -143,7 +147,6 @@ hubl-status {
border-radius: 0px; border-radius: 0px;
color: var(--color-input-text); color: var(--color-input-text);
font-weight: normal; font-weight: normal;
margin-top: 0.8rem;
min-height: 4.6rem; min-height: 4.6rem;
padding-left: 1.2rem; padding-left: 1.2rem;
@ -178,6 +181,7 @@ hubl-status {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
margin-bottom: 2.6rem; margin-bottom: 2.6rem;
margin-top: 1.8rem;
} }
label { label {
@ -198,6 +202,7 @@ hubl-status {
width: 100%; width: 100%;
@include breakpoint(lg) { @include breakpoint(lg) {
height: 32px;
margin: auto 0 auto 2.2rem; margin: auto 0 auto 2.2rem;
width: auto; width: auto;
} }

9
src/styles/base/table.scss
View File

@ -46,13 +46,14 @@
&>* { &>* {
border-bottom: 1px solid var(--color-table-border); border-bottom: 1px solid var(--color-table-border);
display: table-cell; display: table-cell;
text-align: center;
vertical-align: middle; vertical-align: middle;
} }
} }
} }
&>solid-multiple { /*&>solid-multiple {
display: contents; display: contents;*/
&>div { &>div {
display: contents; display: contents;
@ -68,7 +69,7 @@
} }
} }
} }
} /*}*/
} }
} }
} }
@ -163,7 +164,7 @@
/* Styles of elements inside cells */ /* Styles of elements inside cells */
.user-thumb>div, .user-thumb,
[name='user-thumb'] { [name='user-thumb'] {
vertical-align: middle; vertical-align: middle;
text-align: left; text-align: left;

3
src/styles/base/user-thumb.scss
View File

@ -79,6 +79,7 @@
/* Apply the grids to all user-thumbs */ /* Apply the grids to all user-thumbs */
.user-thumb>div, .user-thumb>div,
.user-thumb>[name='classGrid'],
[name='user-thumb'] { [name='user-thumb'] {
@extend %user-thumb__grid; @extend %user-thumb__grid;
@ -92,7 +93,7 @@
} }
/* Add extra spaces to user-thumbs that are inside a table */ /* Add extra spaces to user-thumbs that are inside a table */
.user-thumb.is-spaced>div, .user-thumb.is-spaced,
[name='user-thumb'] { [name='user-thumb'] {
padding: 0.8rem 2.2rem; padding: 0.8rem 2.2rem;
} }

4
src/views/circle/page-circle-edit.pug
View File

@ -57,7 +57,7 @@ div.content-box__info
fields='user' fields='user'
range-user=`${endpoints.users || endpoints.get.users}` range-user=`${endpoints.users || endpoints.get.users}`
class-user='team form-label is-light' class-user='team'
label-user='' label-user=''
widget-user='solid-form-dropdown-autocompletion-label' widget-user='solid-form-dropdown-autocompletion-label'
@ -74,7 +74,7 @@ div.content-box__info
class='table-body' class='table-body'
bind-resources bind-resources
nested-field='members' 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' loader-id='loader-circle-edit'
class-classGroup='w280 cell border cell-with-id-card user-thumb is-spaced' class-classGroup='w280 cell border cell-with-id-card user-thumb is-spaced'

4
src/views/project/page-project-edit.pug
View File

@ -49,7 +49,7 @@ div.content-box__info
fields='user' fields='user'
range-user=`${endpoints.users || endpoints.get.users}` range-user=`${endpoints.users || endpoints.get.users}`
class-user='team form-label is-light' class-user='team'
label-user='' label-user=''
widget-user='solid-form-dropdown-autocompletion-label' widget-user='solid-form-dropdown-autocompletion-label'
@ -67,7 +67,7 @@ div.content-box__info
class='table-body' class='table-body'
bind-resources bind-resources
nested-field='members' 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' loader-id='loader-project-edit'
class-classGroup='w280 cell border cell-with-id-card user-thumb is-spaced' class-classGroup='w280 cell border cell-with-id-card user-thumb is-spaced'