harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

assign right aside the same width as we have in left aside but hide it on small and xs screens. make aside width a variablee for easier handling.

Browse Source
This commit is contained in:
Mario Vavti
2015-06-10 13:08:17 +02:00
parent 20a317b5b7
commit 50ac9378e3
4 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
view/css/default.css
View File

@@ -14,10 +14,8 @@ main {
height: 100%; height: 100%;
} }
aside#region_1 { aside#region_1,
width: 231px; aside#region_3 {
min-width: 231px;
max-width: 231px;
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
padding: 65px 7px 0px 7px; padding: 65px 7px 0px 7px;

2
view/php/default.php
View File

@@ -14,7 +14,7 @@
<div id="page-footer"></div> <div id="page-footer"></div>
<div id="pause"></div> <div id="pause"></div>
</section> </section>
<aside id="region_3"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside> <aside id="region_3" class="hidden-sm hidden-xs"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
</main> </main>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</body> </body>

12
view/theme/redbasic/css/style.css
View File

@@ -24,8 +24,14 @@ body {
height: 100%; height: 100%;
} }
aside {
width: $aside_widthpx;
min-width: $aside_widthpx;
max-width: $aside_widthpx;
}
main { main {
max-width: $main_width; max-width: $main_widthpx;
} }
h1, .h1, h2, .h2 { h1, .h1, h2, .h2 {
@@ -2097,8 +2103,8 @@ nav .badge.mail-update:hover {
} }
main { main {
left: -231px; left: -$aside_widthpx;
width: calc( 100% + 231px ); width: calc( 100% + $aside_widthpx );
} }
main.region_1-on { main.region_1-on {

9
view/theme/redbasic/php/style.php
View File

@@ -153,11 +153,13 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
$x = file_get_contents('view/theme/redbasic/css/style.css'); $x = file_get_contents('view/theme/redbasic/css/style.css');
// left aside is 231px + converse width $aside_width = 231;
$main_width = (231 + intval($converse_width));
// left aside and right aside are is 231px + converse width
$main_width = (($aside_width * 2) + intval($converse_width));
// prevent main_width smaller than 768px // 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 ( $options = array (
'$nav_bg' => $nav_bg, '$nav_bg' => $nav_bg,
@@ -191,6 +193,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
'$pmenu_reply' => $pmenu_reply, '$pmenu_reply' => $pmenu_reply,
'$comment_indent' => $comment_indent, '$comment_indent' => $comment_indent,
'$main_width' => $main_width, '$main_width' => $main_width,
'$aside_width' => $aside_width
); );
echo str_replace(array_keys($options), array_values($options), $x); echo str_replace(array_keys($options), array_values($options), $x);