From 4d40e538a2d73b57dd608c53996453d201320d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABlle=20Morin?= <morin.gaelle@gmail.com>
Date: Fri, 29 Nov 2019 14:28:23 +0100
Subject: [PATCH] modifications according to the changes in the wireframe
---
src/menu-left.pug | 48 ++++++++++++++--------------
src/styles/abstracts/_variables.scss | 2 ++
src/styles/base/main.scss | 2 +-
src/styles/base/menu-left.scss | 14 ++++----
4 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/menu-left.pug b/src/menu-left.pug
index c79856b1..f65ce4b0 100644
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -19,30 +19,30 @@ nav#main__menu
//- sib-route(name='job-offer-create', hidden)
//- sib-route(name='job-offer-edit', use-id, hidden)
div.divider
- div.menu-wrapper
- div.menu
- div.menu-chevron
- div.menu-icon.icon-arrow-up
- div.menu-label Projects
- div.menu-icon.icon-folder-alt
- sib-route(name='project', rdf-type='hd:project', use-id='', hidden)
- div.sub-menu.menu-notification
- sib-display(
- data-src=`${endpoints.projects}`
- fields='project(customer.name, name), badge'
- class-customer.name='project-customer'
- class-name='project-name'
- empty-widget='hd-create'
- empty-value='project'
- search-fields='team'
- search-widget-team='sib-form-hidden'
- search-value-team='-'
- hd-inherit-user-id='search-value-team'
- hd-inherit-widgets
- widget-badge='hd-counter'
- action-badge='badge'
- )
- div.divider
+ //- div.menu-wrapper
+ //- div.menu
+ //- div.menu-chevron
+ //- div.menu-icon.icon-arrow-up
+ //- div.menu-label Projects
+ //- div.menu-icon.icon-folder-alt
+ //- sib-route(name='project', rdf-type='hd:project', use-id='', hidden)
+ //- div.sub-menu.menu-notification
+ //- sib-display(
+ //- data-src=`${endpoints.projects}`
+ //- fields='project(customer.name, name), badge'
+ //- class-customer.name='project-customer'
+ //- class-name='project-name'
+ //- empty-widget='hd-create'
+ //- empty-value='project'
+ //- search-fields='team'
+ //- search-widget-team='sib-form-hidden'
+ //- search-value-team='-'
+ //- hd-inherit-user-id='search-value-team'
+ //- hd-inherit-widgets
+ //- widget-badge='hd-counter'
+ //- action-badge='badge'
+ //- )
+ //- div.divider
div.menu-wrapper
div.menu
div.menu-chevron
diff --git a/src/styles/abstracts/_variables.scss b/src/styles/abstracts/_variables.scss
index 53cbb474..bfb5c002 100644
--- a/src/styles/abstracts/_variables.scss
+++ b/src/styles/abstracts/_variables.scss
@@ -4,6 +4,7 @@ $color-45-95-54: hsl(45, 95%, 54%);
$color-46-100-67: hsl(46, 100%, 67%);
$color-46-100-50: hsl(46, 100%, 50%);
$color-0-0-100: hsl(0, 0%, 100%);
+$color-218-100-98: hsl(218, 100%, 98%);
$color-210-17-91: hsl(210, 17%, 91%);
$color-222-52-90: hsl(222, 52%, 90%);
$color-210-25-95: hsl(210, 25%, 95%);
@@ -22,5 +23,6 @@ $color-213-4-50: hsl(213, 4%, 50%);
$color-213-13-86: hsla(213, 13%, 86%, 0.2);
$color-0-0-29: hsl(0, 0%, 29%);
$color-233-18-29: hsl(233, 18%, 29%);
+$color-233-20-17: hsl(233, 20%, 17%);
$color-216-4-22: hsl(216, 4%, 22%);
$color-244-73-62: hsl(244, 73%, 62%);
diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss
index 45a44a75..7b459aba 100644
--- a/src/styles/base/main.scss
+++ b/src/styles/base/main.scss
@@ -101,7 +101,7 @@ h5 {
flex: 1;
font-size: 1.6rem;
margin: 0 auto;
- min-height: calc(100vh - 84px);
+ min-height: 100%;
}
&.with-padding {
diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss
index ae44b04e..a3b7ac94 100644
--- a/src/styles/base/menu-left.scss
+++ b/src/styles/base/menu-left.scss
@@ -2,7 +2,7 @@
background-color: $color-233-18-29;
color: $color-0-0-100;
display: block;
- height: calc(100vh - 82px);
+ height: auto;
max-width: 250px;
transition: flex-basis 0.5s ease-in-out;
@@ -92,7 +92,7 @@
.sub-menu {
sib-set-default[name='project'] {
- padding: 10px;
+ padding: 1rem 1rem 1rem 3.2rem;
.project-customer,
.project-name {
@@ -113,11 +113,9 @@
}
&:hover {
- background-color: #a2a8bb;
- border-radius: 2px;
- box-shadow: 0 2px 4px rgba(0, 0, 0, 0.5);
- color: #3D4057;
- padding: 10px;
+ background-color: $color-233-20-17;
+ box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.26);
+ color: $color-218-100-98;
/* transition: all 0.6s cubic-bezier(0.39, 0.575, 0.565, 1); Need better animation */
width: auto;
@@ -148,7 +146,7 @@
}
&[fields="project(customer.name, name), badge"]>div {
- padding: 0 0 0 22px;
+ padding: 0;
}
}
--
GitLab