Merge pull request #10 from hftf/master

Improvements
acf-quizbowl · Mar 13, 2021 · dd03415 · dd03415
2 parents 72b856c + 555b881
commit dd03415
Show file tree

Hide file tree

Showing 27 changed files with 3,041 additions and 2,046 deletions.
diff --git a/_config.yml b/_config.yml
@@ -15,7 +15,7 @@
 # in the templates via {{ site.myvariable }}.
 title: Academic Competition Federation
 tagline: Hi. We’re ACF.
-description: We produce four high-quality collegiate quizbowl tournaments each year. Our organization is completely student and volunteer-run, by quizbowl players, for quizbowl players. Our tournaments are written to reward academic knowledge, encourage learning, and foster the spirit of competition and fair play.
+description: We produce four high-quality collegiate quizbowl tournaments each year. Our organization is completely student and volunteer-run, by quizbowl players, for quizbowl players. Our tournaments reward academic knowledge, encourage learning, and foster the spirit of competition and fair play.
 logo: /logo.png
 thumbnail: /thumbnail_logo.png
 baseurl: "" # the subpath of your site, e.g. /blog

diff --git a/_includes/navbar.html b/_includes/navbar.html
@@ -10,7 +10,7 @@
       <ul class="navbar-nav">
         <li class="nav-item dropdown">
             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              About
+              About ACF
             </a>
             <div class="dropdown-menu" aria-labelledby="navbarDropdown">
               <a class="dropdown-item" href="/about">About ACF</a>
@@ -25,14 +25,14 @@
               Tournaments
             </a>
             <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
-              <h6 class="dropdown-header">Tournament Pages</h6>
+              <h6 class="dropdown-header">Tournament Information</h6>
               <a class="dropdown-item" href="/fall">ACF Fall</a>
               <a class="dropdown-item" href="/winter">ACF Winter</a>
               <a class="dropdown-item" href="/regionals">ACF Regionals</a>
               <a class="dropdown-item" href="/nationals">ACF Nationals</a>
               <div class="dropdown-divider"></div>
               <h6 class="dropdown-header">General Information</h6>
-              <a class="dropdown-item" href="/distribution">Distribution</a>
+              <a class="dropdown-item" href="/distribution">ACF Distribution</a>
               <a class="dropdown-item" href="/packet-submission-guidelines">Packet Submission Guidelines</a>
             </div>
         </li>
@@ -49,11 +49,11 @@ <h6 class="dropdown-header">Guidelines</h6>
               <a class="dropdown-item" href="/hosting-guidelines">ACF Hosting Guidelines</a>
               <a class="dropdown-item" href="/packet-submission-guidelines">ACF Packet Submission Guidelines</a>
               <div class="dropdown-divider"></div>
-              <h6 class="dropdown-header">Trainings</h6>
+              <h6 class="dropdown-header">Training</h6>
               <a class="dropdown-item" href="/online-moderator-training">Online Moderator Training</a>
               <div class="dropdown-divider"></div>
               <h6 class="dropdown-header">Documents</h6>
-              <a class="dropdown-item" href="/formats">ACF Formats</a>
+              <a class="dropdown-item" href="/formats">ACF Tournament Formats</a>
               <a class="dropdown-item" href="/why-packet-submission">Why Packet Submission?</a>
               <a class="dropdown-item" href="/jerry-guide">Guide to Writing Questions</a>
               <div class="dropdown-divider"></div>

diff --git a/_layouts/home.html b/_layouts/home.html
@@ -10,12 +10,12 @@
       <header class="header-background">
         {% include navbar.html %}
 
-        <div class="container mx-auto px-2 mb-2 clearfix header-text">
-          <h1 class="h0-title inline-block col-10 sm-width-full py-2 mt-3 header-title">{{ site.title }}</h1>
+        <div class="container mx-auto px-2 mb-2 clearfix">
+          <h1 class="h0-title inline-block sm-width-full py-2 mt-3 header-title">{{ site.title }}</h1>
           <p class="h3 lh-condensed font-weight-bold mt-2">{{ site.tagline}}</p>
-          <p class="h4 lh-condensed font-smoothing col-9">{{ site.description }}</p>
+          <p class="h4 lh-condensed font-smoothing col-8">{{ site.description }}</p>
           <div class="clearfix mb-4 py-1">
