From 5d69d1a4eed11eed000181f03ccf7b90fdbc382a Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 18 May 2020 15:07:25 +0200 Subject: [PATCH] update: .position-end and box-button are in the same class --- client.sample.happy-dev.css | 8 +- src/styles/base/form.scss | 89 -------------------- src/styles/base/main.scss | 8 +- src/styles/index.scss | 1 - src/styles/layout/circle/_index.scss | 1 - src/styles/layout/circle/circle-profile.scss | 7 -- src/views/circle/page-circle-profile.pug | 12 ++- src/views/project/page-project-profile.pug | 2 +- 8 files changed, 20 insertions(+), 108 deletions(-) delete mode 100644 src/styles/layout/circle/_index.scss delete mode 100644 src/styles/layout/circle/circle-profile.scss diff --git a/client.sample.happy-dev.css b/client.sample.happy-dev.css index 725be22..2b883aa 100644 --- a/client.sample.happy-dev.css +++ b/client.sample.happy-dev.css @@ -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); } diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss index 7986e7b..18a10f9 100644 --- a/src/styles/base/form.scss +++ b/src/styles/base/form.scss @@ -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; diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 1e64559..89ea6c0 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -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; diff --git a/src/styles/index.scss b/src/styles/index.scss index 5132044..ad49bed 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -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'; diff --git a/src/styles/layout/circle/_index.scss b/src/styles/layout/circle/_index.scss deleted file mode 100644 index c8ec1a2..0000000 --- a/src/styles/layout/circle/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'circle-profile'; diff --git a/src/styles/layout/circle/circle-profile.scss b/src/styles/layout/circle/circle-profile.scss deleted file mode 100644 index 3ab2ec6..0000000 --- a/src/styles/layout/circle/circle-profile.scss +++ /dev/null @@ -1,7 +0,0 @@ -#circle-information { - - .box-button { - display: flex; - justify-content: flex-end; - } -} diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug index d17bc9b..bdeb1c5 100644 --- a/src/views/circle/page-circle-profile.pug +++ b/src/views/circle/page-circle-profile.pug @@ -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' diff --git a/src/views/project/page-project-profile.pug b/src/views/project/page-project-profile.pug index c6fc36a..edc558c 100644 --- a/src/views/project/page-project-profile.pug +++ b/src/views/project/page-project-profile.pug @@ -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'