diff --git a/src/page-admin-circles.pug b/src/page-admin-circles.pug index 44d087d..9f53e1f 100644 --- a/src/page-admin-circles.pug +++ b/src/page-admin-circles.pug @@ -90,6 +90,7 @@ class-name='w33 cell border' class-owner='w33 cell border' + class-buttons='w33 cell border' widget-buttons="admin-circle-buttons" action-buttons="buttons" diff --git a/src/page-admin-projects.pug b/src/page-admin-projects.pug index 72fed84..ce7acb7 100644 --- a/src/page-admin-projects.pug +++ b/src/page-admin-projects.pug @@ -27,7 +27,7 @@ sib-widget(name="admin-project-leave-button") template sib-delete( - class='button btn-margin-left text-bold text-uppercase reversed button-dark bordered with-icon icon-close' + class='button text-bold text-uppercase reversed button-dark bordered with-icon icon-close' data-src="${src}" data-label='Leave' ) @@ -73,6 +73,11 @@ data-src=`${endpoints.projects}` fields='name, members, captain, buttons' + class-name='w25 cell border' + class-members='w25 cell border' + class-captain='w25 cell border' + class-buttons='w25 cell border' + widget-buttons="admin-project-buttons" action-buttons="buttons" hd-inherit-widgets diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index a46ef28..a6a3811 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -34,7 +34,8 @@ $breakpoints: (phone: 480px, /* Quick fix. Will be removed later */ -#admin-circles { +#admin-circles, +#admin-projects { display: contents; } diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss index b4be43c..9848525 100644 --- a/src/styles/base/menu-left.scss +++ b/src/styles/base/menu-left.scss @@ -189,7 +189,6 @@ flex: 3; } hd-counter { - background: burlywood; height: 20px; width: 20px; margin-right: 1em; diff --git a/src/styles/components/sidebar.scss b/src/styles/components/sidebar.scss index e5e0592..1e93db5 100644 --- a/src/styles/components/sidebar.scss +++ b/src/styles/components/sidebar.scss @@ -72,7 +72,7 @@ } &[name*='circle'], - &[name^='project'] { + &[name*='project'] { >li::before { font-size: 4rem; @@ -102,6 +102,10 @@ &[name='admin-circles']>li { @include ci('bubble-add'); } + + &[name='admin-projects']>li { + @include ci('add'); + } } } } diff --git a/src/styles/layout/circle/circle.scss b/src/styles/layout/circle/circle.scss index 98164ee..209b6d6 100644 --- a/src/styles/layout/circle/circle.scss +++ b/src/styles/layout/circle/circle.scss @@ -2,6 +2,7 @@ #circle-edit, #admin-circle-list, #admin-circle-create, +#admin-project-list, #admin-project-create { .content-box__info { @@ -60,6 +61,10 @@ word-wrap: break-word; } + .w25 { + width: 25%; + } + .w33 { width: 33.3333%; } @@ -69,9 +74,7 @@ } [name="buttons"] { - @extend .border; - @extend .cell; - @extend .w33; + } } @@ -81,8 +84,10 @@ padding-top: 2.5rem; } - [name='members']>sib-display>div, - [name='owner']>sib-display>div { + team-template-edit>sib-display>div, + [name='owner']>sib-display>div, + project-captain[name='user']>sib-display>div, + [name='captain']>sib-display>div { display: grid; grid-column-gap: 1.6rem; grid-template-columns: 7vh auto; @@ -159,7 +164,7 @@ } } - admin-circle-buttons[name='buttons'] { + [name='buttons'] { align-items: center; display: flex; justify-content: center;