From d0530116c5d28d532ea5ae3ba6701f1d1a1b8697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschl=C3=A4nder?= Date: Wed, 11 Jan 2017 17:51:42 +0100 Subject: [PATCH] mobile + js: min-height for content > sidebar hight --- css/area_content.less | 7 ------- css/area_nav-breadcrumb.less | 17 ++++++++++++++++- css/area_nav-metabox.less | 28 ++++++++++++++++++++++++++++ css/area_nav-pagetools.less | 5 ++++- css/area_togglelink.less | 7 +++++++ css/base_structure.less | 18 ++++++++++++++---- css/plugins/hightlight_parent.less | 6 ++++++ js/sidebar-menu.js | 15 +++++++++++++++ style.ini | 1 + 9 files changed, 91 insertions(+), 13 deletions(-) create mode 100644 css/plugins/hightlight_parent.less diff --git a/css/area_content.less b/css/area_content.less index d00d057..d6b8fe7 100755 --- a/css/area_content.less +++ b/css/area_content.less @@ -24,13 +24,6 @@ border-bottom: 1px solid @color-border-light; } - #meta-box { - display: inline-block; - min-height: 1.95rem; - max-width: 40%; - float: right; - } - #plugin__highlightparent { display: block; } diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less index 36bef0c..60a2b40 100755 --- a/css/area_nav-breadcrumb.less +++ b/css/area_nav-breadcrumb.less @@ -50,11 +50,26 @@ } } - bdi { + + bdi { padding: .1em .1em 0; } + + } + @media @screen_max-md { + min-height: 2.6rem; + padding-right: .3rem; + padding-left: 0; + + p{ + display: none; + } + + } + + /* + + + + + icon list + + + + + */ .page-attributes { diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less index 103961d..54336c7 100755 --- a/css/area_nav-metabox.less +++ b/css/area_nav-metabox.less @@ -1,4 +1,11 @@ #meta-box { + + display: inline-block; + min-height: 1.95rem; + max-width: 40%; + float: right; + + .tab-container { display: table; } @@ -196,5 +203,26 @@ clear: right; 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; + } + } } diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less index 659fd4e..10f147a 100755 --- a/css/area_nav-pagetools.less +++ b/css/area_nav-pagetools.less @@ -199,8 +199,11 @@ nav#dokuwiki__pagetools{ } } } +} - +/* overwrite do:backlink */ +.mode_backlink #dokuwiki__pagetools ul li a.backlink{ + background-position: 95% center; } diff --git a/css/area_togglelink.less b/css/area_togglelink.less index 6257b4e..ae36f9c 100644 --- a/css/area_togglelink.less +++ b/css/area_togglelink.less @@ -7,6 +7,10 @@ .togglelink { &.page_main-content { + + @media @screen_max-md{ + display: none; + } position: absolute; top: -1px; bottom: -1px; @@ -41,6 +45,9 @@ text-decoration: none; } } + @media @screen_max-md{ + display: none; + } } diff --git a/css/base_structure.less b/css/base_structure.less index 8ef1b17..fe17d2f 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -191,7 +191,7 @@ @media @screen_max-md { .container { - margin: 0 @margin-big 0 1.25rem; + margin: 0 (@margin-big/2); } #dokuwiki__usertools { @@ -199,17 +199,27 @@ max-width: 75%; position: absolute; top: 0; + right: @margin-big/2; } .content { position: relative; + margin-top: 1rem; #dokuwiki__pagetools { - top: 0; + top: @margin-big * 2; + .tools{ + position: static; + } } - .row > .col-xs-12 #dokuwiki__content::before { - display: none; + .row > .col-xs-12 #dokuwiki__content { + + padding-right: @margin-big; + &::before { + display: none; + } + } } diff --git a/css/plugins/hightlight_parent.less b/css/plugins/hightlight_parent.less new file mode 100644 index 0000000..2a3d44c --- /dev/null +++ b/css/plugins/hightlight_parent.less @@ -0,0 +1,6 @@ +@media @screen_max-md{ + #plugin__highlightparent{ + clear: both; + margin-top: 1rem; + } +} diff --git a/js/sidebar-menu.js b/js/sidebar-menu.js index 7d9329a..fc427c4 100755 --- a/js/sidebar-menu.js +++ b/js/sidebar-menu.js @@ -3,6 +3,20 @@ var addToggleLink = function($elem){ $elem.wrapInner(''); }, + + 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(){ $('body').addClass('wide-content'); }, @@ -122,6 +136,7 @@ mainMenu(); sideMenu(); toggleMainContent(); + setContentMinHeight(); }); } )( jQuery, spc ); diff --git a/style.ini b/style.ini index 415cfaf..08b0c69 100755 --- a/style.ini +++ b/style.ini @@ -87,6 +87,7 @@ css/plugins/do_tasks.less = all css/plugins/qc.less = all css/plugins/struct.less = all css/plugins/bureaucracy.less = all +css/plugins/highlight_parent.less = all ; _____________ print styles _____________