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

Merge branch 'jbpasquier/circle-information' into circle-wip-merge

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier 2019-10-29 15:03:48 +01:00
commit 7e0653f14b
No known key found for this signature in database
GPG Key ID: F2702E6D22ED4D62
6 changed files with 104 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/page-circle-profile.pug
View File

@ -16,10 +16,8 @@
class-description='description' class-description='description'
) )
div.content-box__info sib-ac-checker.content-box__info(permission='acl:Read', bind-resources)
sib-ac-checker.circle-edit-button(permission='acl:Write', bind-resources)
sib-ac-checker(permission='acl:Read', bind-resources)
sib-ac-checker(permission='acl:Write', bind-resources)
sib-link(class="right-btn", next="circle-edit", bind-resources) Edit and add Members sib-link(class="right-btn", next="circle-edit", bind-resources) Edit and add Members
sib-display.block( sib-display.block(

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

@ -169,6 +169,7 @@
align-self: flex-end; align-self: flex-end;
margin-bottom: 0.6rem; margin-bottom: 0.6rem;
margin-left: 4.2rem; margin-left: 4.2rem;
margin-top: 0;
} }
} }

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

@ -151,7 +151,7 @@ sib-delete {
} }
.content-box__header { .content-box__header {
padding: 2.3rem 3rem; padding: 1.9rem 3rem;
div { div {
color: $color-233-18-29; color: $color-233-18-29;

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

@ -45,7 +45,7 @@
border-bottom: 1px solid $color-229-25-79; border-bottom: 1px solid $color-229-25-79;
display: flex; display: flex;
margin: 0; margin: 0;
padding: 2.55rem 2.55rem; padding: 2.15rem 2.55rem;
position: relative; position: relative;
width: 12em; width: 12em;

1
src/styles/layout/circle/circle-edit.scss
View File

@ -1,4 +1,5 @@
#circle-edit { #circle-edit {
.table-header { .table-header {
background: $color-228-25-79; background: $color-228-25-79;
color: white; color: white;

11
src/styles/layout/circle/circle-profile.scss
View File

@ -8,11 +8,22 @@
.content-box__info { .content-box__info {
@extend %padding-block; @extend %padding-block;
display: flex;
flex-direction: column;
.backlink { .backlink {
text-align: right; text-align: right;
display: block; display: block;
} }
.circle-edit-button {
align-self: flex-end;
position: absolute;
>sib-link {
background: $color-244-73-62;
}
}
} }
.block { .block {