diff --git a/public/static/css/menu2.css b/public/static/css/menu2.css index d86dc615..476b9b3c 100644 --- a/public/static/css/menu2.css +++ b/public/static/css/menu2.css @@ -52,12 +52,12 @@ body .row { width: calc(100% - 250px); } #tour-content { - height: 100vh; + height: calc(100vh - 52px); overflow-y: auto; } #tour-code { - height: 100vh; + height: calc(100vh - 52px); overflow-y: auto; } } @@ -75,3 +75,8 @@ body .row { margin: 0.15em; } } + +.navbar .h1 { + margin-top: 0px; + margin-bottom: 0px; +} diff --git a/views/tour.dt b/views/tour.dt index e57672f3..d873b469 100644 --- a/views/tour.dt +++ b/views/tour.dt @@ -9,6 +9,7 @@ block head block content .row(ng-controller="DlangTourAppCtrl as ctrl", ng-init="init('#{language}', '#{githubRepo}', '#{chapterId}', '#{section}', #{hasSourceCode}, '#{previousSection.link}', '#{nextSection.link}')") + div#tour-content(ng-show="showContent", ng-class="{'col-md-12': !showSourceCode, 'col-md-6 col-sm-12': showSourceCode}") div(ng-hide="showProgramOutput") .content-command-box @@ -40,20 +41,21 @@ block content span Reset ui-codemirror(ui-codemirror-opts="editorOptions", ui-codemirror="{ onLoad : codemirrorLoaded }", ng-model="sourceCode") - //-nav.navbar.navbar-bottom - //-.container.text-center.h1 - //-a(href="#{previousSection.link}", ng-show="'' != '#{previousSection.link}'") - //-| < - //-span.h4 #{previousSection.title} - //-| #{sectionId + 1} / - //-span.small #{sectionCount} - //-a(href="#{nextSection.link}", ng-show="'' != '#{nextSection.link}'") - //-span.h4 #{nextSection.title} - //-| > - // .container.hidden-xs.hidden-sm - //-p.text-muted.text-center - //-kbd ? - //-| Keyboard shortcuts + nav.navbar.navbar-bottom + .container.text-center.h1 + a(href="#{previousSection.link}", ng-show="'' != '#{previousSection.link}'") + | < + span.h4 #{previousSection.title} + //-| #{sectionId + 1} / + //-span.small #{sectionCount} + span / + a(href="#{nextSection.link}", ng-show="'' != '#{nextSection.link}'") + span.h4 #{nextSection.title} + | > + //-.container.hidden-xs.hidden-sm + //-p.text-muted.text-center + //-kbd ? + | Keyboard shortcuts block js script(src="/static/js/tour-controller.js")