From 105b8bea547e52a3359ab18bf26c06a377e3395a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABlle=20Morin?= Date: Mon, 13 Apr 2020 17:02:51 +0000 Subject: [PATCH] update: fix user admin icon --- src/fonts/custom-icons.svg | 2 +- src/images/add-user.svg | 136 ++++++++++++++++++ src/page-admin.pug | 2 +- src/styles/base/table.scss | 24 +--- src/styles/components/icons/custom-icons.scss | 2 +- src/styles/components/sidebar.scss | 32 +++-- src/views/admin/page-admin-circles-create.pug | 3 - 7 files changed, 168 insertions(+), 33 deletions(-) create mode 100644 src/images/add-user.svg diff --git a/src/fonts/custom-icons.svg b/src/fonts/custom-icons.svg index e24b0c4..0d1e0e9 100644 --- a/src/fonts/custom-icons.svg +++ b/src/fonts/custom-icons.svg @@ -38,7 +38,7 @@ - + diff --git a/src/images/add-user.svg b/src/images/add-user.svg new file mode 100644 index 0000000..5186eb9 --- /dev/null +++ b/src/images/add-user.svg @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/page-admin.pug b/src/page-admin.pug index 0dea326..6043e25 100644 --- a/src/page-admin.pug +++ b/src/page-admin.pug @@ -14,7 +14,7 @@ nav.jsRightMenu(role='navigation') li.jsOffsiteToggle a Fold menu if (endpoints.users || (endpoints.get && endpoints.get.users)) - sib-route(name='admin-users') + sib-route.active-color(name='admin-users') li a Users if endpoints.circles || (endpoints.get && endpoints.get.circles) diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index dc4931d..1d2cb80 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -88,18 +88,18 @@ } } - .cell-with-groups { - align-items: center; - display: flex; - justify-content: center; - } - .cell-with-name { color: $color-233-18-29; font-weight: 600; padding-top: 2.5rem; } + sib-multiple { + display: flex; + align-items: center; + justify-content: center; + } + .user-thumb>div /* for the table in circle-edit and captain's cell in project-admin */, [name='user-thumb'] { @extend %user-thumb__grid; @@ -134,18 +134,6 @@ } } - .cell-with-groups { - align-items: center; - display: flex; - justify-content: center; - - >div { - display: flex; - justify-content: space-evenly; - width: 100%; - } - } - sib-ac-checker { align-items: center; display: flex; diff --git a/src/styles/components/icons/custom-icons.scss b/src/styles/components/icons/custom-icons.scss index 2848ce4..b8c030c 100644 --- a/src/styles/components/icons/custom-icons.scss +++ b/src/styles/components/icons/custom-icons.scss @@ -51,7 +51,7 @@ $ci-icons: ( hat: '\e91c', beer1: '\e91d', alien: '\e91e', - drawing: '\e91f', + add-user: '\e91f', feedback: '\e920', globe: '\e921', bubble-add: '\e922' diff --git a/src/styles/components/sidebar.scss b/src/styles/components/sidebar.scss index 49bdc9c..d7933be 100644 --- a/src/styles/components/sidebar.scss +++ b/src/styles/components/sidebar.scss @@ -53,7 +53,7 @@ padding: 2.15rem 2.55rem; position: relative; /*width: 12em;*/ - + &::before { float: left; font-size: 4rem; @@ -68,12 +68,6 @@ >sib-route { - &[active] { - background-color: $color-233-18-29; - color: $color-46-100-67; - display: inline-block; - } - &[name*='circle'], &[name*='project'] { @@ -109,8 +103,16 @@ @include ci('file'); } - &[name='admin-users']>li { - @include ci('drawing'); + &[name='admin-users']>li::before { + background-color: $color-233-18-29; + content: ''; + display: inline-block; + height: 40px; + mask: url('/images/add-user.svg') 1% 1% / 1px 1px no-repeat; + mask-size: cover; + -webkit-mask: url('/images/add-user.svg') 1% 1% / 1px 1px no-repeat; + -webkit-mask-size: cover; + width: 40px; } &[name='admin-circles']>li { @@ -120,6 +122,18 @@ &[name='admin-projects']>li { @include ci('add'); } + + &[active] { + background-color: $color-233-18-29; + color: $color-46-100-67; + display: inline-block; + } + + &.active-color[active] { + >li::before { + background-color: #ffd857; + } + } } } } diff --git a/src/views/admin/page-admin-circles-create.pug b/src/views/admin/page-admin-circles-create.pug index f45bf6d..607bb7d 100644 --- a/src/views/admin/page-admin-circles-create.pug +++ b/src/views/admin/page-admin-circles-create.pug @@ -8,9 +8,6 @@ div.content-box__info fields='name, description' - label-name='Name *' - label-description='Description *' - class-name='form-label is-light is-full-width' class-description='form-label is-light is-full-width'