mobile + js: min-height for content > sidebar hight

This commit is contained in:
Jana Deutschländer 2017-01-11 17:51:42 +01:00
commit d0530116c5
9 changed files with 91 additions and 13 deletions

View file

@ -24,13 +24,6 @@
border-bottom: 1px solid @color-border-light; border-bottom: 1px solid @color-border-light;
} }
#meta-box {
display: inline-block;
min-height: 1.95rem;
max-width: 40%;
float: right;
}
#plugin__highlightparent { #plugin__highlightparent {
display: block; display: block;
} }

View file

@ -50,11 +50,26 @@
} }
} }
bdi {
bdi {
padding: .1em .1em 0; padding: .1em .1em 0;
} }
} }
@media @screen_max-md {
min-height: 2.6rem;
padding-right: .3rem;
padding-left: 0;
p{
display: none;
}
}
/* + + + + + icon list + + + + + */ /* + + + + + icon list + + + + + */
.page-attributes { .page-attributes {

View file

@ -1,4 +1,11 @@
#meta-box { #meta-box {
display: inline-block;
min-height: 1.95rem;
max-width: 40%;
float: right;
.tab-container { .tab-container {
display: table; display: table;
} }
@ -196,5 +203,26 @@
clear: right; clear: right;
margin-top: 20px; margin-top: 20px;
} }
@media @screen_max-md{
max-width: 100%;
float: none;
display: block;
top: -1.1rem;
position: relative;
right: -3.07rem;
.tab-container{
display: block;
}
ul.meta-tabs{
float: right;
> li > a{
margin-left: 0;
}
}
.meta-content{
clear: both;
}
}
} }

View file

@ -199,8 +199,11 @@ nav#dokuwiki__pagetools{
} }
} }
} }
}
/* overwrite do:backlink */
.mode_backlink #dokuwiki__pagetools ul li a.backlink{
background-position: 95% center;
} }

View file

@ -7,6 +7,10 @@
.togglelink { .togglelink {
&.page_main-content { &.page_main-content {
@media @screen_max-md{
display: none;
}
position: absolute; position: absolute;
top: -1px; top: -1px;
bottom: -1px; bottom: -1px;
@ -41,6 +45,9 @@
text-decoration: none; text-decoration: none;
} }
} }
@media @screen_max-md{
display: none;
}
} }

View file

@ -191,7 +191,7 @@
@media @screen_max-md { @media @screen_max-md {
.container { .container {
margin: 0 @margin-big 0 1.25rem; margin: 0 (@margin-big/2);
} }
#dokuwiki__usertools { #dokuwiki__usertools {
@ -199,17 +199,27 @@
max-width: 75%; max-width: 75%;
position: absolute; position: absolute;
top: 0; top: 0;
right: @margin-big/2;
} }
.content { .content {
position: relative; position: relative;
margin-top: 1rem;
#dokuwiki__pagetools { #dokuwiki__pagetools {
top: 0; top: @margin-big * 2;
.tools{
position: static;
}
} }
.row > .col-xs-12 #dokuwiki__content::before { .row > .col-xs-12 #dokuwiki__content {
display: none;
padding-right: @margin-big;
&::before {
display: none;
}
} }
} }

View file

@ -0,0 +1,6 @@
@media @screen_max-md{
#plugin__highlightparent{
clear: both;
margin-top: 1rem;
}
}

View file

@ -3,6 +3,20 @@
var addToggleLink = function($elem){ var addToggleLink = function($elem){
$elem.wrapInner('<a href="#toggleMenu" class="toggler"></a>'); $elem.wrapInner('<a href="#toggleMenu" class="toggler"></a>');
}, },
setContentMinHeight = function(){
var $sidebar = $('.page-wrapper').find('> .tools').find('.col-xs-12');
if($sidebar.length == 1){
var h = $sidebar.height(),
num = parseFloat(h);
if(!isNaN(num)){
$('#dokuwiki__content').css('minHeight',num + 100);
}
}
},
setWideContent = function(){ setWideContent = function(){
$('body').addClass('wide-content'); $('body').addClass('wide-content');
}, },
@ -122,6 +136,7 @@
mainMenu(); mainMenu();
sideMenu(); sideMenu();
toggleMainContent(); toggleMainContent();
setContentMinHeight();
}); });
} )( jQuery, spc ); } )( jQuery, spc );

View file

@ -87,6 +87,7 @@ css/plugins/do_tasks.less = all
css/plugins/qc.less = all css/plugins/qc.less = all
css/plugins/struct.less = all css/plugins/struct.less = all
css/plugins/bureaucracy.less = all css/plugins/bureaucracy.less = all
css/plugins/highlight_parent.less = all
; _____________ print styles _____________ ; _____________ print styles _____________