Skip to content
This repository was archived by the owner on Jan 15, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*.pyc
db.sqlite3
.vscode/
migrations/
.viminfo
.cache/
Binary file added cms/static/cms/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions cms/static/frosh/css/bootstrap.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions cms/static/frosh/css/overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -122,18 +122,18 @@ h1 {
}

.navbar-inverse {
background-color: #00B75A;
border-color: #00B75A;
background-color: #08A8CC;
border-color: #08A8CC;
}

.navbar-inverse .navbar-nav>.active>a,
.navbar-inverse .navbar-nav>.active>a:hover,
.navbar-inverse .navbar-nav>.active>a:focus {
background-color: #b7005d;
background-color: #CC0854;
}

.navbar-header a img {
background-color: #00B75A;
background-color: #08A8CC;
padding: 4px 10px 4px 0px;
}

Expand All @@ -150,8 +150,8 @@ h1 {
}

.carousel-indicators .active {
background-color: #914220;
border: 2px solid #914220;
background-color: #CC0854;
border: 2px solid #CC0854;
}

#carousel {
Expand Down Expand Up @@ -199,7 +199,7 @@ h1 {

#footerwrap,
#footerwrap a {
background-color: #00B75A;
background-color: #08A8CC;
color: white;
margin-top: 10px;
padding-bottom: 5px;
Expand Down
Binary file added cms/static/frosh/img/FROSH_THEME_2019.png
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 cms/static/frosh/img/favicon19.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion cms/static/frosh/js/soon/custom.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ COMMING SOON PAGE
* Set your date here (YEAR, MONTH (0 for January/11 for December), DAY, HOUR, MINUTE, SECOND)
* according to the GMT+0 Timezone
**/
var launch = new Date(2018, 8, 4, 11, 0, 0);
var launch = new Date(2019, 8, 3, 11, 0, 0);
/**
* The script
**/
Expand Down
4 changes: 2 additions & 2 deletions cms/static/frosh/mainsite/css/bootstrap.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions cms/static/frosh/mainsite/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ td a {
.table-schedule tr:nth-child(odd) {}

.table-title {
background-color: #00B75A;
background-color: #08A8CC;
color: #FFFFFF;
}

Expand All @@ -677,7 +677,7 @@ td a {

.emphasis,
.question {
color: #914220;
color: #CC0854;
}

.alt_emphasis {
Expand All @@ -695,11 +695,11 @@ td a {

h3 {
color: white;
background-color: #00B75A;
background-color: #08A8CC;
padding: 5px;
}

.package ul li,
.package ul li
{
color: #e88530;
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
220 changes: 53 additions & 167 deletions frosh/templates/frosh/frosh.html

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions frosh/templates/frosh/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="CSSS Frosh Week 2018" />
<meta name="description" content="Frosh Week 2019" />
<meta name="author" content="Jace Manshadi" />
<meta name="creator" content="Jace Manshadi" />
<meta name="attribution_parties" content="SHIELD free bootstrap theme - blacktie.co licensed under CC3">
<link rel="shortcut icon" href="{% static 'frosh/img/favicon.png' %}">
<link rel="shortcut icon" href="{% static 'frosh/img/favicon19.png' %}">

<title>Computing Science Student Society Frosh 2018</title <!-- Bootstrap core CSS -->
<title>Computing Science Student Society Frosh 2019</title <!-- Bootstrap core CSS -->
<link href="{% static 'frosh/css/bootstrap.css' %}" rel="stylesheet">

<!-- Custom styles for this template -->
Expand Down Expand Up @@ -40,7 +40,7 @@
<header class="row">
<div class="col-xs-10 col-xs-offset-1">
<!-- HEADLINE -->
<h1 data-animated="GoIn">Computing Science Student Society Frosh 2018</h1>
<h1 data-animated="GoIn">Computing Science Student Society Frosh 2019</h1>
</div>
</header>

Expand Down Expand Up @@ -71,7 +71,7 @@ <h1 data-animated="GoIn">Computing Science Student Society Frosh 2018</h1>
<!-- START TIMER -->

<div class="row">
<img class="img-responsive center-block" src="{% static 'frosh/img/FROSH_THEME_2018.jpg' %}">
<img class="img-responsive center-block" src="{% static 'frosh/img/FROSH_THEME_2019.png' %}">
</div>

<div class="row">
Expand All @@ -85,8 +85,8 @@ <h1 data-animated="GoIn">Computing Science Student Society Frosh 2018</h1>

<div class="row">
<div class="col-lg-4 col-lg-offset-4 mt centered">
<button type="button" class="btn btn-warning" onclick='window.location.href = "https://docs.google.com/forms/d/e/1FAIpQLSc4_NHobwOhyaNWXDNgb_zkD-JuNUPt9rC6L9giQC7LxLHG2A/viewform?usp=sf_link";'>Sign Up Now!</button>
<button type="button" class="btn btn-default" onclick='window.location.href = "frosh2018";'><a href="frosh2018">Enter Website!</a></button>
<button type="button" class="btn btn-warning" onclick='window.open("https://docs.google.com/forms/d/e/1FAIpQLScO07pW3Tt8J9RewBelOuvzWzbNBtkvvDt3cAupJntcHyCWIA/viewform?usp=sf_link");'>Sign Up Now!</button>
<button type="button" class="btn btn-default" onclick='window.location.href = "frosh2019";'><a href="frosh2019">Enter Website!</a></button>
</div>
</div>
<!-- END TIMER -->
Expand All @@ -106,11 +106,11 @@ <h1>Sponsored by: </h1>
<!-- Placed at the end of the document so the pages load faster -->
<script>
function registerRedirect() {
window.location.href = "https://docs.google.com/forms/d/e/1FAIpQLSc4_NHobwOhyaNWXDNgb_zkD-JuNUPt9rC6L9giQC7LxLHG2A/viewform?usp=sf_link";
window.location.href = "https://docs.google.com/forms/d/e/1FAIpQLScO07pW3Tt8J9RewBelOuvzWzbNBtkvvDt3cAupJntcHyCWIA/viewform?usp=sf_link";
}

function mainsiteRedirect() {
window.location.href = "frosh2018";
window.location.href = "frosh2019";
}
</script>
<script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous">
Expand Down
2 changes: 1 addition & 1 deletion frosh/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
from . import views

urlpatterns = [
url(r'^frosh2018/', views.frosh2018, name='frosh2018'),
url(r'^frosh2019/', views.frosh2019, name='frosh2019'),
url(r'^$', views.index, name='index'),
]
2 changes: 1 addition & 1 deletion frosh/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
def index(request):
return render(request, 'frosh/index.html')

def frosh2018(request):
def frosh2019(request):
return render(request, 'frosh/frosh.html')