diff options
author | Mario Vavti <mario@mariovavti.com> | 2015-07-11 12:53:34 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2015-07-11 12:53:34 +0200 |
commit | ec2df365de3ae141a49b51716bf63bb8b58360de (patch) | |
tree | 9ed6ec163e14600a4776cc3d350fced429d56474 | |
parent | f7da424b8b0f7a889a620c938973114bed1f76a6 (diff) | |
parent | d3581d85620d38ab02bdc4e25a20106527be8676 (diff) | |
download | volse-hubzilla-ec2df365de3ae141a49b51716bf63bb8b58360de.tar.gz volse-hubzilla-ec2df365de3ae141a49b51716bf63bb8b58360de.tar.bz2 volse-hubzilla-ec2df365de3ae141a49b51716bf63bb8b58360de.zip |
Merge remote-tracking branch 'redmatrix/master'
-rw-r--r-- | view/css/default.css | 14 | ||||
-rw-r--r-- | view/theme/redbasic/css/style.css | 10 |
2 files changed, 14 insertions, 10 deletions
diff --git a/view/css/default.css b/view/css/default.css index e1edc2cbf..f0c89a087 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -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; + } + } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a44cf331c..6d23a1996 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -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 { |