Merge branch 'main' of github.com:ABTech/abtech.org

_data/index_carousel.json

@@ -1,8 +1,13 @@
 [
-  "griz-sc2016",
-  "pyro",
-  "lg2016",
-  "gs_sound",
-  "dejj-2014",
-  "ds"
+  "concert_f23_tde1",
+  "ds_f22_2",
+  "concert_f23_focusing",
+  "concert_f23_paperwork",
+  "concert_f17_2",
+  "ds_f22",
+  "concert_f22_2",
+  "concert_f23_crowd",
+  "welcome_back_f21",
+  "concert_f22",
+  "concert_f23_tde"
 ]

_data/services_carousels.json

@@ -1,14 +1,23 @@
 {
     "sound": [
         "f19_sound",
-        "tent19",
+        "concert_s22",
+        "concert_f23_mons",
         "dejj-2014",
         "gs_sound"
     ],
     "lighting": [
+        "griz-sc2016",
         "fcf19",
         "pars-and-stars",
-        "griz-sc2016",
-        "ds"
+        "concert_f17",
+        "pyro"
+    ],
+    "other": [
+        "csa_s24_sm",
+        "tent19",
+        "concert_s23",
+        "lg2016",
+        "ds_f21"
     ]
 }

_layouts/default.html

@@ -22,7 +22,7 @@
     {% include nav.html %}
 
     <main class="{% if page contains 'main_classes_override' %}{{ page.main_classes_override }}{% else %}flex-shrink-0 flex-grow-1 w-100{% endif %}" role="main">
-      <div class="container content-block d-block mx-auto pb-3">
+      <div class="container content-block d-block mx-auto pb-3 px-md-4">
         {{ content }}
       </div>
     </main>

_sass/pages/index.scss

@@ -22,7 +22,7 @@ header #main-nav {
 }
 #bg-carousel-gradient {
     z-index: -1;
