diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-10 15:47:23 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-10 15:47:23 -0700 |
| commit | 2128d5a2560383e0d3587087a7dd0aab217bc262 (patch) | |
| tree | c2aa27a08a9e96ecf291d10db46e4fcf0e3806c9 /view/theme | |
| parent | eb6a1f838724504f0034d51a28567ea9a8119b54 (diff) | |
| parent | 52ddbd1adda88690a19aafc35e455b01d059852f (diff) | |
| download | volse-hubzilla-2128d5a2560383e0d3587087a7dd0aab217bc262.tar.gz volse-hubzilla-2128d5a2560383e0d3587087a7dd0aab217bc262.tar.bz2 volse-hubzilla-2128d5a2560383e0d3587087a7dd0aab217bc262.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 12 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 9 |
2 files changed, 15 insertions, 6 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a671a6671..1c575a63e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -24,8 +24,14 @@ body { height: 100%; } +aside { + width: $aside_widthpx; + min-width: $aside_widthpx; + max-width: $aside_widthpx; +} + main { - max-width: $main_width; + max-width: $main_widthpx; } h1, .h1, h2, .h2 { @@ -2097,8 +2103,8 @@ nav .badge.mail-update:hover { } main { - left: -231px; - width: calc( 100% + 231px ); + left: -$aside_widthpx; + width: calc( 100% + $aside_widthpx ); } main.region_1-on { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index c6231e690..5a28fc4e3 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -153,11 +153,13 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); - // left aside is 231px + converse width - $main_width = (231 + intval($converse_width)); + $aside_width = 231; + + // left aside and right aside are is 231px + converse width + $main_width = (($aside_width * 2) + intval($converse_width)); // prevent main_width smaller than 768px - $main_width = (($main_width < 768) ? 768 : $main_width) . 'px'; + $main_width = (($main_width < 768) ? 768 : $main_width); $options = array ( '$nav_bg' => $nav_bg, @@ -191,6 +193,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) { '$pmenu_reply' => $pmenu_reply, '$comment_indent' => $comment_indent, '$main_width' => $main_width, + '$aside_width' => $aside_width ); echo str_replace(array_keys($options), array_values($options), $x); |