From 7290263a30a3d9a3073c7e284301ce7e0293dbec Mon Sep 17 00:00:00 2001
From: William Zhang <willzhang05@gmail.com>
Date: Fri, 3 Nov 2017 08:46:46 -0400
Subject: [PATCH] moved data files to subfolders

---
 _data/{ => about}/excomm.json                       | 0
 _data/{ => about}/officers.json                     | 0
 _data/{ => about}/senators.json                     | 0
 _data/{ => about}/sponsors.json                     | 0
 _data/{forms.json => forms/freshman_elections.json} | 2 +-
 about.html                                          | 4 ++--
 css/about.css                                       | 1 +
 css/footer.css                                      | 4 ----
 css/header.css                                      | 4 ++--
 css/responsive.css                                  | 8 ++++----
 10 files changed, 10 insertions(+), 13 deletions(-)
 rename _data/{ => about}/excomm.json (100%)
 rename _data/{ => about}/officers.json (100%)
 rename _data/{ => about}/senators.json (100%)
 rename _data/{ => about}/sponsors.json (100%)
 rename _data/{forms.json => forms/freshman_elections.json} (69%)

diff --git a/_data/excomm.json b/_data/about/excomm.json
similarity index 100%
rename from _data/excomm.json
rename to _data/about/excomm.json
diff --git a/_data/officers.json b/_data/about/officers.json
similarity index 100%
rename from _data/officers.json
rename to _data/about/officers.json
diff --git a/_data/senators.json b/_data/about/senators.json
similarity index 100%
rename from _data/senators.json
rename to _data/about/senators.json
diff --git a/_data/sponsors.json b/_data/about/sponsors.json
similarity index 100%
rename from _data/sponsors.json
rename to _data/about/sponsors.json
diff --git a/_data/forms.json b/_data/forms/freshman_elections.json
similarity index 69%
rename from _data/forms.json
rename to _data/forms/freshman_elections.json
index b602517..0d00d21 100644
--- a/_data/forms.json
+++ b/_data/forms/freshman_elections.json
@@ -1,5 +1,5 @@
 {
-    "title" : "Freshman Election Forms",
+    "name": "Freshman Elections",
     "items": [
         {
             "name": "",
diff --git a/about.html b/about.html
index 1f95e5a..a4b53f2 100644
--- a/about.html
+++ b/about.html
@@ -28,9 +28,9 @@ orgs: ["officers", "excomm", "senators", "sponsors"]
             </div>
         </section>
         <hr />
-        {% for org_name in site.data %}
+        {% for org_name in site.data.about %}
         {% assign name = page.orgs[forloop.index0] %}
-        {% assign org = site.data[name] %}
+        {% assign org = site.data.about[name] %}
         <section id="{{ org.username }}">
             <h2>{{ org.name }}</h2>
             {% for member in org.members %}
diff --git a/css/about.css b/css/about.css
index 9fa01ba..11df883 100644
--- a/css/about.css
+++ b/css/about.css
@@ -8,6 +8,7 @@
     max-width: 100vw;
     display: block;
     text-align: center;
+    margin-bottom: 2.5vh;
 }
 
 #contact>.desc {
diff --git a/css/footer.css b/css/footer.css
index 6d5cecb..cc4f22d 100644
--- a/css/footer.css
+++ b/css/footer.css
@@ -19,10 +19,6 @@ footer {
     vertical-align: middle;
 }*/
 
-#contact {
-    margin: 1em 0 0 0;
-}
-
 button.social {
     cursor: pointer;
     outline: none;
diff --git a/css/header.css b/css/header.css
index 5b2eea2..5d2ac5a 100644
--- a/css/header.css
+++ b/css/header.css
@@ -63,7 +63,7 @@ nav#menu {
     flex-wrap: nowrap;
     justify-content: center;
     border-bottom: 3px solid rgb(164, 38, 44);
-    box-shadow: 0 28px 79px 0 rgba(66, 129, 121, .27);
+    /*box-shadow: 0 28px 79px 0 rgba(66, 129, 121, .27);*/
 }
 
 a.menu-item {
@@ -130,7 +130,7 @@ button.menu-item:active {
     background-image: url('../img/bg.jpg');
     background-size: cover;
     background-position-x: center;
-    background-position-y: 7.5vh;
+    background-position-y: 5vh;
     background-repeat: no-repeat;
     background-attachment: fixed;
     z-index: -2;
diff --git a/css/responsive.css b/css/responsive.css
index ec9936b..b4bf889 100644
--- a/css/responsive.css
+++ b/css/responsive.css
@@ -1,6 +1,6 @@
 @media screen and (max-width: 1150px) {
     #dome:after {
-        background-position-y: 1vh;
+        background-position-y: 0;
         background-size: 100%;
     }
     #banner {
@@ -107,6 +107,9 @@
     #banner > h1 {
         display: none;
     }
+    #dome:after {
+        background-position-y: 5vh;
+    }
     .officers-intro,
     .excomm-intro,
     .senators-intro,
@@ -156,9 +159,6 @@
     .list>ul {
         font-size: 1.3em;
     }
-    #dome:after {
-        background-position-y: 2.5vh;
-    }
 }
 
 @media screen and (min-width: 1800px) {