diff --git a/src/styles/hubl-framework/_index.scss b/src/styles/hubl-framework/_index.scss index ce59c71..2193a70 100644 --- a/src/styles/hubl-framework/_index.scss +++ b/src/styles/hubl-framework/_index.scss @@ -7,12 +7,12 @@ display: block; } @import 'commons/_index'; +@import 'icons/_index'; @import 'avatars/_index'; @import 'badges/_index'; @import 'buttons/_index'; @import 'links/_index'; -@import 'forms/_index'; -@import 'icons/_index'; @import 'segments/_index'; +@import 'forms/_index'; @import 'tables/_index'; @import 'tags/_index'; diff --git a/src/styles/hubl-framework/buttons/_index.scss b/src/styles/hubl-framework/buttons/_index.scss index 524cfaf..e071852 100644 --- a/src/styles/hubl-framework/buttons/_index.scss +++ b/src/styles/hubl-framework/buttons/_index.scss @@ -30,6 +30,24 @@ a { font-size: 15px; margin-right: 6px; } + &-semibold { + *, + & { + font-weight: 600; + } + } + &-bold { + *, + & { + font-weight: 700; + } + } + &-uppercase { + *, + & { + text-transform: uppercase; + } + } &.color-primary { background-color: white; *, diff --git a/src/styles/hubl-framework/commons/texts.scss b/src/styles/hubl-framework/commons/texts.scss index cebd3ee..1b2e856 100644 --- a/src/styles/hubl-framework/commons/texts.scss +++ b/src/styles/hubl-framework/commons/texts.scss @@ -19,28 +19,16 @@ font-size: 18px; } &-normal { - *, - & { - font-weight: 400; - } + font-weight: 400; } &-semibold { - *, - & { - font-weight: 600; - } + font-weight: 600; } &-bold { - *, - & { - font-weight: 700; - } + font-weight: 700; } &-uppercase { - *, - & { - text-transform: uppercase; - } + text-transform: uppercase; } &-underline { text-decoration: underline; diff --git a/src/styles/hubl-framework/forms/_index.scss b/src/styles/hubl-framework/forms/_index.scss index 201ef8f..f3563f6 100644 --- a/src/styles/hubl-framework/forms/_index.scss +++ b/src/styles/hubl-framework/forms/_index.scss @@ -4,6 +4,10 @@ solid-form { display: none !important; // Hide the default core message, english only with a weird message } + form>* { + display: block; + } + @import 'inputs'; @import 'buttons'; @import 'widgets'; diff --git a/src/styles/hubl-framework/forms/buttons.scss b/src/styles/hubl-framework/forms/buttons.scss index 211818e..3db3e53 100644 --- a/src/styles/hubl-framework/forms/buttons.scss +++ b/src/styles/hubl-framework/forms/buttons.scss @@ -1,10 +1,11 @@ -.button-register>form>input[type='submit'] { - /*@extend .button, - .text-bolder, +input[type='submit'] { + @extend .button, + .text-xsmall, + .text-bold, .text-uppercase, .reversed, - .button-secondary, - .bordered;*/ + .color-secondary, + .bordered; height: auto; position: fixed; bottom: 1em; @@ -13,8 +14,7 @@ width: 80%; z-index: 1; - /*@include breakpoint(lg) { - height: 3rem; + @media($large) { position: unset; bottom: unset; white-space: unset; @@ -23,5 +23,5 @@ z-index: unset; float: right; margin-top: 10px; - }*/ + } } diff --git a/src/styles/hubl-framework/forms/inputs.scss b/src/styles/hubl-framework/forms/inputs.scss index 8ea5a07..338ff76 100644 --- a/src/styles/hubl-framework/forms/inputs.scss +++ b/src/styles/hubl-framework/forms/inputs.scss @@ -24,8 +24,3 @@ textarea { height: 110px; resize: vertical; } - -input.icon { - background-position: right 12px top 50%; - background-repeat: no-repeat; -} diff --git a/src/styles/hubl-framework/icons/styles.scss b/src/styles/hubl-framework/icons/styles.scss index fa1352c..bbd7c60 100644 --- a/src/styles/hubl-framework/icons/styles.scss +++ b/src/styles/hubl-framework/icons/styles.scss @@ -1,6 +1,12 @@ .icon { - &.icon-magnify { + input, + .ss-single-selected { + background-position: right 12px top 50%; + background-repeat: no-repeat; + } + &.icon-magnify input, + &.icon-magnify .ss-single-selected { background-image: url("/lib/solid-directory/dist/assets/magnify.svg"); } &.icon-arrow-down { diff --git a/src/styles/hubl-framework/links/_index.scss b/src/styles/hubl-framework/links/_index.scss index 2994213..b1bc7e6 100644 --- a/src/styles/hubl-framework/links/_index.scss +++ b/src/styles/hubl-framework/links/_index.scss @@ -5,7 +5,9 @@ solid-route { .backlink { color: #636363; + font-size: 13px; text-decoration: underline; + @include icon('arrow-left-circle'); &::before { display: inline-block; diff --git a/src/views/admin/page-admin-circles-create.pug b/src/views/admin/page-admin-circles-create.pug index 12b1d45..f56915f 100644 --- a/src/views/admin/page-admin-circles-create.pug +++ b/src/views/admin/page-admin-circles-create.pug @@ -1,4 +1,4 @@ -div.segment.padding-xlarge.border-bottom.clearfix +div.segment.padding-top-xsmall.padding-right-large.padding-bottom-xsmall.padding-left-large.border-bottom.border-color-grey.text-color-heading.clearfix div.segment.lg-half.float-left h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.create.title') div.segment.lg-half.float-left.text-right @@ -11,7 +11,7 @@ div.segment.padding-xlarge.clearfix div div - solid-form.form.button-register( + solid-form.button-register( data-src=`${endpoints.circles || endpoints.post.circles}` fields='status, name, description' @@ -20,9 +20,9 @@ div.segment.padding-xlarge.clearfix required-description loader-id='loader-circles-create' - class-status='block segment lg-half margin-bottom padding-left-large box-border text-small text-bold text-uppercase text-color-heading' - class-name='segment lg-half float-left margin-bottom padding-left-large box-border text-small text-bold text-uppercase text-color-heading' - class-description='segment lg-half float-left margin-bottom padding-left-large box-border text-small text-bold text-uppercase text-color-heading' + class-status='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading icon icon-magnify' + class-name='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading float-left' + class-description='segment margin-bottom-medium lg-half padding-left-small text-small text-semibold text-uppercase text-color-heading float-left' label-status='' label-name=''