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 7 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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ build-iPhoneSimulator/

# for a library or gem, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# Gemfile.lock
Gemfile.lock
wjiang42 marked this conversation as resolved.
Show resolved Hide resolved
# .ruby-version
# .ruby-gemset

Expand Down
12 changes: 12 additions & 0 deletions _data/events_events.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@
},
"2010s": {
"2019": [
{
"name": "mxmtoon",
"date": "2019-11-13",
"venue": "The Underground",
"desc": "AB Underground. "
},
{
"name": "Antoni Porowski",
"date": "2019-11-06",
Expand Down Expand Up @@ -199,6 +205,12 @@
"venue": "The Cut",
"desc": "AB Concerts. Our first concert outdoors in a long time and the original opener dropped out last minute. "
},
{
"name": "Phoebe Bridgers",
"date": "2018-04-12",
"venue": "The Underground",
"desc": "AB Underground. "
},
{
"name": "Lovelytheband",
"date": "2018-03-05",
Expand Down
10 changes: 5 additions & 5 deletions _data/index_carousel.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[
"griz-sc2016",
"pyro",
"lg2016",
"f23_concert",
"gskam_f23",
"haichuas_f23",
"f23_concert_2",
"gs_sound",
"dejj-2014",
"ds"
"f23_concert_3"
]
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
Binary file added assets/img/carousel/astrasse.JPG
wjiang42 marked this conversation as resolved.
Show resolved Hide resolved
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/esprite.JPG
wjiang42 marked this conversation as resolved.
Show resolved Hide resolved
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/f23_concert.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/f23_concert_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/f23_concert_3.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/gskam_f23.JPG
wjiang42 marked this conversation as resolved.
Show resolved Hide resolved
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/haichuas_f23.JPG
wjiang42 marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading