diff --git a/conf/default.php b/conf/default.php index 2c6d95d..85d376c 100755 --- a/conf/default.php +++ b/conf/default.php @@ -5,6 +5,7 @@ */ $conf['logo'] = 'logo.png'; +$conf['logo_spacer'] = 'logo_spacer.png'; $conf['discussionPage'] = 'discussion:@ID@'; $conf['userPage'] = 'user:@USER@:'; diff --git a/conf/metadata.php b/conf/metadata.php index a5440b3..9c12bb7 100755 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -5,6 +5,7 @@ */ $meta['logo'] = array('string'); +$conf['logo_spacer'] = array('string'); $meta['discussionPage'] = array('string'); $meta['userPage'] = array('string'); diff --git a/css/area_nav-direct.less b/css/area_nav-direct.less index 3601dbf..21328ad 100644 --- a/css/area_nav-direct.less +++ b/css/area_nav-direct.less @@ -16,7 +16,6 @@ top: -1px; width: 100%; height: 1px; - z-index: 200; a:link, a:visited { diff --git a/css/area_sidebar-search.less b/css/area_sidebar-search.less new file mode 100644 index 0000000..650d3f3 --- /dev/null +++ b/css/area_sidebar-search.less @@ -0,0 +1,18 @@ +/** + * This file provides the design styles for the quick search. + * + * @author Jana Deutschlaender + */ + +.search.main-sidebar{ + form{ + white-space: nowrap; + .no{ + padding-right: 1.5rem; + #qsearch__in{ + width: 100%; + border: 1px solid green; + } + } + } +} diff --git a/css/base.less b/css/base.less index 947c4ca..1e1c05e 100755 --- a/css/base.less +++ b/css/base.less @@ -36,6 +36,9 @@ @break-min-xlg: 1440; @break-max-xlg: (@break-min-xlg - 1); +@break-min-xxlg: 1600; +@break-max-xxlg: (@break-min-xlg - 1); + /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* media queries for breakpoints */ @@ -59,6 +62,9 @@ @screen_min-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px)"; @screen_max-xlg: ~"only screen and (max-width: " ~"@{break-max-xlg}px)"; +@screen_min-xxlg: ~"only screen and (min-width: " ~"@{break-min-xxlg}px)"; +@screen_max-xxlg: ~"only screen and (max-width: " ~"@{break-max-xxlg}px)"; + /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* col width */ diff --git a/css/base_structure.less b/css/base_structure.less index d635a83..7a35c79 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -16,33 +16,33 @@ @media @screen_min-xxs { .container{ - border: 1px solid deeppink; + //border: 1px solid deeppink; } } @media @screen_min-xs { .container{ - border: 1px solid orangered; + //border: 1px solid orangered; } } @media @screen_min-sm { .container{ - border: 1px solid green; + //border: 1px solid green; } .make-grid(sm); } @media @screen_min-md { .container{ - border: 1px solid blue; + //border: 1px solid blue; } .make-grid(md); } @media @screen_min-lg { .container{ - border: 1px solid blue; + //border: 1px solid blue; } .make-grid(lg); } @@ -52,6 +52,96 @@ font-size: 130%; } .container{ - border: 1px solid red; + //border: 1px solid red; } } + +@media @screen_min-xxlg { + html{ + font-size: 145%; + } + .container{ + //border: 1px solid red; + } +} + + + +@media @screen_min-md { + + .nav-direct p{ + z-index: 1000; + } + .top-header{ + z-index: 900; + } + .tools .row > .col-xs-12{ + z-index: 1; + } + .header .row > .col-xs-12{ + z-index: 2; + } + .content .row > .col-xs-12{ + z-index: 3; + } + + .top-header{ + position: absolute; + top: 0; + left: 0; + width: 100%; + } + + .header .row > .col-xs-12{ + position: relative; + height: 150px; + min-height: 6rem; + box-sizing: content-box; + } + .tools{ + .row > .col-xs-12{ + position: absolute; + width: 23%; + } + .main-sidebar{ + //background: pink; + } + } + .content{ + .row > .col-xs-12{ + width: 73%; + position: relative; + float: right; + background-color: #fff; + } + } + .claim{ + width: 23%; + box-sizing: content-box; + padding-right: (@margin-big / 2); + + .logo{ + position: absolute; + bottom: 0; + height: 1px; + overflow: visible; + width: 23%; + } + .logo img{ + max-width: 100%; + height: auto; + } + } + + .main-sidebar{ + &.search{ + > img{ + width: 100%; + height: auto; + } + } + } + + +} + diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less index c358554..bad7025 100644 --- a/css/plugins/magic-matcher.less +++ b/css/plugins/magic-matcher.less @@ -10,6 +10,9 @@ #dokuwiki_magic-matcher{ + position: fixed; + top:0; left: 0; + width: 100%; #magicmatcher__context{ box-sizing: border-box; background-color: __nav_direct_background__; diff --git a/main.php b/main.php index d864c3c..f731fc9 100755 --- a/main.php +++ b/main.php @@ -118,7 +118,7 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
-
+
- - '; + } else{ + echo ''; + } + } /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ diff --git a/style.ini b/style.ini index 553c27c..a7364aa 100755 --- a/style.ini +++ b/style.ini @@ -64,6 +64,7 @@ css/area_header.less = all css/area_footer.less = all css/area_nav-direct.less = all css/area_nav-usertools.less = all +css/area_sidebar-search.less = all ; _____________ plugin styles _____________ diff --git a/tpl/main-sidebar-logo.php b/tpl/main-sidebar-logo.php index 15625ef..b740aa4 100644 --- a/tpl/main-sidebar-logo.php +++ b/tpl/main-sidebar-logo.php @@ -8,4 +8,4 @@ } else{ tpl_link( wl(),''.$conf['title'].tpl_getLang('adjunct_linked_logo_text').'','accesskey="h" title="[H]"' ); } - echo "
"; + echo "
";