Private
Public Access
1
0

Merge branch 'release/v8.10'

This commit is contained in:
Sander Roosendaal
2018-10-20 20:50:05 +02:00
3 changed files with 21 additions and 83 deletions

View File

@@ -457,16 +457,18 @@
.wrapper { .wrapper {
display: grid; display: grid;
/* grid-gap: 2px; */ /* grid-gap: 2px; */
grid-template-areas: grid-template-areas:
"header" "header"
"user" "user"
"nav" "nav"
"content" "content"
"footer"; "footer";
} }
.main-content { .main-content {
display: grid;
grid-gap: 10px;
list-style: none; list-style: none;
margin: 0; margin: 0;
} }
@@ -495,10 +497,6 @@
} }
.maxheight {
max-height: 300px;
overflow: scroll;
}
.main-content li.grid_4 { .main-content li.grid_4 {
grid-column-end: span 1; grid-column-end: span 1;
@@ -517,36 +515,14 @@
**/ **/
@media (min-height: 600px) { @media (max-width: 400px) {
.maxheight { html {
max-height: 450px; min-width: 150%;
overflow: scroll; height: auto;
} }
} }
@media (min-height: 600px) { @media (max-width: 768px) {
.maxheight {
max-height: 450px;
overflow: scroll;
}
}
@media (min-height: 800px) {
.maxheight {
max-height: 600px;
overflow: scroll;
}
}
@media (min-height: 1000px) {
.maxheight {
max-height: 800px;
overflow: scroll;
}
}
@media (max-width: 600px) {
nav a { nav a {
font-size: 0px; font-size: 0px;
} }
@@ -554,51 +530,6 @@
nav a i { nav a i {
font-size: 20px; font-size: 20px;
} }
}
@media (min-width: 450px) {
.wrapper {
grid-template-columns: 1fr 3fr;
grid-template-areas:
"header header header"
"user user user"
"nav nav nav"
"content content content"
"footer footer footer";
}
nav ul {
display: flex;
justify-content: space-between;
}
header ul {
/* flex-direction: row;*/
display: flex;
justify-content: space-between;
}
.main-content {
display: grid;
grid-template-columns: repeat(5,1fr);
grid-gap: 10px;
}
.main-content li.grid_2 {
grid-column-end: span 2;
}
.main-content li.grid_3 {
grid-column-end: span 3;
}
.main-content li.grid_4 {
grid-column-end: span 4;
}
.main-content li.grid_5 {
grid-column-end: span 5;
}
} }

View File

@@ -45,14 +45,21 @@
} }
html { html {
font-size: 62.5%; font-size: 62.5%;
margin: 0px;
height: 100%;
width: 100%;
min-height: 100%;
} }
body { body {
/* background: #edc; */ /* background: #edc; */
color: #333; color: #333;
font-size: 1.2em; font-size: 1.2em;
height: auto; width: 100%;
min-height: 100%;
margin: 0px;
box-sizing: border-box;
/* padding-bottom: 20px; */ /* padding-bottom: 20px; */
} }

View File

@@ -133,7 +133,7 @@
-moz-background-size: cover; -moz-background-size: cover;
-o-background-size: cover; -o-background-size: cover;
background-size: cover; background-size: cover;
background-position: center; background-position: center center;
padding: 0; padding: 0;
margin: 0; margin: 0;
} }