From 657c471df7d2732f72861b4389c91fa9fecc0ecd Mon Sep 17 00:00:00 2001
From: gaelle morin <gmorin.dev@gmail.com>
Date: Mon, 19 Apr 2021 16:18:24 +0200
Subject: [PATCH] patch: icons for project, circle and community harmonized
---
package-lock.json | 6 +++---
package.json | 2 +-
src/styles/content/_index.scss | 17 +++++------------
src/views/page-admin.pug | 20 ++++++++++----------
src/views/partials/header.pug | 2 +-
5 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 01b4a7dd..18ad18ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1615,9 +1615,9 @@
}
},
"@startinblox/hubl-styling-framework": {
- "version": "1.8.21",
- "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.8.21.tgz",
- "integrity": "sha512-4T0sqL7rqqe8uFmH4f8geigxZ4pIxI1ze3sycM762CQFtM5fXadAI9tl7wwAOQbY15y6xfZfDcPoK0YEjv0v9g=="
+ "version": "1.8.22",
+ "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.8.22.tgz",
+ "integrity": "sha512-00P0hIXjecgryh41Abq8ViVm18Aployr5TRbK/KDpNPAQqQ5x2to6z0of8oeeJeSm/srippfGdHLrJ7nyd1emg=="
},
"@types/q": {
"version": "1.5.4",
diff --git a/package.json b/package.json
index 5bd77755..bf92dd52 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
"clearDist": false
},
"dependencies": {
- "@startinblox/hubl-styling-framework": "^1.8.21",
+ "@startinblox/hubl-styling-framework": "^1.8.22",
"cross-env": "^7.0.3",
"fs-extra": "^9.0.1",
"normalize.css": "^8.0.1",
diff --git a/src/styles/content/_index.scss b/src/styles/content/_index.scss
index 782105b0..0bca0a62 100644
--- a/src/styles/content/_index.scss
+++ b/src/styles/content/_index.scss
@@ -22,8 +22,8 @@ main {
&.sidebar-is-closed {
@media(min-width: 768.01px) {
- margin-left: -152px;
- transform: translate(152px);
+ margin-left: -157px;
+ transform: translate(157px);
}
}
}
@@ -39,18 +39,11 @@ main {
width: 217px;
@media (max-width: 768px) {
- width: 65px;
+ width: 60px;
}
ul {
-
- li {
- border-bottom: 1px solid #D6CECE;
-
- &>a {
- vertical-align: super;
- }
- }
+
&>li:first-child>a {
vertical-align: middle;
}
@@ -98,7 +91,7 @@ main {
&.jsRightMenu:not([open]) {
@media (min-width: 768.01px) {
- transform: translate(152px);
+ transform: translate(157px);
}
}
diff --git a/src/views/page-admin.pug b/src/views/page-admin.pug
index 6e715bf0..2e337222 100644
--- a/src/views/page-admin.pug
+++ b/src/views/page-admin.pug
@@ -60,7 +60,7 @@
nav.jsRightMenu.segment.sm-hidden.text-disable-selection.sidebar.whitespace-normal(role='navigation')
.segment.whitespace-normal.text-color-heading.text-bold
ul
- li.segment.full.sm-hidden.padding-small.text-normal.jsOffsiteToggle
+ li.segment.full.sm-hidden.padding-small.text-normal.border-bottom.border-color-grey.jsOffsiteToggle
span.icon.icon-arrow-left.icon-xsmall.margin-left-xxsmall.text-left
span.segment.full.text-right(hidden)
span.icon.icon-arrow-right.icon-xsmall.margin-right-xxsmall
@@ -69,16 +69,16 @@
if component.route
if component.type == "circles"
solid-link.segment.full(next=`admin-${component.route}`)
- li.segment.full.padding-medium
- span.icon.ci-bubble-add.icon-xlarge.margin-right-medium
- a(data-trans='admin.menuRight.circles')
+ li.segment.full.padding-medium.border-bottom.border-color-grey
+ span.icon.icon-globe.icon-large.margin-right-medium
+ a.text-baseline(data-trans='admin.menuRight.circles')
if component.type == "projects"
solid-link.segment.full(next=`admin-${component.route}`)
- li.segment.full.padding-medium
- span.icon.ci-add.icon-xlarge.margin-right-medium
- a(data-trans='admin.menuRight.projects')
+ li.segment.full.padding-medium.border-bottom.border-color-grey
+ span.icon.icon-folder-alt.icon-large.margin-right-medium
+ a.text-baseline(data-trans='admin.menuRight.projects')
if component.type == "chat"
solid-link.segment.full(next=`admin-${component.route}`)
- li.segment.full.padding-medium
- span.icon.ci-networking.icon-xlarge.margin-right-medium
- a(data-trans='admin.menuRight.community')
+ li.segment.full.padding-medium.border-bottom.border-color-grey
+ span.icon.icon-grid.icon-large.margin-right-medium
+ a.text-baseline(data-trans='admin.menuRight.community')
diff --git a/src/views/partials/header.pug b/src/views/partials/header.pug
index 6a4f0c9d..a31802ff 100644
--- a/src/views/partials/header.pug
+++ b/src/views/partials/header.pug
@@ -48,7 +48,7 @@ div
if componentSet.has("communities") && getComponent("chat").route
solid-link.text-hover(next=`admin-${getRoute("chat", true)}`)
li.segment.padding-top-small
- a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
+ a.icon.icon-grid.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
if componentSet.has("circles") && getComponent("circles").route
solid-link.text-hover(next=`admin-${getRoute("circles", true)}`)
li.segment.padding-top-small
--
GitLab