move region_1 to off instead of removing it and dont squelch region_2 when region_1 moves in again

This commit is contained in:
marijus 2014-03-13 19:50:22 +01:00
parent 3f337dad2c
commit b32f8f0ba7
6 changed files with 25 additions and 9 deletions

View File

@ -261,6 +261,7 @@
.wall-item-body { .wall-item-body {
margin-top: 10px; margin-top: 10px;
word-wrap: break-word;
} }
.wall-item-body.divmore { .wall-item-body.divmore {

View File

@ -8,11 +8,13 @@ header #banner {
main { main {
display: table; display: table;
position: relative;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
aside#region_1 { aside#region_1 {
width: 210px;
min-width: 210px; min-width: 210px;
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
@ -25,7 +27,6 @@ aside input[type='text'] {
section { section {
width: 100%; width: 100%;
min-width: 298px;
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
padding: 65px 15px 200px 7px; padding: 65px 15px 200px 7px;

View File

@ -9,7 +9,7 @@
<header><?php if(x($page,'header')) echo $page['header']; ?></header> <header><?php if(x($page,'header')) echo $page['header']; ?></header>
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<main> <main>
<aside id="region_1" class="hidden-xs"><?php if(x($page,'aside')) echo $page['aside']; ?></aside> <aside id="region_1"><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?> <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div> <div id="page-footer"></div>
<div id="pause"></div> <div id="pause"></div>

View File

@ -244,7 +244,7 @@ header #banner #logo-text {
height: 28px; height: 28px;
border-bottom: 1px solid #aaaaaa; border-bottom: 1px solid #aaaaaa;
padding:0px; padding:0px;
width: 90%; width: 100%;
} }
.tabs li { margin: 0px; list-style: none; } .tabs li { margin: 0px; list-style: none; }
@ -262,8 +262,7 @@ ul.tabs {
margin-top: 0px; margin-top: 0px;
margin-bottom: 0px; margin-bottom: 0px;
list-style-type: none; list-style-type: none;
padding: 0px;
padding-right: 8px;
} }
/* footer */ /* footer */
@ -2309,9 +2308,24 @@ blockquote {
padding: 7px 10px; padding: 7px 10px;
} }
@media (max-width:767px) { @media screen and (max-width: 767px) {
aside#region_1 { aside#region_1 {
background: rgba(0, 0, 0, .1); background: rgba(0, 0, 0, .1);
border-right: 1px solid $nav_bd; border-right: 1px solid $nav_bd;
} }
main {
-webkit-transition: all 0.25s ease-out;
-moz-transition: all 0.25s ease-out;
transition: all 0.25s ease-out;
}
main {
left: -227px;
width: calc( 100% + 227px );
}
main.region_1-on {
left: 0px;
}
} }

View File

@ -22,9 +22,9 @@ function cmtBbClose(comment, id) {
$(document).ready(function() { $(document).ready(function() {
$('[data-toggle=show_hide]').click(function() { $('[data-toggle=offcanvas]').click(function() {
$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left'); $('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
$('#region_1').toggleClass('hidden-xs'); $('main').toggleClass('region_1-on');
}); });
$('.group-edit-icon').hover( $('.group-edit-icon').hover(

View File

@ -5,7 +5,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<button id="expand-aside" type="button" class="navbar-toggle" data-toggle="show_hide" data-target="#region_1"> <button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1">
<i class="icon-circle-arrow-right" id="expand-aside-icon"></i> <i class="icon-circle-arrow-right" id="expand-aside-icon"></i>
</button> </button>
{{if $userinfo}} {{if $userinfo}}