Merge remote-tracking branch 'redmatrix/master'

This commit is contained in:
Mario Vavti 2015-07-11 12:53:34 +02:00
commit ec2df365de
2 changed files with 14 additions and 10 deletions

View File

@ -17,6 +17,7 @@ main {
aside {
display: table-cell;
vertical-align: top;
padding: 80px 7px 0px 7px;
}
@ -24,4 +25,17 @@ section {
width: 100%;
display: table-cell;
vertical-align: top;
padding: 80px 7px 200px 7px;
}
@media screen and (max-width: 767px) {
section {
padding: 65px 7px 200px 7px;
}
aside#region_1 {
padding: 65px 7px 0px 7px;
}
}

View File

@ -28,17 +28,12 @@ aside#region_1 {
width: $aside_widthpx;
min-width: $aside_widthpx;
max-width: $aside_widthpx;
padding: 80px 7px 0px 7px;
}
main {
max-width: $main_widthpx;
}
section {
padding: 80px 7px 200px 7px;
}
h1, .h1, h2, .h2 {
font-size: 1.667em;
}
@ -2125,14 +2120,9 @@ nav .badge.mail-update:hover {
@media screen and (max-width: 767px) {
section {
padding: 65px 7px 200px 7px;
}
aside#region_1 {
background: rgba(0, 0, 0, .1);
border-right: 1px solid $nav_bd;
padding: 65px 7px 0px 7px;
}
main {