-            <div class="col-8 sm-width-full left border-top-thin">
+            <div class="col-8 sm-width-full left">
               <div class="table">
                 <div class="inline-block mt-3 mr-1">
                   {% include twitter-logo.html %}

diff --git a/_layouts/page.html b/_layouts/page.html
@@ -1,16 +1,14 @@
 ---
 layout: default
 ---
-<article class="container mx-auto px-2 mt2 mb4">
+<article class="container mx-auto px-2">
   <header>
-    <h1 class="h0 py-3 mt-3">{{ page.title }}</h1>
+    <h1 class="h0 py-1 mt-3">{{ page.title }}</h1>
     {% if page.last_updated %}
-    <p style = 'color: #929292'><i>Last Updated: {{ page.last_updated }}</i></p>
+    <p class="last-updated">Last updated: {{ page.last_updated }}</p>
     {% endif %}
   </header>
-  <div class="col-4 sm-width-full border-top-thin">
-  </div>
-  <div class="prose mb-4 py-3">
+  <div class="prose mb-4 py-1">
     {{ content }}
   </div>
 </article>
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -2,9 +2,9 @@
 layout: default
 ---
 <article class="container px-2 mx-auto mb4" itemscope itemtype="http://schema.org/BlogPosting">
-  <h1 class="h0 col-9 sm-width-full py-3 mt-3 inline-block" itemprop="name headline">{{ page.title }}</h1>
-  <div class="col-4 sm-width-full mt-1 border-top-thin ">
-    <p class="mb-3 py-2 bold h4"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time></p>
+  <h1 class="h0 col-9 sm-width-full py-1 mt-3 inline-block" itemprop="name headline">{{ page.title }}</h1>
+  <div class="col-4 sm-width-full mt-1">
+    <p class="mb-3 py-1 bold h4"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time></p>
   </div>
 
   <div class="prose" itemprop="articleBody">

diff --git a/_sass/_base.scss b/_sass/_base.scss
@@ -3,56 +3,43 @@
 */
 
 * {
- box-sizing: border-box !important;
- margin: 0; }
+  box-sizing: border-box !important;
+}
 
 input,
 select,
 textarea,
 button {
- font-family: inherit;
- font-size: inherit;
- line-height: inherit;
-}
-
-
-body, h1, h2, h3, h4, h5, h6,
-p, blockquote, pre, hr,
-dl, dd, ol, ul, figure {
-    margin: 0;
-    padding: 0;
+    font-family: inherit;
+    font-size: inherit;
+    line-height: inherit;
 }
 
 
 /**
  * Basic styling
  */
 body {
+    margin: 0;
     font-family: $body-font-family;
     font-size: $body-font-size;
     line-height: 1.5;
     color: $color-body-text;
     background-color: #fff;
-    white-space: normal;
-}
-
-p {
-  margin-top: 0;
-  margin-bottom: 0.5em;
 }
 
 h1, h2, h3, h4, h5, h6 {
   color: $color-title;
-  margin-top: 1em;
-  margin-bottom: 0.25em;
+  margin-top: 1.25em;
+  margin-bottom: 0.5em;
 }
 
 h1, .h1 { font-size: $h1-size; }
 h2, .h2 { font-size: $h2-size; }
 h3, .h3 { font-size: $h3-size; }
 h4, .h4 { font-size: $h4-size; }
 h5, .h5 { font-size: $h5-size; }
