fix previous

This commit is contained in:
Benoit Alessandroni 2020-10-12 19:38:01 +02:00
parent 3861289d21
commit 7ecc311893
1 changed files with 155 additions and 163 deletions

View File

@ -22,9 +22,7 @@
}
}
/* Fix for solid-dashboard fixture */
solid-dashboard section {
padding: 1rem !important;
@ -39,11 +37,15 @@ solid-dashboard section {
.wrapper {
display: grid;
grid-template-areas: "header""content";
grid-template-areas:
"header"
"content";
@include breakpoint(lg) {
grid-template-columns: 265px auto;
grid-template-areas : "header header""leftmenu content";
grid-template-areas:
"header header"
"leftmenu content";
}
}
@ -55,12 +57,11 @@ solid-dashboard section {
grid-area: leftmenu;
@include breakpoint(lg) {
height : calc(100vh - 83px);
/* 83px = nav height */
height: calc(100vh - 83px); /* 83px = nav height */
position: sticky;
top: 0;
overflow-x: hidden;
overflow-y: auto;
overflow-y: scroll;
}
&.jsLeftMenu {
@ -100,20 +101,16 @@ solid-dashboard section {
}
/* Add scrollbar to the left and right menu, and to the content */
nav,
.views-container,
.table-wrapper {
/* Add scrollbar to the left and right menu, and to the content */
nav, .views-container, .table-wrapper {
overflow: auto;
height: auto;
-webkit-overflow-scrolling: touch;
-ms-overflow-style: none;
}
/* Custom scrollbar of the left-menu */
nav {
scrollbar-width: thin;
scrollbar-color: var(--color-scrollbar-left-track) var(--color-scrollbar-left-background);
@ -133,9 +130,7 @@ nav {
}
}
/* Custom scrollbar of the content */
.views-container {
scrollbar-width: thin;
scrollbar-color: var(--color-scrollbar-right-track) var(--color-scrollbar-right-background);
@ -155,9 +150,7 @@ nav {
}
}
/* Custom scrollbar of the table */
.table-wrapper {
scrollbar-width: thin;
scrollbar-color: var(--color-scrollbar-table-track) var(--color-scrollbar-table-background);
@ -177,9 +170,7 @@ nav {
}
}
/* Quick fix. Will be removed later */
#admin-circles,
#admin-projects,
#admin-users {
@ -205,6 +196,7 @@ h4,
h5,
h6 {
font-weight: bold;
/*span {
font-weight: 400;
padding-left: 0.85rem;
@ -215,8 +207,7 @@ h6 {
}*/
}
h1,
.h1-like {
h1, .h1-like {
color: var(--color-h1);
font-size: 2rem;
text-transform: uppercase;
@ -226,8 +217,7 @@ h1,
}
}
h2,
.h2-like {
h2, .h2-like {
color: var(--color-h2);
font-size: 1.8rem;
text-transform: uppercase;
@ -409,9 +399,7 @@ h5 {
}
}
/* Header inside circle, project view */
.content-box__header {
border-bottom: 1px solid var(--color-content-header);
padding: 1.8rem 0 1.4rem;
@ -447,9 +435,8 @@ h5 {
/* For solid-display on project, circle, or private message view */
solid-display {
width: calc(100% - 94px);
width: calc(100% - 94px); /* 94px = width of .mobile-sidebar-button */
/* 94px = width of .mobile-sidebar-button */
div {
overflow: hidden;
text-overflow: ellipsis;
@ -469,6 +456,7 @@ h5 {
.description {
color: var(--color-grey-4);
}
.name {
@ -480,9 +468,8 @@ h5 {
}
.content-box__height {
min-height: calc(100vh - 50px - 56px);
min-height: calc(100vh - 50px - 56px); /* Heights of main header and sub-header */
/* Heights of main header and sub-header */
@include breakpoint(lg) {
min-height: calc(100vh - 83px - 84px);
}
@ -501,7 +488,6 @@ h5 {
}
}
/*.modal {
color: var(--color-white);
margin: 75px;
@ -530,8 +516,8 @@ h5 {
flex-direction: column;
align-items: flex-start;
margin-bottom: 20px;
/*end */
@include breakpoint(lg) {
flex-direction: row;
align-items: center;
@ -542,8 +528,8 @@ h5 {
h3 {
/* Quick fix for alignment on mobile before admin content rework */
margin-bottom: 20px;
/* end */
@include breakpoint(lg) {
margin-top: 0;
}
@ -718,6 +704,12 @@ a,
border-radius: 50%;
font-size: 1.8rem;
padding: 1rem;
height: 42px;
width: 42px;
display: flex;
align-items: center;
justify-content: center;
margin: 0 auto;
}
&.button-link {