Merge branch '169-project-name-on-2-lines' into 'staging'

Left navbar: modifications according to the mockup update

See merge request startinblox/applications/sib-app!91
This commit is contained in:
Jean-Baptiste Pasquier 2019-12-12 13:31:37 +00:00
commit c7291e5c6f
2 changed files with 48 additions and 22 deletions

View File

@ -20,12 +20,11 @@ $breakpoints: (phone: 480px,
background-color: $color-210-25-95; background-color: $color-210-25-95;
color: $color-213-4-50; color: $color-213-4-50;
font-size: 1.6rem; font-size: 1.6rem;
overflow: hidden; overflow-y: scroll;
overflow-wrap: break-word; }
display: flex;
flex-direction: column; html {
height: 100vh; overflow-y: scroll;
overflow: hidden;
} }
main { main {

View File

@ -2,8 +2,8 @@
background-color: $color-233-18-29; background-color: $color-233-18-29;
color: $color-0-0-100; color: $color-0-0-100;
display: block; display: block;
overflow: auto; height: calc(100vh - 82px);
flex: 0 0 16em; max-width: 250px;
transition: flex-basis 0.5s ease-in-out; transition: flex-basis 0.5s ease-in-out;
&.open { &.open {
@ -90,6 +90,43 @@
} }
.sub-menu { .sub-menu {
sib-set-default[name='project'] {
padding: 1rem 1rem 1rem 3.2rem;
.project-customer,
.project-name {
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.project-customer {
font-weight: bold;
width: 150px;
}
.project-name {
padding-left: 14px;
width: calc(150px - 10px);
/* 10px = padding of the sib-set-default = better alignment */
}
&:hover {
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;
z-index: 1000;
.project-customer,
.project-name {
width: auto;
}
}
}
sib-display>div { sib-display>div {
@ -107,21 +144,11 @@
>div { >div {
color: $color-244-10-70; color: $color-244-10-70;
cursor: pointer; cursor: pointer;
padding: 10px 10px 10px 32px; padding: 1rem 1rem 1rem 3.2rem;
} }
sib-route[name='project'] {
display: flex;
flex: 3;
sib-display-value { &[fields="project(customer.name, name), badge"]>div {
display: block; padding: 0;
height: 20px;
}
sib-display-value[name='dash'] {
margin: 0 0.4em;
}
} }
} }