From 50acb9f5e1342bb765bda67f67034ae1d1e7f4fd Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 19 Jun 2020 18:36:47 +0200 Subject: [PATCH 1/5] fix: avatar bug + display of admin name --- src/styles/base/table.scss | 8 ++++++++ src/views/admin/page-admin-projects.pug | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index 6ecc645..b4db062 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -228,3 +228,11 @@ margin-left: -50px; } } + +/* Fix only for admin-projects > administrator display */ + +#admin-project-list>div>div.table-wrapper>div>solid-display:nth-child(6)>div>solid-display>div>hubl-project-admins>solid-display>div, +#admin-project-list>div>div.table-wrapper>div>solid-display:nth-child(6)>div>solid-display>div>hubl-project-admins>solid-display>div>solid-display, +#admin-project-list>div>div.table-wrapper>div>solid-display:nth-child(6)>div>solid-display>div>hubl-project-admins>solid-display>div>solid-display>div { + display: contents; +} diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index 4aece07..49b7a34 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -47,7 +47,7 @@ data-src='${await value}' fields='account.picture, sup(name), sub(username)' - class-account.picture='user-thumb__picture' + class-account.picture='avatar user-thumb__picture' class-name='user-thumb__name' class-username='user-thumb__username' @@ -81,7 +81,7 @@ fields='project.name, project.members, project.captain, leaveButton' class-project.name='w280 cell border cell-with-name' - class-project.members='w280 cell border' + class-project.members='w280 cell border cell-with-id-card' class-project.captain='w280 cell border cell-with-id-card' class-leaveButton='w230 cell border cell-with-buttons' @@ -117,7 +117,7 @@ fields='name, members, captain, joinButton' class-name='w280 cell border cell-with-name' - class-members='w280 cell border' + class-members='w280 cell border cell-with-id-card' class-captain='w280 cell border cell-with-id-card' class-joinButton='w230 cell border cell-with-buttons' From 084e16d3b548290af4368872d68edd2e539afdbd Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 22 Jun 2020 10:58:01 +0200 Subject: [PATCH 2/5] fix: display of admin name: additional classes removed --- src/styles/base/table.scss | 8 -------- src/views/admin/page-admin-projects.pug | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index b4db062..6ecc645 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -228,11 +228,3 @@ margin-left: -50px; } } - -/* Fix only for admin-projects > administrator display */ - -#admin-project-list>div>div.table-wrapper>div>solid-display:nth-child(6)>div>solid-display>div>hubl-project-admins>solid-display>div, -#admin-project-list>div>div.table-wrapper>div>solid-display:nth-child(6)>div>solid-display>div>hubl-project-admins>solid-display>div>solid-display, -#admin-project-list>div>div.table-wrapper>div>solid-display:nth-child(6)>div>solid-display>div>hubl-project-admins>solid-display>div>solid-display>div { - display: contents; -} diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index 49b7a34..a5b066d 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -56,7 +56,7 @@ solid-widget(name='hubl-project-admins') template - solid-display.user-thumb.is-spaced( + solid-display( data-src='${value}' fields='user' search-fields='is_admin' From 5ef462ca6b9798f1184b081e4f551b8a721ef424 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 23 Jun 2020 18:18:35 +0200 Subject: [PATCH 3/5] feature: dashboard - HD colors added --- client.sample.happy-dev.css | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/client.sample.happy-dev.css b/client.sample.happy-dev.css index 18eb3c0..b60f865 100644 --- a/client.sample.happy-dev.css +++ b/client.sample.happy-dev.css @@ -244,3 +244,22 @@ button#solid-picture-remove.button.button-primary:hover { #members-list .send-display solid-link::before { background-color: var(--color-directory-complementary)!important; } + +/* Dashboard */ +.dashboard-card>div>div>p { + color: var(--color-complementary) !important; +} + +.dashboard-card i { + border-color: var(--color-primary) !important; + color: var(--color-complementary) !important; +} + +.dashboard-card sib-link { + border-color: var(--color-complementary) !important; + color: var(--color-complementary) !important; +} + +.dashboard-card sib-link:hover { + background-color: var(--color-complementary) !important; +} From 287b809f1971dafdfaa327ae33bba0fb7d59db5b Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 23 Jun 2020 18:48:10 +0200 Subject: [PATCH 4/5] feature: dashboard - HD colors for svg added --- client.sample.happy-dev.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client.sample.happy-dev.css b/client.sample.happy-dev.css index b60f865..c3be74b 100644 --- a/client.sample.happy-dev.css +++ b/client.sample.happy-dev.css @@ -250,6 +250,10 @@ button#solid-picture-remove.button.button-primary:hover { color: var(--color-complementary) !important; } +.dashboard-card .svg-color-secondary { + fill: var(--color-complementary) !important; +} + .dashboard-card i { border-color: var(--color-primary) !important; color: var(--color-complementary) !important; From aa3f21e04e0ea3e43a3414678be470280a2f4007 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 23 Jun 2020 17:11:19 +0000 Subject: [PATCH 5/5] fix: sample using solid- instead of sib- --- client.sample.happy-dev.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client.sample.happy-dev.css b/client.sample.happy-dev.css index c3be74b..f75cb0a 100644 --- a/client.sample.happy-dev.css +++ b/client.sample.happy-dev.css @@ -259,11 +259,12 @@ button#solid-picture-remove.button.button-primary:hover { color: var(--color-complementary) !important; } -.dashboard-card sib-link { +.dashboard-card sib-link, .dashboard-card solid-link { border-color: var(--color-complementary) !important; color: var(--color-complementary) !important; } -.dashboard-card sib-link:hover { +.dashboard-card sib-link:hover, .dashboard-card solid-link:hover { background-color: var(--color-complementary) !important; + color: #fff !important; }