From 6ba3ef525dbdd22d750aa9124e51947848d9c138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABlle=20Morin?= <morin.gaelle@gmail.com>
Date: Wed, 6 Nov 2019 21:28:25 +0100
Subject: [PATCH] fix bug on field alignment + buttons in admin ok
---
src/page-admin-circles.pug | 13 +++++--------
src/page-circle-profile.pug | 2 +-
src/styles/base/form.scss | 4 ++--
src/styles/base/main.scss | 3 ++-
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/page-admin-circles.pug b/src/page-admin-circles.pug
index 10459814..9bee55cf 100644
--- a/src/page-admin-circles.pug
+++ b/src/page-admin-circles.pug
@@ -16,6 +16,7 @@
data-src="${value['@id']}"
)
sib-delete(
+ class='button text-bold text-uppercase reversed button-dark bordered with-icon icon-close'
data-src="${value['@id']}"
data-label='Leave'
)
@@ -34,9 +35,6 @@
set-user-id-select="user"
)
-
-
-
sib-widget(name='team-template-edit')
template
sib-display(
@@ -50,17 +48,16 @@
)
-
-
-
-
div.content-box__info
div.admin-header
div.admin-header__title Circles
- sib-link(class='circle-add-button button yellow-button', next='admin-circle-create') Create a new circle
+ sib-link(
+ class='button text-bold text-uppercase reversed button-yellow bordered with-icon icon-plus'
+ next='admin-circle-create'
+ ) Create a new circle
div.table-header
div.cell Name
diff --git a/src/page-circle-profile.pug b/src/page-circle-profile.pug
index 64b13da1..e7cf7afc 100644
--- a/src/page-circle-profile.pug
+++ b/src/page-circle-profile.pug
@@ -16,7 +16,7 @@ sib-router(default-route='circle-profile')
widget-creationDate='sib-display-date'
)
sib-ac-checker.testblock.circle-edit-button(permission='acl:Write', bind-resources)
- sib-link.button.text-bold.text-uppercase.reversed.button-blue.bordered.with-icon.icon-pencil(next='circle-edit', bind-resources) Edit and add Members
+ sib-link(class='button text-bold text-uppercase reversed button-blue bordered with-icon icon-pencil' next='circle-edit' bind-resources) Edit and add Members
h2(name="label-team") Members:
diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss
index d9a3834d..4b324965 100644
--- a/src/styles/base/form.scss
+++ b/src/styles/base/form.scss
@@ -38,7 +38,7 @@
flex-direction: column;
}
- /*sib-set-default {
+ sib-set-default {
clear: both;
display: flex;
flex-wrap: wrap;
@@ -48,7 +48,7 @@
float: left;
width: 50%;
}
- }*/
+ }
label {
display: flex;
diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss
index 58304c3b..31960ba3 100644
--- a/src/styles/base/main.scss
+++ b/src/styles/base/main.scss
@@ -363,7 +363,8 @@ a,
}
&:hover {
- background-color: #FFCE51;
+ background-color: white;
+ color: #FFCE51;
&.bordered {
border: 1px solid hsl(43, 100%, 50%);
--
GitLab