Skip to content
This repository was archived by the owner on Jan 15, 2020. It is now read-only.

Commit 46a1adf

Browse files
authored
updating master with code for 2019 frosh (#29)
* added .vscode/ folder to gitignore folder * updated urls for say 2019 * added new theme phoro and images for gallery on site * - Added new favicon - changed all colour values of the old theme to current ones in all the css files i could find. - updated all the information as best i could * updated froshee signup link * updated date * updated signup link, team members, and links to other dsu events pages * changed links to signup form to be open in a new tab * had the wrong form link * note to self: jpg is different from JPG * adding logo back * uncommented something i forgot to
1 parent 2634928 commit 46a1adf

24 files changed

Lines changed: 81 additions & 194 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
*.pyc
22
db.sqlite3
3+
.vscode/
34
migrations/
45
.viminfo
56
.cache/

cms/static/cms/images/logo.png

19.7 KB
Loading

cms/static/frosh/css/bootstrap.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cms/static/frosh/css/overrides.css

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,18 +122,18 @@ h1 {
122122
}
123123

124124
.navbar-inverse {
125-
background-color: #00B75A;
126-
border-color: #00B75A;
125+
background-color: #08A8CC;
126+
border-color: #08A8CC;
127127
}
128128

129129
.navbar-inverse .navbar-nav>.active>a,
130130
.navbar-inverse .navbar-nav>.active>a:hover,
131131
.navbar-inverse .navbar-nav>.active>a:focus {
132-
background-color: #b7005d;
132+
background-color: #CC0854;
133133
}
134134

135135
.navbar-header a img {
136-
background-color: #00B75A;
136+
background-color: #08A8CC;
137137
padding: 4px 10px 4px 0px;
138138
}
139139

@@ -150,8 +150,8 @@ h1 {
150150
}
151151

152152
.carousel-indicators .active {
153-
background-color: #914220;
154-
border: 2px solid #914220;
153+
background-color: #CC0854;
154+
border: 2px solid #CC0854;
155155
}
156156

157157
#carousel {
@@ -199,7 +199,7 @@ h1 {
199199

200200
#footerwrap,
201201
#footerwrap a {
202-
background-color: #00B75A;
202+
background-color: #08A8CC;
203203
color: white;
204204
margin-top: 10px;
205205
padding-bottom: 5px;
3.14 MB
Loading

cms/static/frosh/img/favicon19.png

3.49 KB
Loading

cms/static/frosh/js/soon/custom.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ COMMING SOON PAGE
66
* Set your date here (YEAR, MONTH (0 for January/11 for December), DAY, HOUR, MINUTE, SECOND)
77
* according to the GMT+0 Timezone
88
**/
9-
var launch = new Date(2018, 8, 4, 11, 0, 0);
9+
var launch = new Date(2019, 8, 3, 11, 0, 0);
1010
/**
1111
* The script
1212
**/

cms/static/frosh/mainsite/css/bootstrap.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cms/static/frosh/mainsite/css/main.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ td a {
667667
.table-schedule tr:nth-child(odd) {}
668668

669669
.table-title {
670-
background-color: #00B75A;
670+
background-color: #08A8CC;
671671
color: #FFFFFF;
672672
}
673673

@@ -677,7 +677,7 @@ td a {
677677

678678
.emphasis,
679679
.question {
680-
color: #914220;
680+
color: #CC0854;
681681
}
682682

683683
.alt_emphasis {
@@ -695,11 +695,11 @@ td a {
695695

696696
h3 {
697697
color: white;
698-
background-color: #00B75A;
698+
background-color: #08A8CC;
699699
padding: 5px;
700700
}
701701

702-
.package ul li,
702+
.package ul li
703703
{
704704
color: #e88530;
705705
}
3.14 MB
Loading

0 commit comments

Comments
 (0)