-    background: linear-gradient(rgba(0,0,0,0), rgba(0,0,0,1));
+    background: linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.2));
 }
 
 main .content-block {
@@ -31,7 +31,7 @@ main .content-block {
     height: 100%;
     margin: 15px 0 30px 0;
     p {
-        background-color: rgba(0,0,0,0.8);
+        background-color: rgba(0,0,0,0.6);
     }
 }
 

_sass/variables.scss

@@ -5,7 +5,7 @@ $red:     #c20f2e;
 $primary:      $red;
 
 // Slow down carousel on honmepage
-$carousel-transition-duration: 2s;
+$carousel-transition-duration: 1.5s;
 
 // Don't underline links
 $link-decoration: none;

pages/people_hots.md

@@ -13,18 +13,20 @@ nav_page_specific: hots
 
 <hr class="bg-primary"/>
 
-<div class="col-12 col-sm-8 col-lg-6 col-xl-4 m-auto">
-  <table class="table table-striped table-bordered border-primary table-sm text-center">
-    <thead><tr class="bg-primary text-white">
-        <th scope="col">Year</th>
-        <th scope="col">Head(s) of Tech</th>
-    </tr></thead>
-    <tbody>
-        {% for hot in site.data.people_hots_hots %}<tr{% if forloop.first %} class="border-bottom-3"{% endif %}>
-            <td>{{ hot.year }}</td>
-            <td>{{ hot.name }}</td>
-        </tr>
-        {% endfor %}
-    </tbody>
-  </table>
+<div class="container">
+  <div class="col-md-7 m-auto">
+    <table class="table table-striped table-bordered border-primary table-sm text-center">
+      <thead><tr class="bg-primary text-white">
+          <th scope="col">Year</th>
+          <th scope="col">Head(s) of Tech</th>
+      </tr></thead>
+      <tbody>
+          {% for hot in site.data.people_hots_hots %}<tr{% if forloop.first %} class="border-bottom-3"{% endif %}>
+              <td><nobr>{{ hot.year }}</nobr></td>
+              <td>{{ hot.name }}</td>
+          </tr>
+          {% endfor %}
+      </tbody>
+    </table>
+  </div>
 </div>

pages/services.md

@@ -17,52 +17,60 @@ AB Tech provides sound and lighting services to organizations affiliated with or
 
 <div class="card mb-5 border-0">
   <div class="row g-0">
-    <div class="col-lg-8">
-      <div class="card-body p-0 pe-lg-3 mb-3 mb-lg-0">
+    <div class="col-lg-7">
+      <div class="card-body p-0 pe-lg-3 mb-3 mb-lg-0 p-2">
         <h3 class="card-title">Sound Reinforcement</h3>
         <p class="card-text">From small lectures and vocal performances to dance parties, large bands, and concerts, we are experienced in the art of sound reinforcement. Nearly all events, indoors or outdoors, can be handled with our own inventory. As necessary, we can also bring in required instruments and other equipment.</p>
         <p class="card-text">Popular services:</p>
         <ul class="card-text">
+          <li>Speaker Systems</li>
           <li>Wireless microphones</li>
           <li>Stage monitors</li>
-          <li>Band micing and mixing</li>
+          <li>Band mic-ing and mixing</li>
         </ul>
       </div>
     </div>
-    <div class="col-lg-4">
+    <div class="col-lg-5">
       {% include services_carousel.html name="sound" class="" %}
     </div>
   </div>
 </div>
 <div class="card mb-5 border-0">
   <div class="row g-0">
-    <div class="col-lg-4 order-2 order-lg-1">
-      {% include services_carousel.html name="lighting" class="" %}
-    </div>
-    <div class="col-lg-8 order-1 order-lg-2">
-      <div class="card-body p-0 ps-lg-3 mb-3 mb-lg-0">
+    <div class="col-lg-7">
+      <div class="card-body p-0 ps-lg-3 mb-3 mb-lg-0 p-2">
         <h3 class="card-title">Lighting</h3>
         <p class="card-text">We can provide lighting on the ground for small shows or setup spans of overhead lighting for larger events. We can provide profiles, spots, washes, uplighting, and effect lighting. We have traditional neutral and colored lighting as well as LEDs, moving lights, and strobes. We also have theatrical-grade haze and fog.</p>
         <p class="card-text">Popular services:</p>
         <ul class="card-text">
           <li>Uplighting</li>
           <li>Front wash</li>
           <li>Effects</li>
+          <li>Lighting Programming</li>
         </ul>
       </div>
     </div>
+    <div class="col-lg-5">
+      {% include services_carousel.html name="lighting" class="" %}
+    </div>
+  </div>
+</div>
+<div class="card mb-5 border-0">
+  <div class="row g-0">
+    <div class="col-lg-7">
+      <div class="card-body p-0 ps-lg-3 mb-3 mb-lg-0 p-2">
+        <h3 class="card-title">Production Services</h3>
+        <p class="card-text">In addition to Sound and Lighting, AB Tech also provides the following as support and standalone services. </p>
+        <p class="card-text"><strong> Staging: </strong>If your event requires additional staging material, we can coordinate the rental of stage components from outside contractors. We do not carry any staging ourselves.</p>
+        <p class="card-text"><strong> Stage Management: </strong>We will make sure that your show runs smoothly. We will coordinate performers moving on and off stage, playback of sound and video components, and lighting cues.</p>
+        <p class="card-text"><strong> Power: </strong>Larger shows, especially those with complex lighting requirements, will require more than wall power. We can provide, coordinate, and operate large power systems for you.</p>
+      </div>
+    </div>
+    <div class="col-lg-5">
+      {% include services_carousel.html name="other" class="" %}
+    </div>
   </div>
 </div>
-
-### Production Services
-
-**Staging:** If your event requires additional staging material, we can coordinate the rental of stage components from outside contractors. We do not carry any staging ourselves.
-
-**Stage Management:** We will make sure that your show runs smoothly. We will coordinate performers moving on and off stage, playback of sound and video components, and lighting cues.
-
-**Power:** Larger shows, especially those with complex lighting requirements, will require more than wall power. We can provide, coordinate, and operate large power systems for you.
-
-
 
 AB Tech does not officially provide video services other than large-format projection. We do not have large projection surfaces or recording/streaming equipment. If your event requires these services, we may subcontract [cmuTV](http://www.cmutv.org/){:target="_blank"} or [another local production company]({{ '/external/' | relative_url }}) at an additional charge. Similarly, AB Tech does not own any backline equipment (guitar amplifiers, drums, keyboards, or other musical instruments), but we are happy to help coordinate the appropriate rentals through a local backline rental company.