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

update: .position-end and box-button are in the same class

Browse Source
This commit is contained in:
gaelle morin 2020-05-18 15:07:25 +02:00
parent c950d27d47
commit 5d69d1a4ee
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
8 changed files with 20 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client.sample.happy-dev.css
View File

@ -139,23 +139,23 @@
}
/* Button to delete a channel */
#circle-profile>div>div.box-button>sib-ac-checker>sib-delete {
#circle-profile>div>div.button-end>sib-ac-checker>sib-delete {
background: var(--color-white);
border: 1px solid var(--color-complementary);
color: var(--color-complementary);
}
#circle-profile>div>div.box-button>sib-ac-checker>sib-delete>button {
#circle-profile>div>div.button-end>sib-ac-checker>sib-delete>button {
color: var(--color-complementary);
}
#circle-profile>div>div.box-button>sib-ac-checker>sib-delete:hover {
#circle-profile>div>div.button-end>sib-ac-checker>sib-delete:hover {
background: var(--color-complementary);
border: 1px solid var(--color-complementary);
color: var(--color-white);
}
#circle-profile>div>div.box-button>sib-ac-checker>sib-delete:hover>button {
#circle-profile>div>div.button-end>sib-ac-checker>sib-delete:hover>button {
color: var(--color-white);
}

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

@ -15,41 +15,6 @@ form {
margin-left: auto;
margin-top: 3.2rem;
}
<<<<<<< HEAD
.fieldset {
border-bottom: 1px solid var(--color-fieldset-border);
color: var(--color-title);
display: flex;
flex: 1 0 100%;
font-size: 1.8rem;
font-weight: 600;
margin: 2.6rem 0 1.8rem;
padding-bottom: 0.8rem;
}
.form-label {
/*flex: 1 1 auto;*/
font-weight: 600;
&.is-light label {
color: var(--color-label-light);
margin-top: 1.8rem;
text-transform: uppercase;
&>*:nth-child(1) {
margin-bottom: 0.8rem;
}
}
}
.is-full-width {
box-sizing: border-box;
flex: 1 1 100%;
padding-left: 3.4rem;
}
=======
.fieldset {
border-bottom: 1px solid var(--color-fieldset-border);
@ -85,20 +50,14 @@ form {
padding-left: 3.4rem;
}
>>>>>>> 5701eea... update: css for form elements are outside the .with-form context
.is-half-width {
box-sizing: border-box;
flex: 0 0 50%;
padding-left: 3.4rem;
}
<<<<<<< HEAD
input:not([type='file']):not([type='search']):not([type='submit']),
textarea {
=======
.input-text-like input:not([type='file']):not([type='search']):not([type='submit']),
.input-text-like textarea {
>>>>>>> 5701eea... update: css for form elements are outside the .with-form context
-webkit-tap-highlight-color: var(--color-grey-7);
background-color: var(--color-input-background);
box-sizing: border-box;
@ -108,11 +67,7 @@ textarea {
line-height: 1;
min-width: 0;
padding: 1rem;
<<<<<<< HEAD
=======
>>>>>>> 5701eea... update: css for form elements are outside the .with-form context
&:focus,
&:active {
border-bottom: 2px solid var(--color-input-active);
@ -122,15 +77,9 @@ textarea {
textarea {
height: 100px;
}
<<<<<<< HEAD
.content-box {
=======
.content-box {
>>>>>>> 5701eea... update: css for form elements are outside the .with-form context
&.with-form {
sib-set-default:not([name='user-thumb']) {
@ -147,17 +96,7 @@ textarea {
}
}
<<<<<<< HEAD
/* To align label and input vertically */
label {
display: flex;
flex-direction: column;
}
/*sib-form[set-user-id-select] {
=======
/*sib-form[set-user-id-select] {
>>>>>>> 5701eea... update: css for form elements are outside the .with-form context
input[type="submit"] {
margin-left: 0;
@ -207,33 +146,6 @@ sib-form-auto-completion {
}
}
<<<<<<< HEAD
hubl-status {
align-self: auto;
}
sib-form-date {
input[type="date"] {
background-image: url("/images/calendar.svg");
background-position: right 12px top 50%;
background-repeat: no-repeat;
background-size: 1.4rem;
color: var(--color-input-icon);
cursor: default;
font-size: 1.4rem;
margin-top: 1.6rem;
max-width: 50vw;
padding-right: 3rem; /* Needed to replace the close icon in FF when you are selecting a date */
padding-top: 1.2rem; /* Needed to center the close icon in FF when you are selecting a date */
position: relative;
&::-webkit-calendar-picker-indicator {
cursor: pointer;
opacity: 0;
position: absolute;
right: 8px;
}
=======
.ss-list {
color: var(--color-select-list);
font-weight: normal;
@ -289,7 +201,6 @@ sib-form-date {
position: absolute;
right: 8px;
}
>>>>>>> 5701eea... update: css for form elements are outside the .with-form context
&::-webkit-clear-button {
cursor: pointer;

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

@ -326,15 +326,15 @@ h5 {
display: flex;
}
.button-end {
justify-content: flex-end;
}
.space-between {
justify-content: space-between;
padding-bottom: 1.4rem;
}
.position-end {
text-align: end;
}
.section {
border-bottom: 1px solid var(--color-grey-10);
padding: 4.5rem;

1
src/styles/index.scss
View File

@ -19,7 +19,6 @@ div#viewport {
@import 'layout/members/index';
@import 'layout/job-offers/index';
@import 'layout/project/index';
@import 'layout/circle/index';
@import 'layout/user/index';
@import 'layout/events/index';
@import 'layout/dashboard/index';

1
src/styles/layout/circle/_index.scss
View File

@ -1 +0,0 @@
@import 'circle-profile';

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

@ -1,7 +0,0 @@
#circle-information {
.box-button {
display: flex;
justify-content: flex-end;
}
}

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

@ -21,7 +21,17 @@ sib-router(default-route='circle-profile', hidden)
sib-link(class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='circle-edit' bind-resources) Modifier et ajouter un membre
div.box-button
h2 Membres :
sib-display.block(
bind-resources
fields='members'
multiple-members=''
widget-members='hubl-circle-team-template'
)
div.flex.button-end
sib-ac-checker(permission='acl:Delete', bind-resources)
sib-delete(
class='button text-bold text-uppercase button-primary bordered with-icon icon-trash'

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

@ -60,7 +60,7 @@ sib-router(default-route='project-profile', hidden)
)
sib-display(
class='position-end'
class='flex button-end'
bind-resources
nested-field='members'
fields='relation'