Removed and Reorderd

Removed the 2nd redundant cdc logo and placed the openCDC brand into the intro hero. Reordered the code page alphabetically. Made some small style clean ups.
CDCgov · Sep 6, 2019 · b8b8e35 · b8b8e35
1 parent 1df886e
commit b8b8e35
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 75 deletions.
diff --git a/_data/code.yml b/_data/code.yml
@@ -1,10 +1,3 @@
-- title: Surveda 
-  id: surveda
-  repos:
-    - title: Surveda
-      url: https://github.com/instedd/surveda
-      description: Surveda is an open-source, multi-modal phone survey web application designed to quickly and efficiently deploy mobile phone surveys at a national scale.
-      license: GNU General Public License 3
 - title: Blockchain
   id: blockchain
   tagline: Blockchain Open Source Projects
@@ -15,6 +8,29 @@
       tags:
         - blockchain
       license: Apache License 2.0
+- title: Epi Info™ 
+  id: EpiInfo
+  image: Epi_Info.png
+  tagline: Epi Info™ Open Source Projects
+  repos:
+    - title: Epi Info™ Web Survey
+      url: https://github.com/Epi-Info/Epi-Info-Web-Survey
+      description: Repository for the development of Epi Info™ Web Survey.
+      tags:
+        - EpiInfo
+        - dotnet
+        - Survey
+
+      license: Apache License 2.0
+    - title: Epi Info™ Cloud Data Capture
+      url: https://github.com/Epi-Info/Epi-Info-Cloud-Data-Capture
+      description: Repository for the development of Epi Info™ Cloud Data Capture.
+      tags:
+        - EpiInfo
+        - dotnet
+        - surveillance
+
+      license: Apache License 2.0
 - title: Foundation Services
   id: foundation-services
   image: fdns-logo.svg
@@ -128,6 +144,13 @@
         - java
         - springboot
       license: Apache License 2.0
+- title: Surveda 
+  id: surveda
+  repos:
+    - title: Surveda
+      url: https://github.com/instedd/surveda
+      description: Surveda is an open-source, multi-modal phone survey web application designed to quickly and efficiently deploy mobile phone surveys at a national scale.
+      license: GNU General Public License 3
 - title: Surveillance Strategy
   id: surveillance-strategy
   tagline: Surveillance Strategy Open Source Projects
@@ -146,26 +169,3 @@
         - surveillance
         - java
       license: Apache License 2.0
-- title: Epi Info™ 
-  id: EpiInfo
-  image: Epi_Info.png
-  tagline: Epi Info™ Open Source Projects
-  repos:
-    - title: Epi Info™ Web Survey
-      url: https://github.com/Epi-Info/Epi-Info-Web-Survey
-      description: Repository for the development of Epi Info™ Web Survey.
-      tags:
-        - EpiInfo
-        - dotnet
-        - Survey
-
-      license: Apache License 2.0
-    - title: Epi Info™ Cloud Data Capture
-      url: https://github.com/Epi-Info/Epi-Info-Cloud-Data-Capture
-      description: Repository for the development of Epi Info™ Cloud Data Capture.
-      tags:
-        - EpiInfo
-        - dotnet
-        - surveillance
-
-      license: Apache License 2.0
diff --git a/_includes/header.html b/_includes/header.html
@@ -92,25 +92,6 @@
   </div>
 </div>
 
-<div class="container-fluid site-title">
-  <div class="container">
-    <div class="row">
-      <div class="col">
-        <div class="display-6 text-white fw-500 pt-1 pb-1">
-          <a href="{{ site.baseurl }}/" accesskey="1" title="Home" aria-label="Home">
-            {% if site.logo %}
-              <img class="header-logo" src="{{ site.logo | prepend: site.baseurl }}" alt="{{ site.title }}">
-            {% else %}
-              <h1 class="opencdc-header-title">{{ site.title }}</h1>
-            {% endif %}
-          </a>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
 <nav role="navigation" aria-label="Mobile Nav" id="mobilenav" class="sticky-top">
   <!-- Begin included content (from /TemplatePackage/4.0/includes/nav-mobile.html) -->
   <div class="mobile-section-nav d-lg-none">

diff --git a/_includes/hero-header.html b/_includes/hero-header.html
@@ -4,6 +4,7 @@
       {% if page.layout == 'home' %}
       <div class="opencdc-grid intro">
         <div class="opencdc-one-half text">
+          <img class="cdc-header-logo" src="{{ site.logo | prepend: site.baseurl }}" alt="{{ site.title }}">
           <h1>{{ page.hero-text }}</h1>
         </div>
         <div class="opencdc-one-half graphic">

diff --git a/_sass/_footer.scss b/_sass/_footer.scss
@@ -1,5 +1,9 @@
 $sourcesanspro: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
 
+footer .footer-wrapper {
+  margin-top: 3rem;
+}
+
 .opencdc-disclaimer {
   font-size: 0.8em;
   color: #555;

diff --git a/_sass/_hero.scss b/_sass/_hero.scss
@@ -63,29 +63,41 @@
   padding: 3rem;
 
   .intro {
-    h1,h2 {
-      display: block;
-      color: #fff;
-      padding-top: 0.25em;
-    }
-    h1 {
-      font-size: 28px;
+    .graphic {
+      text-decoration: none;
+      a {
+        text-decoration: none;
+        img {
+          display: block;
+          margin: 10px auto;
+        }
+      }
     }
-    a {
+    .text {
       text-decoration: none;
-      text-align: center;
-      img {
+      h1,h2 {
         display: block;
-        margin: 10px auto;
-      }
-      h1,h2,h3,h4,h5 {
         color: #fff;
-        margin: 0;
+        padding-top: 0.25em;
       }
-
-      &:hover {
+      h1 {
+        font-size: 28px;
+      }
+      a {
+        text-decoration: none;
+        text-align: center;
+        img {
+          display: block;
+        }
         h1,h2,h3,h4,h5 {
-          color: #ddd;
+          color: #fff;
+          margin: 0;
+        }
+
+        &:hover {
+          h1,h2,h3,h4,h5 {
+            color: #ddd;
+          }
         }
       }
     }

diff --git a/_sass/_home.scss b/_sass/_home.scss
@@ -160,15 +160,15 @@
 			}
 
 			.flag:after {
-			        content: "";
-			        position: absolute;
-			        left: 0;
-			        bottom: 0;
-			        width: 0;
-			        height: 0;
-			        border-bottom: 13px solid #fff;
-			        border-left: 83px solid transparent;
-			        border-right: 83px solid transparent;
+        content: "";
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        width: 0;
+        height: 0;
+        border-bottom: 13px solid #fff;
+        border-left: 83px solid transparent;
+        border-right: 83px solid transparent;
 			}
 
 			.flag.alt {