Skip to content

Commit 096c8f3

Browse files
author
Andy Li
committed
Merge remote-tracking branch 'origin/master'
2 parents d142537 + e3ef2ad commit 096c8f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+11679
-11196
lines changed
File renamed without changes.

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.vscode
2+
node_modules

.index.html.swp

52 KB
Binary file not shown.

.prettierignore

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
css/animate.min.css
2+
css/bootstrap.min.css
3+
css/fontawesome.min.css
4+
css/hamburger.min.css
5+
6+
js/bootstrap.min.js
7+
js/jquery-3.5.1.min.js
8+
js/jquery.visible.min.js
9+
js/sweetalert.min.js
10+
js/velocity.min.js
11+
js/vivus.js
12+
13+
.gitignore
14+
.prettierignore

LICENSE.md

-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1717
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1818
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
1919
SOFTWARE.
20-
21-
# Copyright (c) 2020 ThetaHacks

README.md

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
1-
![](/img/logo/logotext.png)
1+
![](/img/logo/logo_text.png)
22

33
# ThetaHacks Official Website
4-
The official site for ThetaHacks, a high school hackathon located in Sunnyvale, CA.
4+
5+
The official site for ThetaHacks, a high school hackathon located in Sunnyvale, CA.
56

67
ThetaHacks will be a 24-hour in-person hackathon, with teams of up to four persons.
78

89
Due to COVID-19, the official date for the 2021 in-person hackathon has not been determined yet. We will be monitoring conditions to decide when it is safe enough to hold the hackathon. Currently, we are aiming to host the hackathon around February, but this is by no means a final date.
910

1011
### Team
12+
1113
We are not accepting any more team members. The only way to join our team is by an invitation from one of the coordinators.
1214

1315
<strong>Coordinators</strong>: Anshul Gupta, Andy Li, Rohan Bansal<br>
1416
<strong>Tech</strong>: Yixuan Qiao<br>
1517
<strong>Sponsorships</strong>: Aanika Jain, Colin Harper<br>
1618
<strong>Design</strong>: Adarsh Krishnan, Archish Ray<br>
1719

18-
1920
### Website
21+
2022
https://thetahacks.tech
2123

2224
Website created by **AndyLi23**, **Rohan-Bansal**, **theAnshulGupta**, and **yixqiao**.
2325

2426
### Sign up Today!
27+
2528
Student: Signups not released
2629
Mentor: Signups on website!
2730

2831
### Join our Discord!
32+
2933
Discord: Going public soon!
30-
Discord Bot: https://github.com/ThetaHacks/ThetaHacksBot
34+
Discord Bot: https://github.com/ThetaHacks/ThetaHacksBot
3135

3236
### Be sure to follow us on social media!
37+
3338
Instagram: @ThetaHacks
3439
Twitter: @ThetaHacks
3540

css/animate.min.css

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/bootstrap.min.css

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/fixparallax.css

Whitespace-only changes.

css/fontawesome.min.css

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/form2.css

-56
This file was deleted.

css/hamburger.min.css

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)