diff options
| -rw-r--r-- | doc/toc.html | 32 | ||||
| -rw-r--r-- | view/css/default.css | 2 | ||||
| -rw-r--r-- | view/css/mod_help.css | 29 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 11 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 23 | ||||
| -rw-r--r-- | view/tpl/help.tpl | 18 |
6 files changed, 67 insertions, 48 deletions
diff --git a/doc/toc.html b/doc/toc.html index 19223abda..272f43c7e 100644 --- a/doc/toc.html +++ b/doc/toc.html @@ -1,35 +1,3 @@ -<style> - .doco-list-group-item > a { - font-weight: bold; - } - - .sub-menu { - margin: 3px 0px 10px 10px; - } - - #doco-content h3 { - border-bottom: #ccc 3px solid; - padding-bottom: 0.3em; - } - - #doco-content h4 { - text-decoration: underline; - } - - #doco-content h5 { - text-decoration: underline; - } - - #region_1 .widget ul ul { - list-style-type: none; - } - - .toc-content li, - #doco-top-toc li { - padding: 3px 0px; - } -</style> - <div class="" id="accordion"> <div class="panel"> <div class=""> diff --git a/view/css/default.css b/view/css/default.css index db0628cb3..67a411d6e 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -15,12 +15,14 @@ main { } aside { + position: relative; display: table-cell; vertical-align: top; padding: 71px 7px 0px 7px; } section { + position: relative; width: 100%; display: table-cell; vertical-align: top; diff --git a/view/css/mod_help.css b/view/css/mod_help.css new file mode 100644 index 000000000..f59a40894 --- /dev/null +++ b/view/css/mod_help.css @@ -0,0 +1,29 @@ +.doco-list-group-item > a { + font-weight: bold; +} + +.sub-menu { + margin: 3px 0px 10px 10px; +} + +#doco-content h3 { + border-bottom: #ccc 3px solid; + padding-bottom: 0.3em; +} + +#doco-content h4 { + text-decoration: underline; +} + +#doco-content h5 { + text-decoration: underline; +} + +#region_1 .widget ul ul { + list-style-type: none; +} + +.toc-content li, + #doco-top-toc li { + padding: 3px 0px; +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8c7f43324..7254be552 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -23,7 +23,6 @@ body { margin: 0px; height: 100%; overflow-x: hidden; - } aside { @@ -46,6 +45,16 @@ main { max-width: $main_widthpx; } +#overlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + cursor: pointer; + z-index: 1029; +} + h1, .h1 { font-size: 2em; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 4a18db8ff..e31458b4e 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -14,12 +14,13 @@ $(document).ready(function() { } }); } - $('#css3-calc').remove(); // Remove the test element - $('#left_aside_wrapper').stick_in_parent({ - offset_top: $('nav').outerHeight(true) - }); + if($(window).width() > 767) { + $('#left_aside_wrapper').stick_in_parent({ + offset_top: $('nav').outerHeight(true) + }); + } $('#expand-aside').on('click', toggleAside); @@ -92,7 +93,17 @@ function makeFullScreen(full) { } function toggleAside() { - $(window).scroll(); $('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left'); - $('main').toggleClass('region_1-on'); + if($('main').hasClass('region_1-on')){ + $('main').removeClass('region_1-on') + $('#overlay').remove(); + $('#left_aside_wrapper').trigger("sticky_kit:detach"); + } + else { + $('main').addClass('region_1-on') + $('<div id="overlay"></div>').appendTo('section'); + $('#left_aside_wrapper').stick_in_parent({ + offset_top: $('nav').outerHeight(true) + }); + } } diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl index 494869683..10e0a4957 100644 --- a/view/tpl/help.tpl +++ b/view/tpl/help.tpl @@ -1,19 +1,20 @@ <div id="help-content" class="generic-content-wrapper"> <div class="section-title-wrapper"> - <h2>{{$title}}: {{$heading}}</h2> + <h2>{{$title}}: {{$heading}}</h2> </div> <div class="section-content-wrapper" id="doco-content"> - <h3 id="doco-top-toc-heading"><span class="fakelink" onclick="docoTocToggle(); return false;"> - <i class="fakelink fa fa-caret-right" id="doco-toc-toggle"></i> - {{$tocHeading}} - </span></h3> - <ul id="doco-top-toc" style="margin-bottom: 1.5em; display: none;"></ul> - {{$content}} + <h3 id="doco-top-toc-heading"> + <span class="fakelink" onclick="docoTocToggle(); return false;"> + <i class="fakelink fa fa-caret-right" id="doco-toc-toggle"></i> + {{$tocHeading}} + </span> + </h3> + <ul id="doco-top-toc" style="margin-bottom: 1.5em; display: none;"></ul> + {{$content}} </div> </div> <script> - // Generate the table of contents in the side nav menu (see view/tpl/help.tpl) $(document).ready(function () { $('#doco-top-toc').toc({content: "#doco-content", headings: "h3,h4,h5,h6"}); @@ -29,5 +30,4 @@ return false; } - </script> |