various improvements, including removing .html ext and fixing some random layout issues

_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

_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",
+            "first": "Ashley",
-            "last": "Kazmi",
+            "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",
+            "first": "Divjot",
-            "last": "Kazmi",
+            "last": "Bedi",
-            "year": 2019,
+            "year": 2020,
-            "title": "2019 Senator",
+            "title": "2020 Senator",
             "intro": ""
         },
         {
-            "first": "Sabria",
+            "first": "Megan",
-            "last": "Kazmi",
+            "last": "Dass",
-            "year": 2019,
+            "year": 2020,
-            "title": "2019 Senator",
+            "title": "2020 Senator",
             "intro": ""
         }
     ]

_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>

_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>

about.html

@@ -54,7 +54,6 @@ orgs: ["officers", "excomm", "senators", "sponsors"]
             </div>
             {% endfor %}
         </section>
-        <hr />
         {% endfor %}
     </div>
     {% include footer.html %}

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%;
+    width: 12vw;
-    height: calc(25vh - 4vw);
+    height: 12vw;
     margin-bottom: 1vh;
 }
 
@@ -34,12 +34,11 @@
 .excomm-image:after,
 .senators-image:after,
 .sponsors-image:after {
-    width: calc(25vh - 4vw);
+    width: 100%;
-    height: calc(25vh - 4vw);
+    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;
+    margin: 1.5vw;
-    flex-basis: calc(25% - 4vw);
+    /*flex-basis: calc(25% - 4vw);*/
+    max-width: 12vw;
     flex-wrap: wrap;
 }
 

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;

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%;
 }
 

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);

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");