tweaks to spacelab theme

morea-framework · Jul 29, 2021 · edc007b · edc007b
1 parent 4fa2aeb
commit edc007b
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 17 deletions.
diff --git a/_config.yml b/_config.yml
@@ -8,7 +8,7 @@ mathjax: true
 timezone: Pacific/Honolulu # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 baseurl: /morea
 exclude: [morea]
-morea_theme: cerulean
+morea_theme: spacelab
 morea_navbar_items:
   - Prerequisites
   - Modules

diff --git a/_layouts/core.html b/_layouts/core.html
@@ -45,7 +45,7 @@
 </head>
 <body>
 
-<div class="navbar navbar-expand-lg fixed-top">
+<div class="navbar navbar-expand-lg fixed-top {{site.morea_theme_navbar_bg}}">
   <div class="container">
     <a class="navbar-brand" href="{{ site.baseurl }}/index.html"> {{ site.name }} </a>
     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">

diff --git a/_layouts/module.html b/_layouts/module.html
@@ -6,7 +6,9 @@
 <div class="container">
   <h1><small class="header-small">Module: </small> {{ page.morea_page.title }} </h1>
   <p>{{ page.morea_page.content | markdownify }}</p>
-  <p>Dates: {{ page.morea_page.morea_start_date_string }} - {{ page.morea_page.morea_end_date_string }}</p>
+  {% if page.morea_page.morea_start_date_string %}
+    <p>Dates: {{ page.morea_page.morea_start_date_string }} - {{ page.morea_page.morea_end_date_string }}</p>
+  {% endif %}
 </div>
 
 {% unless page.morea_page.morea_prerequisites.size == 0 %}

diff --git a/_plugins/MoreaGenerator.rb b/_plugins/MoreaGenerator.rb
@@ -88,6 +88,12 @@ def configSite()
           @config['morea_domain'].chop!
         end
       end
+      # Set the navbar background depending on the theme.
+      if ["spacelab"].include? @config['morea_theme'].to_s
+        @config['morea_theme_navbar_bg'] = 'bg-light'
+      else
+        @config['morea_theme_navbar_bg'] = 'bg-dark'
+      end
       # logMoreaConfig()
     end
 

diff --git a/assessments/index.md b/assessments/index.md
@@ -5,7 +5,7 @@ title: Assessments
 {% include breadcrumb-2.html %}
 
 <div class="container">
-  <h1>Assessments <small class="header-small">in module order</small></h1>
+  <h1>Assessments <small class="header-small">How to tell if you've learned the material</small></h1>
 </div>
 
 {% if site.morea_overview_assessments %}

diff --git a/css/style.css b/css/style.css
@@ -37,11 +37,6 @@ h1, h2, h3 {
   margin-top: .20em;
 }
 
-/* Move body of page below navbar. */
-body {
-  padding-top: 48px;
-}
-
 small {
   font-size: .7em
 }

diff --git a/css/themes/spacelab/bootstrap.min.css b/css/themes/spacelab/bootstrap.min.css
diff --git a/experiences/index.md b/experiences/index.md
@@ -5,7 +5,7 @@ title: Experiences
 {% include breadcrumb-2.html %}
 
 <div class="container">
-  <h1>Experiential Learning <small class="header-small">in module order</small></h1>
+  <h1>Experiential Learning <small class="header-small">"Active" learning opportunities</small></h1>
 </div>
 
 {% if site.morea_overview_experiences %}

diff --git a/modules/index.md b/modules/index.md
@@ -32,9 +32,11 @@ title: Modules
                 <span>Coming soon...</span>
               </div>
             {% else %}
-              <div class="card-footer text-center">
-                {{module.morea_start_date_string}} - {{module.morea_end_date_string}}
-              </div>
+              {% if module.morea_start_date_string %}
+                <div class="card-footer text-center">
+                  {{module.morea_start_date_string}} - {{module.morea_end_date_string}}
+                </div>
+              {% endif %}
               <a href="{{ module.morea_id }}" class="stretched-link"></a>
             {% endif %}
           </div>

diff --git a/outcomes/index.md b/outcomes/index.md
@@ -5,7 +5,7 @@ title: Learning Outcomes
 {% include breadcrumb-2.html %}
 
 <div class="container">
-  <h1>Learning Outcomes <small class="header-small">in module order</small></h1>
+  <h1>Learning Outcomes <small class="header-small">What you will know</small></h1>
 </div>
 
 {% if site.morea_overview_outcomes %}

diff --git a/prerequisites/index.md b/prerequisites/index.md
@@ -5,7 +5,7 @@ title: Prerequisites
 {% include breadcrumb-2.html %}
 
 <div class="container">
-  <h1>Prerequisites <small class="header-small">in module order</small></h1>
+  <h1>Prerequisites <small class="header-small">Important material from other courses</small></h1>
 </div>
 
 {% if site.morea_overview_prerequisites %}

diff --git a/readings/index.md b/readings/index.md
@@ -5,7 +5,7 @@ title: Readings
 {% include breadcrumb-2.html %}
 
 <div class="container">
-  <h1>Readings and other resources <small class="header-small">in module order</small></h1>
+  <h1>Readings <small class="header-small">"Passive" learning opportunities</small></h1>
 </div>
 
 {% if site.morea_overview_readings %}