-h6, .h6 { font-size: $h6-size; text-transform: uppercase; letter-spacing: 0.02em; }
+h6, .h6 { font-size: $h6-size; }
 
 a {
   color: $color-title;

diff --git a/_sass/_components.scss b/_sass/_components.scss
@@ -11,7 +11,6 @@ pre {
 
 code {
     color: $color-code;
-    font-size: $body-font-size;
     padding: 1px 0px;
 }
 
@@ -28,7 +27,6 @@ code {
   }
 
   p, ol, ul {
-    font-size: $prose-font-size;
     width: 100%;
 
     @media (min-width: $breakpoint-lg) {
@@ -41,13 +39,6 @@ code {
     padding-left: 40px;
   }
 
-  li {
-
-    ul li, ol li {
-      margin-bottom: 0;
-    }
-  }
-
   img {
 
     max-width: 100%;
@@ -59,26 +50,18 @@ code {
   }
 
   blockquote {
+    font-size: 1.15em;
     line-height: 1.375;
     padding-left: 20px;
     margin: 40px 0 40px -16px;
     border-left: $spacer-1 solid $color-border;
     font-style: italic;
-    color: $color-primary-link;
-
-    p {
-      font-size: 24px;
-    }
+    color: $color-text-accent;
 
     @media (min-width: $breakpoint-lg) {
       padding-left: $spacer-3;
       margin: $spacer-4 0 $spacer-4 -40px;
       max-width: (11 / 10 * 100%);
-
-      p {
-        font-size: 28px;
-      }
-
     }
 
   }
@@ -108,7 +91,7 @@ code {
   // Markdown tables
   table {
     border-collapse: collapse;
-    width: 100%;
+    // width: 100%;
     margin-bottom: .5em;
     overflow: auto;
     // For Firefox to horizontally scroll wider tables.
@@ -119,60 +102,78 @@ code {
       font-weight: bold;
       text-align: left;
       color: $color-title;
-      padding: 0px 5px;
     }
 
-    th,
-    td {
-      border-top: 1px solid $color-title;
-      border-bottom: 1px solid $color-title;
+    th, td {
+      padding: 3px 6px;
+      vertical-align: top;
     }
 
-    tr {
-      background-color: #fff;
+    tr th {
       border-top: 1px solid $color-title;
+      border-bottom: 1px solid $color-title;
     }
 
-    tr td {
-      padding: 0px 5px;
+    &.table-striped tbody tr:nth-child(odd) {
+      background-color: #f2f2f2;
+    }
+    &.table-ruled   tbody tr td {
+      border-bottom: 1px solid $color-border;
     }
 
-    tr th {
+    thead tr:first-child th {
       border-top: 2px solid $color-title;
+    }
+    tbody tr:last-child td {
       border-bottom: 2px solid $color-title;
-      font-size: 200%;
     }
 
-  }
+    &.member-list {
+      width: 100%;
+    }
 
-  .table-striped tr th {
-      border-top: 2px solid $color-title;
-      border-bottom: 2px solid $color-title;
-      font-size: 100%;
-      padding: 0px 5px;
-  }
+    &.member-list tr td ul {
+      font-size: 0.9em;
+      margin: 0;
+      list-style: none;
+      padding-left: 1em;
+      text-indent: -1em;
+    }
 
-  .table-striped td {
-    padding: 0px 5px;
-  }
+    &.schedule {
+      th, td {
+        text-align: center;
+        width: 5em;
+      }
+    }
 
-  .table-striped tbody tr:nth-child(odd) {
-    background-color: #ececec;
-  }
-
- .table-stats tr th {
-  border-top: 2px solid $color-title;
-  border-bottom: 2px solid $color-title;
-  font-size: 100%;
-  padding: 0px 5px;
-  }
+    &.distribution {
+      width: 100%;
 
+      thead tr th {
+        position: sticky;
+        top: 0;
+        background-color: white;
+      }
 
-}
+      tr.category td {
+        font-weight: bold;
+        background-color: #d1d3d4;
+        border-top: 1px solid $color-title;
+      }
+      tr.subcategory td:first-child {
+        padding-left: 2em;
+      }
 
-.small-list > ul > li {
-  font-size: 85%;
-  margin: 0px;
+      thead, tbody {
+        th, td {
+          &:nth-child(n+2) {
+            text-align: center;
+          }
+        }
+      }
+    }
+  }
 }
 
 nav {
@@ -182,15 +183,20 @@ nav {
   position: sticky;
 }
 
+.navbar-nav {
+  margin-top: 0;
+}
+
+
 .training-question {
   background-color: #eeff00f5;
   border: 2px black solid;
   border-radius: 8px;
   padding: 2%;
 }
 
-.training-question-text{
-  font-size: 24px;
+.last-updated {
+  margin-top: 0;
+  font-size: 0.9em;
+  color: $gray;
 }
-
-
diff --git a/_sass/_table-columns.scss b/_sass/_table-columns.scss
@@ -194,10 +194,6 @@ th.contributions {
   width: 50%;
 }
 
-th.num-teams {
-  width: 15%;
-}
-
 th.round {
   width: 15%;
 }