diff --git a/src/page-admin-circles.pug b/src/page-admin-circles.pug index 58891d0..20a5396 100644 --- a/src/page-admin-circles.pug +++ b/src/page-admin-circles.pug @@ -3,7 +3,7 @@ sib-route(name='admin-circle-list') sib-route(name='admin-circle-create') - div.content-box__header.with-edit + div.content-box__header.with-description div p.name Administration diff --git a/src/page-circle.pug b/src/page-circle.pug index d5989c6..0c23098 100644 --- a/src/page-circle.pug +++ b/src/page-circle.pug @@ -1,6 +1,6 @@ .views-container .content-box.full-width.with-form - div.content-box__header.with-edit + div.content-box__header.with-description sib-ac-checker(permission='acl:Read', bind-resources) sib-display( bind-resources diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss index 4b32496..2cc38ac 100644 --- a/src/styles/base/form.scss +++ b/src/styles/base/form.scss @@ -140,15 +140,6 @@ .bordered; margin-top: auto; margin-bottom: auto; - - - /*background-color: transparent; - border: 1px solid $color-244-73-62; - color: $color-244-73-62; - align-self: flex-end; - margin-bottom: 0.6rem; - margin-left: 4.2rem; - margin-top: 0;*/ } } diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 31960ba..605d1c4 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -135,7 +135,7 @@ h5 { border: 0; } -.content-box__header.with-edit { +.content-box__header.with-description { border-bottom: 1px solid $color-221-51-90; div { @@ -156,29 +156,20 @@ h5 { margin-left: 0.60rem; } } - - .edit { - color: $color-213-4-50; - font-size: 1.6rem; - margin-left: auto; - } } } .backlink { + @include icon('arrow-left-circle'); + color: $color-233-18-29; font-size: 1.5rem; margin: 2rem 0 0 2rem; - @include icon('arrow-left-circle'); - color: #3d4057; text-decoration: underline; - &::before { - text-decoration: none; - } - &::before { font-size: 2rem; margin-right: 1rem; + text-decoration: none; } } @@ -221,10 +212,10 @@ button, input[type='submit'], a, .button { - display: inline-block; - cursor: pointer; background: none; border: none; + cursor: pointer; + display: inline-block; padding: 0; &.button { @@ -285,10 +276,6 @@ a, &.with-icon::before { font-size: 1.6rem; margin-right: 1rem; - - &.icon-plus { - @include icon('plus'); - } } &.button-yellow { @@ -296,15 +283,15 @@ a, *, & { - color: hsl(43, 100%, 50%); + color: $color-43-100-50; } &.bordered { - border: 1px solid hsl(43, 100%, 50%); + border: 1px solid $color-43-100-50; } &:hover { - background-color: #FFCE51; + background-color: $color-43-100-50; *, & { @@ -318,15 +305,15 @@ a, *, & { - color: hsl(244, 73%, 62%); + color: $color-244-73-62; } &.bordered { - border: 1px solid hsl(244, 73%, 62%); + border: 1px solid $color-244-73-62; } &:hover { - background-color: hsl(244, 73%, 62%); + background-color: $color-244-73-62; *, & { @@ -336,15 +323,15 @@ a, } &.button-dark { - color: hsl(233, 18%, 29%); + color: $color-233-18-29; background-color: white; &.bordered { - border: 1px solid hsl(233, 18%, 29%); + border: 1px solid $color-233-18-29; } &:hover { - background-color: hsl(233, 18%, 29%); + background-color: $color-233-18-29; color: white; } } @@ -355,7 +342,7 @@ a, &.reversed { &.button-yellow { - background-color: hsl(43, 100%, 50%); + background-color: $color-43-100-50; *, & { @@ -364,16 +351,16 @@ a, &:hover { background-color: white; - color: #FFCE51; + color: $color-43-100-50; &.bordered { - border: 1px solid hsl(43, 100%, 50%); + border: 1px solid $color-43-100-50; } } } &.button-blue { - background-color: hsl(244, 73%, 62%); + background-color: $color-244-73-62; *, & { @@ -385,17 +372,17 @@ a, *, & { - color: hsl(244, 73%, 62%); + color: $color-244-73-62; } &.bordered { - border: 1px solid hsl(244, 73%, 62%); + border: 1px solid $color-244-73-62; } } } &.button-dark { - background-color: hsl(233, 18%, 29%); + background-color: $color-233-18-29; *, & { @@ -407,29 +394,14 @@ a, *, & { - color: hsl(233, 18%, 29%); + color: $color-233-18-29; } &.bordered { - border: 1px solid hsl(233, 18%, 29%); + border: 1px solid $color-233-18-29; } } } } } } - -.circle-edit-form>form { - - input[type='submit'] { - @extend - .button, - .text-bold, - .text-uppercase, - .reversed, - .button-dark, - .bordered; - margin-left: auto; - margin-top: 3.2rem; - } -} \ No newline at end of file diff --git a/src/styles/layout/circle/circle-edit.scss b/src/styles/layout/circle/circle-edit.scss index 92dd726..e91fccb 100644 --- a/src/styles/layout/circle/circle-edit.scss +++ b/src/styles/layout/circle/circle-edit.scss @@ -1,5 +1,19 @@ #circle-edit { + .circle-edit-form>form { + + input[type='submit'] { + @extend .button, + .text-bold, + .text-uppercase, + .reversed, + .button-dark, + .bordered; + margin-left: auto; + margin-top: 3.2rem; + } + } + .table-header { background: $color-228-25-79; color: white;