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

update: flex class added in other files + %padding removed

Browse Source
This commit is contained in:
gaelle morin 2020-05-18 14:18:15 +02:00
parent af1d40cbd4
commit 56f9151345
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
11 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/page-circle.pug
View File

@ -1,5 +1,5 @@
.views-container.sidebar-is-closed .views-container.sidebar-is-closed
.content-box.full-width.with-form .content-box.flex.full-width.with-form
div.content-box__header div.content-box__header
sib-ac-checker(permission='acl:Read', bind-resources) sib-ac-checker(permission='acl:Read', bind-resources)
sib-display( sib-display(

2
src/page-messages.pug
View File

@ -1,4 +1,4 @@
.content-box.full-width .content-box.flex.full-width
sib-display.content-box__header( sib-display.content-box__header(
bind-resources bind-resources

2
src/page-project.pug
View File

@ -1,5 +1,5 @@
.views-container.sidebar-is-closed .views-container.sidebar-is-closed
.content-box.full-width.with-form .content-box.flex.full-width.with-form
div.content-box__header div.content-box__header
sib-ac-checker(permission='acl:Read', bind-resources) sib-ac-checker(permission='acl:Read', bind-resources)
sib-display( sib-display(

11
src/styles/base/main.scss
View File

@ -154,6 +154,7 @@ h5 {
font-size: 2rem; font-size: 2rem;
} }
<<<<<<< HEAD
%padding-main { %padding-main {
padding: 1.3rem; padding: 1.3rem;
} }
@ -162,6 +163,8 @@ h5 {
padding: 3.2rem; padding: 3.2rem;
} }
=======
>>>>>>> d9b2c89... update: flex class added in other files + %padding removed
.avatar { .avatar {
align-items: center; align-items: center;
background-color: var(--color-avatar-background); background-color: var(--color-avatar-background);
@ -190,7 +193,6 @@ h5 {
.content-box { .content-box {
@include window-style-modal(); @include window-style-modal();
display: flex;
flex-direction: column; flex-direction: column;
flex-grow: 1; flex-grow: 1;
margin: 2rem 1rem 5rem 2rem; margin: 2rem 1rem 5rem 2rem;
@ -202,10 +204,6 @@ h5 {
margin: 0 auto; margin: 0 auto;
min-height: 100%; min-height: 100%;
} }
&.with-padding {
@extend %padding-main;
}
} }
/* Header inside circle, project view */ /* Header inside circle, project view */
@ -268,8 +266,8 @@ h5 {
} }
.content-box__info { .content-box__info {
@extend %padding-block;
flex-direction: column; flex-direction: column;
padding: 3.2rem;
} }
/*.modal { /*.modal {
@ -329,7 +327,6 @@ h5 {
} }
.space-between { .space-between {
display: flex;
justify-content: space-between; justify-content: space-between;
padding-bottom: 1.4rem; padding-bottom: 1.4rem;
} }

4
src/styles/components/sidebar.scss
View File

@ -1,9 +1,13 @@
.no-sidebar { .no-sidebar {
flex: 1; flex: 1;
<<<<<<< HEAD
&.with-padding { &.with-padding {
@extend %padding-main; @extend %padding-main;
} }
=======
padding: 5rem;
>>>>>>> d9b2c89... update: flex class added in other files + %padding removed
} }
.with-sidebar { .with-sidebar {

2
src/views/admin/page-admin-circles.pug
View File

@ -1,4 +1,4 @@
.content-box.full-width.with-form .content-box.flex.full-width.with-form
sib-router(default-route='admin-circle-list', hidden) sib-router(default-route='admin-circle-list', hidden)
sib-route(name='admin-circle-list') sib-route(name='admin-circle-list')
sib-route(name='admin-circle-create') sib-route(name='admin-circle-create')

2
src/views/admin/page-admin-projects.pug
View File

@ -1,4 +1,4 @@
.content-box.full-width.with-form .content-box.flex.full-width.with-form
sib-router(default-route='admin-project-list', hidden) sib-router(default-route='admin-project-list', hidden)
sib-route(name='admin-project-list') sib-route(name='admin-project-list')
sib-route(name='admin-project-create') sib-route(name='admin-project-create')

2
src/views/admin/page-admin-users.pug
View File

@ -1,4 +1,4 @@
.content-box.full-width.with-form .content-box.flex.full-width.with-form
sib-router(default-route='admin-users-list', hidden) sib-router(default-route='admin-users-list', hidden)
sib-route(name='admin-users-list') sib-route(name='admin-users-list')
sib-route(name='admin-users-create') sib-route(name='admin-users-create')

2
src/views/circle/page-circle-profile.pug
View File

@ -6,7 +6,7 @@ sib-router(default-route='circle-profile', hidden)
include ../../templates/hubl-circle-team.pug include ../../templates/hubl-circle-team.pug
.content-box__info.flex .content-box__info.flex
.space-between .flex.space-between
sib-display( sib-display(
bind-resources bind-resources
fields='creationDateSet(title, creationDate)' fields='creationDateSet(title, creationDate)'

2
src/views/project/page-project-chat.pug
View File

@ -1,4 +1,4 @@
.content-box.with-padding.full-width.chat-view .content-box.flex.full-width.chat-view
sib-chat( sib-chat(
data-authentication='login', data-authentication='login',
data-auto-login='true', data-auto-login='true',

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

@ -9,7 +9,7 @@ sib-router(default-route='project-profile', hidden)
.content-box__info.flex .content-box__info.flex
.space-between .flex.space-between
sib-display( sib-display(
bind-resources bind-resources
fields='creationDateSet(title, creationDate)' fields='creationDateSet(title, creationDate)'
@ -24,7 +24,7 @@ sib-router(default-route='project-profile', hidden)
sib-link(class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre sib-link(class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre
.space-between .flex.space-between
sib-display( sib-display(
bind-resources bind-resources
fields='label-captain, captain' fields='label-captain, captain'