From 7d82f951250ed506d75a161db9e6a1aa986d3dbe Mon Sep 17 00:00:00 2001
From: gaelle morin <gmorin.dev@gmail.com>
Date: Mon, 28 Sep 2020 14:47:37 +0200
Subject: [PATCH] feature: beta label added
---
src/header.pug | 9 ++++---
src/styles/base/header.scss | 40 +++++++++++++++++++++++++-----
src/styles/components/sidebar.scss | 4 +++
3 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/src/header.pug b/src/header.pug
index 3de936b4..552f26f3 100644
--- a/src/header.pug
+++ b/src/header.pug
@@ -1,6 +1,9 @@
-.logo
- solid-link(next='dashboard')
- img(src=`${clientLogo || '/images/logo.png'}` style=`max-height:${clientLogoHeight || '32px'}`)
+.header-left
+ .logo
+ solid-link(next='dashboard')
+ img(src=`${clientLogo || '/images/logo.png'}` style=`max-height:${clientLogoHeight || '32px'}`)
+
+ span.beta-tag Beta
solid-notifications.notLoggedIn(
nested-field="inbox"
diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss
index 7966a19a..1f7f663a 100644
--- a/src/styles/base/header.scss
+++ b/src/styles/base/header.scss
@@ -26,6 +26,34 @@
}
}
+ .header-left {
+ flex-grow: 1;
+ position: relative;
+
+ .logo {
+ display: inline-block;
+ }
+
+ .beta-tag {
+ display: none;
+
+ @include breakpoint(lg) {
+ display: inline-block;
+ font-size: 1.4rem;
+ font-weight: 600;
+ line-height: 19px;
+ letter-spacing: 0.19px;
+ padding: 3px 13px 3px 15px;
+ border-radius: 3px;
+ background: var(--color-primary);
+ color: var(--color-complementary);
+ position: absolute;
+ top: -9px;
+ left: 267px;
+ }
+ }
+ }
+
>*:not(:first-child) {
margin-left: 2rem;
@@ -34,15 +62,15 @@
}
}
- .logo {
- flex: 1 0 0;
- align-items: stretch;
- }
-
- /* To remove the place taken by this element */
+ /* Fix: to remove the place taken by these elements */
solid-widget[name='hubl-user-avatar'] {
display: contents;
}
+
+ solid-notifications-template[data-rdf-type='hd:circle'],
+ solid-notifications-template[data-rdf-type='foaf:user'] {
+ position: absolute;
+ }
}
/* General styling for both notification and user's panel */
diff --git a/src/styles/components/sidebar.scss b/src/styles/components/sidebar.scss
index 9454ebe2..012f7ce2 100644
--- a/src/styles/components/sidebar.scss
+++ b/src/styles/components/sidebar.scss
@@ -8,6 +8,10 @@
&.with-padding {
padding: 1.3rem;
+
+ @include breakpoint(lg) {
+ padding: 2.5rem;
+ }
}
}
--
GitLab