-
Notifications
You must be signed in to change notification settings - Fork 0
/
mathscon.patch
179 lines (173 loc) · 6.6 KB
/
mathscon.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
diff --git a/aboutus.pug b/aboutus.pug
new file mode 100644
index 0000000..2e87465
--- /dev/null
+++ b/aboutus.pug
@@ -0,0 +1,56 @@
+doctype html
+html(lang='en')
+ head
+ meta(charset='utf-8')
+ meta(http-equiv='X-UA-Compatible', content='IE=edge')
+ meta(name='viewport', content='width=device-width, initial-scale=1')
+ meta(name='description', content='Maths Conference at Imperial College London')
+ meta(name='author', content='The Mathscon Team')
+
+ meta(name="theme-color" content="#171414")
+ // Windows Phone
+ meta(name="msapplication-navbutton-color" content="#171414")
+ // iOS Safari
+ meta(name="apple-mobile-web-app-capable" content="yes")
+ meta(name="apple-mobile-web-app-status-bar-style" content="black")
+
+ title mathscon.
+ // Bootstrap Core CSS
+ link(rel='icon', type='image/png', href='images/favicon.png')
+ link(href='vendor/bootstrap/css/bootstrap.min.css', rel='stylesheet')
+ link(href='css/slideshow.min.css', rel='stylesheet')
+ // Custom Fonts
+ link(href='vendor/font-awesome/css/font-awesome.min.css', rel='stylesheet', type='text/css')
+ // Theme CSS
+ link(href='css/creative.min.css', rel='stylesheet')
+ // HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries
+ // WARNING: Respond.js doesn't work if you view the page via file://
+ //if lt IE 9
+ script(src='https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js')
+ script(src='https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js')
+
+ body#page-top
+ include sections/nav_org
+
+ include sections/about_us
+
+ include sections/footer
+
+ // jQuery
+ script(src='vendor/jquery/jquery.min.js')
+ // Bootstrap Core JavaScript
+ script(src='vendor/bootstrap/js/bootstrap.min.js')
+ // Plugin JavaScript
+ script(src='https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js')
+ script(src='vendor/scrollreveal/scrollreveal.min.js')
+ script(src='vendor/magnific-popup/jquery.magnific-popup.min.js')
+ // Theme JavaScript
+ script(src='js/creative.min.js')
+
+ script.
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+ ga('create', 'UA-84869468-1', 'auto');
+ ga('send', 'pageview');
diff --git a/build b/build
index a892af4..0b18a0a 100755
--- a/build
+++ b/build
@@ -11,9 +11,11 @@ mkdir out/vendor
pug index.pug
pug organizers.pug
+pug aboutus.pug
mv index.html out/
mv organizers.html out/
+mv aboutus.html out/
gulp
diff --git a/index.pug b/index.pug
index 21d2ab0..b54f4d7 100644
--- a/index.pug
+++ b/index.pug
@@ -62,6 +62,8 @@ html(lang='en', xmlns="http://www.w3.org/1999/xhtml", xmlns:fb="http://ogp.me/ns
include sections/footer
+ include sections/portfolio
+
// jQuery
script(src='vendor/jquery/jquery.min.js')
// Bootstrap Core JavaScript
diff --git a/sections/nav.pug b/sections/nav.pug
index 9d35c28..5dc6cd2 100644
--- a/sections/nav.pug
+++ b/sections/nav.pug
@@ -13,7 +13,7 @@ nav#mainNav.navbar.navbar-default.navbar-default-i.navbar-fixed-top
#bs-example-navbar-collapse-1.collapse.navbar-collapse
ul.nav.navbar-nav.navbar-right
li
- a.page-scroll(href='#about-us') About Us
+ a.page-scroll(href='aboutus.html') About Us
li
a.page-scroll(href='#event') Event
li
diff --git a/sections/nav_org.pug b/sections/nav_org.pug
index aa8ddc9..be6a4d9 100644
--- a/sections/nav_org.pug
+++ b/sections/nav_org.pug
@@ -5,7 +5,7 @@ nav#mainNav.navbar.navbar-default.navbar-fixed-top
button.navbar-toggle.collapsed(type='button', data-toggle='collapse', data-target='#bs-example-navbar-collapse-1')
span.sr-only Toggle navigation
i.fa.fa-bars
- a.navbar-brand.page-scroll(href='index.html')
+ a.navbar-brand.page-scroll(href='#page-top')
| maths
span.text-primary con
| .
@@ -13,22 +13,25 @@ nav#mainNav.navbar.navbar-default.navbar-fixed-top
#bs-example-navbar-collapse-1.collapse.navbar-collapse
ul.nav.navbar-nav.navbar-right
li
- a.page-scroll(href='index.html#about') About
+ a.page-scroll(href='#about-us') About Us
li
- a.page-scroll(href='index.html#logistics') Venue
+ a.page-scroll(href='index.html#event') Event
li
a.page-scroll(href='index.html#speaker') Speakers
li
- a.page-scroll(href='index.html#partners') Partners
+ a.page-scroll(href='index.html#grant-application') Grant Application
li
- a.page-scroll(href='index.html#signupsponsor') Sign up
+ a.page-scroll(href='index.html#partners') Sponsors & Partners
li
a.page-scroll(href='index.html#tickets') Tickets
li
- a.page-scroll(href='#organizers') Organizers
+ a.page-scroll(href='index.html#signupsponsor') Sign Up
li
a.page-scroll(href='index.html#contact') Contact
+ li.dropdown
+ a.dropdown-toggle(href='#', data-toggle='dropdown') Previous Editions
+ ul.dropdown-menu
+ li
+ a(href='http://www.mathscon.com/february-2017') february 2017
// /.navbar-collapse
// /.container-fluid
-
-
diff --git a/sections/speakers/keynote.pug b/sections/speakers/keynote.pug
index 79e9947..792d3fe 100644
--- a/sections/speakers/keynote.pug
+++ b/sections/speakers/keynote.pug
@@ -23,24 +23,3 @@ br
img.img-responsive(src='images/speaker/mc2018/Simon_Singh.png', alt='')
.speaker-caption
h4 Simon Singh
- //.col-lg-3.col-xs-6.speaker-item
- // a.speaker-link(href='#conrad-wolfram', data-toggle='modal')
- // .speaker-hover
- // .speaker-hover-content
- // img.img-responsive(src='images/speaker/conrad_wolfram.png', alt='')
- // .speaker-caption
- // h4 Conrad Wolfram
- //.col-lg-3.col-xs-6.speaker-item
- // a.speaker-link(href='#rob-eastaway', data-toggle='modal')
- // .speaker-hover
- // .speaker-hover-content
- // img.img-responsive(src='images/speaker/rob_eastaway.png', alt='')
- // .speaker-caption
- // h4 Rob Eastaway
- //.col-lg-3.col-xs-6.speaker-item
- // a.speaker-link(href='#martin-hairer', data-toggle='modal')
- // .speaker-hover
- // .speaker-hover-content
- // img.img-responsive(src='images/speaker/martin_hairer.png', alt='')
- // .speaker-caption
- // h4 Martin Hairer FRS