made sidebar inclusion more similar to core (hide it under more circumstances)

This commit is contained in:
Anika Henke 2013-03-31 20:00:52 +01:00
parent 9946700f9c
commit 76cda85575
3 changed files with 12 additions and 15 deletions

View file

@ -6,7 +6,7 @@
@media only screen and (max-width: 42em) {
.mode_show #dokuwiki__aside {
#dokuwiki__aside {
width: 100%;
float: none;
margin-bottom: 1.4em;
@ -15,15 +15,15 @@
margin: 0;
}
.mode_show #dokuwiki__content {
.hasSidebar #dokuwiki__content {
float: none;
margin-left: 0;
margin-right: 0;
}
.mode_show #dokuwiki__content > .pad {
.hasSidebar #dokuwiki__content > .pad {
margin-left: 0;
}
[dir=rtl] .mode_show #dokuwiki__content > .pad {
[dir=rtl] .hasSidebar #dokuwiki__content > .pad {
margin-right: 0;
}

View file

@ -50,17 +50,13 @@ body {
height: 1%;
}
/* show sidebar only in show mode */
#dokuwiki__aside {
display: none;
}
.mode_show #dokuwiki__aside {
width: __sidebar_width__;
float: left;
position: relative;
display: block;
}
[dir=rtl] .mode_show #dokuwiki__aside {
[dir=rtl] #dokuwiki__aside {
float: right;
}
#dokuwiki__aside > .pad {
@ -71,20 +67,20 @@ body {
}
/* make content wider when there's no sidebar */
.hasSidebar.mode_show #dokuwiki__content {
.hasSidebar #dokuwiki__content {
float: right;
margin-left: -__sidebar_width__;
width: 100%;
}
[dir=rtl] .hasSidebar.mode_show #dokuwiki__content {
[dir=rtl] .hasSidebar #dokuwiki__content {
float: left;
margin-left: 0;
margin-right: -__sidebar_width__;
}
.hasSidebar.mode_show #dokuwiki__content > .pad {
.hasSidebar #dokuwiki__content > .pad {
margin-left: __sidebar_width__;
}
[dir=rtl] .hasSidebar.mode_show #dokuwiki__content > .pad {
[dir=rtl] .hasSidebar #dokuwiki__content > .pad {
margin-left: 0;
margin-right: __sidebar_width__;
}