From 3f840a3005d043cedc87a8376f3d111d45fedace Mon Sep 17 00:00:00 2001
From: gaelle morin <gmorin.dev@gmail.com>
Date: Tue, 22 Sep 2020 16:10:22 +0200
Subject: [PATCH] update: padding for admin-circles and -projects + send and
edit icons rounded
---
src/dependencies.pug | 2 +-
src/styles/base/main.scss | 10 ++++++++++
src/styles/base/table.scss | 5 ++++-
src/views/admin/page-admin-circles.pug | 6 +++---
src/views/admin/page-admin-projects.pug | 6 +++---
5 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/dependencies.pug b/src/dependencies.pug
index 78c64e71..7ceee9a9 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -31,7 +31,7 @@ if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
//- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer)
if endpoints.users || (endpoints.get && endpoints.get.users)
- script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.8" defer)
+ //- script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.8" defer)
//- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)
script(src="/scripts/index.js" defer)
diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss
index 950b85a4..6a74e9b1 100644
--- a/src/styles/base/main.scss
+++ b/src/styles/base/main.scss
@@ -568,6 +568,10 @@ h5 {
text-align: center;
}
+.block {
+ display: block;
+}
+
.flex {
display: flex;
}
@@ -700,6 +704,12 @@ a,
border-radius: 50%;
font-size: 1.8rem;
padding: 1rem;
+ height: 42px;
+ width: 42px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin: 0 auto;
}
&.button-link {
diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss
index 9616f777..0272915e 100644
--- a/src/styles/base/table.scss
+++ b/src/styles/base/table.scss
@@ -153,6 +153,10 @@
.desktop-btn-margin__left;
}
}
+
+ &.is-spaced {
+ padding: 0.8rem 2.2rem;
+ }
}
.cell-with-name {
@@ -164,7 +168,6 @@
/* Styles of elements inside cells */
-.user-thumb,
[name='user-thumb'] {
vertical-align: middle;
text-align: left;
diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug
index b545c7b0..a75f4323 100644
--- a/src/views/admin/page-admin-circles.pug
+++ b/src/views/admin/page-admin-circles.pug
@@ -15,7 +15,7 @@
solid-widget(name='hubl-circle-owner')
template
- solid-display.user-thumb.is-spaced(
+ solid-display.user-thumb.block.is-spaced(
data-src='${await value}'
fields='account.picture, sup(name), sub(username)'
@@ -70,7 +70,7 @@
class-circle.name='w280 border cell-with-name'
class-circle.owner='w280 border cell-with-id-card'
- class-leaveButton='w280 border cell-with-buttons'
+ class-leaveButton='w280 border cell-with-buttons is-spaced'
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-circle-leave-button"
@@ -108,7 +108,7 @@
class-owner='w280 border cell-with-id-card'
widget-owner='hubl-circle-owner'
- class-members='w280 border cell-with-buttons'
+ class-members='w280 border cell-with-buttons is-spaced'
widget-members="hubl-admin-circle-join-button"
order-by="name"
diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug
index c0268b65..d984c274 100644
--- a/src/views/admin/page-admin-projects.pug
+++ b/src/views/admin/page-admin-projects.pug
@@ -46,7 +46,7 @@
solid-widget(name='hubl-project-captain')
template
- solid-display.user-thumb.is-spaced(
+ solid-display.user-thumb.block.is-spaced(
data-src='${await value}'
fields='account.picture, sup(name), sub(username)'
@@ -87,7 +87,7 @@
class-project.name='w280 cell border cell-with-name'
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'
+ class-leaveButton='w230 cell border cell-with-buttons is-spaced'
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-project-leave-button"
@@ -127,7 +127,7 @@
class-name='w280 cell border cell-with-name'
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'
+ class-joinButton='w230 cell border cell-with-buttons is-spaced'
action-joinButton="joinButton" # Workaround: I need members two times
widget-joinButton="hubl-admin-project-join-button"
--
GitLab