Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Website main page changes and added past events #178

Merged
merged 26 commits into from
Apr 13, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5b5f437
Add new index images
wjiang42 Jan 27, 2024
84810e3
Add new photos
wjiang42 Jan 27, 2024
8931a9a
Add AB Underground mxmtoon and Phoebe Bridgers
wjiang42 Jan 27, 2024
b48ca2e
gitignore Gemfile
wjiang42 Jan 27, 2024
e385427
restore gemfile
wjiang42 Jan 27, 2024
1c58aec
reduce background tint on index
wjiang42 Jan 27, 2024
d9d4812
clean up .gitignore change
wjiang42 Jan 27, 2024
9494f92
Merge branch 'ABTech:main' into main
wjiang42 Feb 15, 2024
3933b04
Hasten Bootstrap Carousel Transitions
wjiang42 Feb 15, 2024
94bf896
Merge branch 'main' of https://github.com/wjiang42/abtech.org
wjiang42 Feb 15, 2024
57c33f4
Increase horizontal padding for all pages
wjiang42 Feb 15, 2024
9eebc63
Revamp of website index carousel photos, services carousel photos and…
wjiang42 Feb 15, 2024
db5cf82
Revert "clean up .gitignore change"
wjiang42 Feb 15, 2024
085bc0a
Revert "gitignore Gemfile"
wjiang42 Feb 15, 2024
f71fd29
Add more photos
wjiang42 Feb 17, 2024
12bb120
change carousel order
wjiang42 Mar 11, 2024
447c2d9
remove unused images
wjiang42 Mar 11, 2024
c96b55d
widen hots page
wjiang42 Mar 11, 2024
65b8a4f
Merge branch 'ABTech:main' into main
wjiang42 Mar 12, 2024
efe5cb5
add breakpoint for default padding
wjiang42 Mar 28, 2024
959d543
force year width
wjiang42 Mar 28, 2024
9535c42
Merge branch 'main' of https://github.com/wjiang42/abtech.org
wjiang42 Mar 28, 2024
b07d470
Merge branch 'ABTech:main' into main
wjiang42 Mar 28, 2024
259995d
Merge branch 'main' of https://github.com/wjiang42/abtech.org
wjiang42 Mar 28, 2024
27f6f0d
variable hots columns
wjiang42 Mar 28, 2024
9b31632
fix default padding breakpoint
wjiang42 Mar 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions _data/index_carousel.json
Original file line number Diff line number Diff line change
@@ -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"
]
15 changes: 12 additions & 3 deletions _data/services_carousels.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
2 changes: 1 addition & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -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-4">
{{ content }}
</div>
</main>
Expand Down
4 changes: 2 additions & 2 deletions _sass/pages/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion _sass/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Binary file added assets/img/carousel/concert_f17.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/concert_f17_2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/concert_f22.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/concert_f22_2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/concert_f23_crowd.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/concert_f23_focusing.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/concert_f23_mons.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/concert_f23_paperwork.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/concert_f23_tde.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/concert_f23_tde1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/concert_f23_tde2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/concert_s22.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/concert_s23.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/csa_s24_sm.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/img/carousel/ds.jpg
Binary file not shown.
Binary file added assets/img/carousel/ds_f21.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/ds_f22.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/ds_f22_2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/carousel/welcome_back_f21.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 16 additions & 14 deletions pages/people_hots.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-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>{{ hot.year }}</td>
<td>{{ hot.name }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
46 changes: 27 additions & 19 deletions pages/services.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Loading