From 51a252e1929c6ee9350387d5c312096c1fa063ec Mon Sep 17 00:00:00 2001
From: William Zhang <willzhang05@gmail.com>
Date: Sat, 28 Oct 2017 12:50:21 -0400
Subject: [PATCH] various improvements, including removing .html ext and fixing
 some random layout issues

---
 _config.yml           |  2 +-
 _data/senators.json   | 34 ++++++++++++++++++++++++----------
 _includes/footer.html |  1 -
 _includes/header.html |  8 ++++----
 about.html            |  1 -
 css/about.css         | 16 ++++++++--------
 css/footer.css        |  8 ++++----
 css/main.css          | 12 ++++++++++--
 css/responsive.css    |  3 ++-
 js/sidebar.js         |  4 ++--
 10 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/_config.yml b/_config.yml
index b948ea2..7b3c891 100644
--- a/_config.yml
+++ b/_config.yml
@@ -21,7 +21,7 @@ baseurl: "" # the subpath of your site, e.g. /blog
 url: "" # the base hostname & protocol for your site, e.g. http://example.com
 twitter_username: tjSGA
 github_username:  willzhang05
-
+permalink: pretty
 # Build settings
 markdown: kramdown
 #theme: minima
diff --git a/_data/senators.json b/_data/senators.json
index 673ee5e..bd77ac2 100644
--- a/_data/senators.json
+++ b/_data/senators.json
@@ -4,8 +4,22 @@
     "description": "Jefferson's student government is divided into school-wide student government (SGA) and grade-level student government (Class Council). While the SGA organizes school-wide events and addresses school-wide concerns and issues, Class Councils represent their grade's needs and host fundraisers and events with the goal to raise money for both Prom and Graduation at the end of senior year. SGA Class Senators serve as Class Council members who are liaisons with the SGA.",
     "members": [
         {
-            "first": "Sabria",
-            "last": "Kazmi",
+            "first": "Ashley",
+            "last": "Lin",
+            "year": 2018,
+            "title": "2018 Senator",
+            "intro": ""
+        },
+        {
+            "first": "Anna",
+            "last": "Lulushi",
+            "year": 2018,
+            "title": "2018 Senator",
+            "intro": ""
+        },
+        {
+            "first": "Laura",
+            "last": "Gersony",
             "year": 2019,
             "title": "2019 Senator",
             "intro": ""
@@ -18,17 +32,17 @@
             "intro": ""
         },
         {
-            "first": "Sabria",
-            "last": "Kazmi",
-            "year": 2019,
-            "title": "2019 Senator",
+            "first": "Divjot",
+            "last": "Bedi",
+            "year": 2020,
+            "title": "2020 Senator",
             "intro": ""
         },
         {
-            "first": "Sabria",
-            "last": "Kazmi",
-            "year": 2019,
-            "title": "2019 Senator",
+            "first": "Megan",
+            "last": "Dass",
+            "year": 2020,
+            "title": "2020 Senator",
             "intro": ""
         }
     ]
diff --git a/_includes/footer.html b/_includes/footer.html
index ce4bb5f..97f9422 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,5 +1,4 @@
     <footer>
-        <span>&copy; 2017 TJSGA</span>
         <a href="https://facebook.com/tjsga" target="_blank">
             <button class="social" id="fb">
             </button>
diff --git a/_includes/header.html b/_includes/header.html
index c5ced42..14b352c 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -7,16 +7,16 @@
             </div>
         </div>
         <nav id="menu">
-            <a class="menu-item" href="index.html">
+            <a class="menu-item" href="index">
                 <button class="menu-item fluid">Home</button>
             </a>
-            <a class="menu-item" href="about.html">
+            <a class="menu-item" href="about">
                 <button class="menu-item fluid">About</button>
             </a>
-            <a class="menu-item" href="resources.html">
+            <a class="menu-item" href="resources">
                 <button class="menu-item fluid">Resources</button>
             </a>
-            <a class="menu-item" href="forms.html">
+            <a class="menu-item" href="forms">
                 <button class="menu-item fluid">Forms</button>
             </a>
         </nav>
diff --git a/about.html b/about.html
index 1545d53..993d5a7 100644
--- a/about.html
+++ b/about.html
@@ -54,7 +54,6 @@ orgs: ["officers", "excomm", "senators", "sponsors"]
             </div>
             {% endfor %}
         </section>
-        <hr />
         {% endfor %}
     </div>
     {% include footer.html %}
