autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'staging' into project-admin

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier 2019-12-10 16:04:55 +01:00
commit 13b24a2ee2
No known key found for this signature in database
GPG Key ID: F2702E6D22ED4D62
2 changed files with 23 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/styles/base/main.scss
View File

@ -20,11 +20,12 @@ $breakpoints: (phone: 480px,
background-color: $color-210-25-95;
color: $color-213-4-50;
font-size: 1.6rem;
overflow-y: scroll;
}
html {
overflow-y: scroll;
overflow: hidden;
overflow-wrap: break-word;
display: flex;
flex-direction: column;
height: 100vh;
overflow: hidden;
}
main {
@ -101,7 +102,7 @@ h5 {
flex: 1;
font-size: 1.6rem;
margin: 0 auto;
min-height: 100%;
min-height: calc(100vh - 84px);
}
&.with-padding {

54
src/styles/base/menu-left.scss
View File

@ -2,8 +2,8 @@
background-color: $color-233-18-29;
color: $color-0-0-100;
display: block;
height: auto;
max-width: 250px;
overflow: auto;
flex: 0 0 16em;
transition: flex-basis 0.5s ease-in-out;
&.open {
@ -91,41 +91,6 @@
.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;
.project-customer,
.project-name {
width: auto;
}
}
}
sib-display>div {
.create {
@ -145,8 +110,18 @@
padding: 10px 10px 10px 32px;
}
&[fields="project(customer.name, name), badge"]>div {
padding: 0;
sib-route[name='project'] {
display: flex;
flex: 3;
sib-display-value {
display: block;
height: 20px;
}
sib-display-value[name='dash'] {
margin: 0 0.4em;
}
}
}
@ -190,4 +165,3 @@
}
}
}