Merge pull request #38 from lauraengelhardt/cleanup-unused-code

Clean-up unused code and two fixes

Author: lauraengelhardt

README.md

@@ -32,8 +32,7 @@ If you don't want to provide a link to any webpage, include the whole `link` ite
 
 ## How to add an associated project
 
-Adding another software project that is either a wrapper around 4C, or it uses some 4C code or provides a pre-/postprocessing tool
-works in the same way as adding examples. The file to be modified is here
+Adding another software project that is either a wrapper around 4C, or it uses some 4C code or provides a pre-/postprocessing tool works in the same way as adding examples. The file to be modified is here
 
 `associated.yml`
 
@@ -46,8 +45,7 @@ Note that the names are in alphabetical order, so add it at the right place.
 ## How to add a new publication to the website?
 
 The 4C website contains a list of all publications, that have been created with the help of 4C.
-When your new 4C-related publication has been published and all its bibliographic details (e.g. volume, issue, DOI, ...) are known,
-please add the publication to the list of publications.
+When your new 4C-related publication has been published and all its bibliographic details (e.g. volume, issue, DOI, ...) are known, please add the publication to the list of publications.
 
 Bibliographic data is stored in the `bibtex` format in two files:
 

_config.yml

@@ -12,31 +12,6 @@ logo:
   desktop_width: "100px"
   banner: "/images/illustrations/fiber-fluidflow2.jpg"
 
-collections:
-  capabilities:
-    output: true
-  community:
-    output: true
-  associated:
-    output: true
-
-defaults:
-  - scope:
-      path: ""
-      type: "capabilities"
-    values:
-      layout: "capability"
-  - scope:
-      path: ""
-      type: "community"
-    values:
-      layout: "contributor"
-  - scope:
-      path: ""
-      type: "associated"
-    values:
-      layout: "associate"
-
 sass:
   indentWidth: 4
   style: compressed # possible values: nested expanded compact compressed

_data/contact.yml

@@ -5,9 +5,6 @@ main:
   - name: "Capabilities and examples"
     url: "/capabilities/"
     weight: 1
-  #  - name: "Code"
-  #    url: "/code.html"
-  #    weight: 3
   - name: "Associated projects"
     url: "/associated_projects/"
     weight: 4

_data/menus.yml

@@ -28,7 +28,7 @@
     <p><br /><br /></p>
     <img
       alt="banner"
-      class="intro-image{% if page.banner_hide_on_mobile %} intro-image-hide-mobile{% endif %}"
+      class="image{% if page.banner_hide_on_mobile %} image-hide-mobile{% endif %}"
       src="{{ site.logo.banner | relative_url }}"
       width="100%"
       height="100%"

_includes/header.html

@@ -12,14 +12,14 @@ <h1>{{ page.title }}</h1>
       <div class="col-12 col-md-7 col-lg-7 order-2 order-md-1">
         {{ content }}
       </div>
-      {% if page.intro_image %}
+      {% if page.image %}
       <div
         class="col-12 col-md-5 col-lg-5 order-1 order-md-2 position-relative"
       >
         <img
           alt="{{ page.title }}"
-          class="intro-image{% if page.intro_image_absolute %} intro-image-absolute{% endif %}{% if page.intro_image_hide_on_mobile %} intro-image-hide-mobile{% endif %}"
-          src="{{ page.intro_image | absolute_url }}"
+          class="image {% if page.image_hide_on_mobile %} image-hide-mobile{% endif %}"
+          src="{{ page.image | absolute_url }}"
         />
       </div>
       {% endif %}

_layouts/associated.html

@@ -11,17 +11,16 @@ <h1 class="title">4C: A Comprehensive Multiphysics Simulation Framework</h1>
   <div class="container">
     <div class="row justify-content-start">
       <div class="col-12 col-md-8 col-lg-8 order-2 order-md-1">
-        {{ content }} {% if page.show_call_box %} {% include mission.html
-        show_button=true %} {% endif %}
+        {{ content }}
       </div>
-      {% if page.intro_image %}
+      {% if page.image %}
       <div
         class="col-12 col-md-4 col-lg-4 order-1 order-md-2 position-relative"
       >
         <img
           alt="{{ page.title }}"
-          class="intro-image{% if page.intro_image_absolute %} intro-image-absolute{% endif %}{% if page.intro_image_hide_on_mobile %} intro-image-hide-mobile{% endif %}"
-          src="{{ site.logo.desktop | relURL }}"
+          class="image{% if page.image_hide_on_mobile %} image-hide-mobile{% endif %}"
+          src="{{ page.image | absolute_url }}"
         />
       </div>
       {% endif %}

_layouts/capability.html

@@ -0,0 +1,11 @@
+.image {
+  width: 100%;
+  height: auto;
+  margin-top: -40px;
+}
+.image-hide-mobile {
+  display: none;
+  @include media-breakpoint-up(md) {
+    display: block;
+  }
+}