diff --git a/css/about.css b/css/about.css
index a3df8ee..c8415e0 100644
--- a/css/about.css
+++ b/css/about.css
@@ -1,4 +1,4 @@
-/*#excomm:after {
+/*#excomm {
     content: '';
     flex: auto;
 }*/
@@ -25,8 +25,8 @@
 .excomm-image,
 .senators-image,
 .sponsors-image {
-    width: 100%;
-    height: calc(25vh - 4vw);
+    width: 12vw;
+    height: 12vw;
     margin-bottom: 1vh;
 }
 
@@ -34,12 +34,11 @@
 .excomm-image:after,
 .senators-image:after,
 .sponsors-image:after {
-    width: calc(25vh - 4vw);
-    height: calc(25vh - 4vw);
+    width: 100%;
+    height: 100%;
     content: '';
     display: block;
     position: relative;
-    left: calc(50% - 10vh);
     background-image: url('../img/profile.jpg');
     background-size: contain;
     background-position: center;
@@ -73,8 +72,9 @@
 .senators-intro,
 .sponsors-intro {
     text-align: center;
-    margin: 2vw;
-    flex-basis: calc(25% - 4vw);
+    margin: 1.5vw;
+    /*flex-basis: calc(25% - 4vw);*/
+    max-width: 12vw;
     flex-wrap: wrap;
 }
 
diff --git a/css/footer.css b/css/footer.css
index 5018965..6d5cecb 100644
--- a/css/footer.css
+++ b/css/footer.css
@@ -1,7 +1,7 @@
 footer {
     position: relative;
     width: 100%;
-    height: calc(2.75em + 42px);
+    padding: calc((2.75em + 42px) / 4) 0;
     bottom: 0;
     left: 0;
     right: 0;
@@ -11,13 +11,13 @@ footer {
     z-index: 2;
 }
 
-footer>span {
+/*footer>span {
     width: 100vw;
     height: 2em;
     font-size: 1.1em;
     display: table-cell;
     vertical-align: middle;
-}
+}*/
 
 #contact {
     margin: 1em 0 0 0;
@@ -52,4 +52,4 @@ button.social#flickr {
 button.social#mail {
     background: url('../icons/mail.png');
     background-size: cover;
-}
\ No newline at end of file
+}
diff --git a/css/main.css b/css/main.css
index 79aa3b5..23d7b1e 100644
--- a/css/main.css
+++ b/css/main.css
@@ -156,7 +156,6 @@ span>a:active {
 section {
     width: 100%;
     min-height: 100%;
-    padding-bottom: 5vh;
     display: flex;
     z-index: 2;
 }
@@ -175,6 +174,15 @@ section {
     flex-flow: row wrap;
 }
 
+#intro,
+#updates,
+#resources {
+    padding: 2.5vh 0;
+}
+
+#sponsors {
+    padding-bottom: 2.5vh;
+}
 
 section h1 {
     font-size: 3.5em;
@@ -204,7 +212,7 @@ section h2,
 }
 
 #intro-image>img {
-    margin-top: calc(83px + 2.1em);
+    margin-top: calc(5vh + 3.1em);
     width: 100%;
 }
 
diff --git a/css/responsive.css b/css/responsive.css
index 3ea8480..19b6811 100644
--- a/css/responsive.css
+++ b/css/responsive.css
@@ -62,6 +62,7 @@
     }
     #menu>a {
         width: 100%;
+        min-height: 75px;
         height: 10vh;
         flex-basis: auto;
     }
@@ -144,7 +145,7 @@
         font-size: 1.3em;
     }
     #dome:after {
-        background-position-y: 10vh;
+        background-position-y: 1vh;
     }
     /*.officers-intro, .excomm-intro, .senator-intro, .sponsor-intro {
         flex-basis: calc(35% - 4vw);
diff --git a/js/sidebar.js b/js/sidebar.js
index 65dca9d..2946b0d 100644
--- a/js/sidebar.js
+++ b/js/sidebar.js
@@ -1,6 +1,6 @@
 var mb = document.querySelector("#menu-toggle"),
     sb = document.querySelector("nav#menu"),
-    tb = document.querySelector("#banner h1"),
+    tb = document.querySelector("#logo"),
     dm = document.querySelector("#dome"),
     wr = document.querySelector("#wrapper");
 
@@ -39,4 +39,4 @@ function toggleSidebar(toggleOpenAllowed) {
         sb.style.disabled = true;
         sb.style.left = "-30vw";
     }
-}
\ No newline at end of file
+}