Skip to content

Commit 65c9023

Browse files
KeiranWDigitalKeiranWDigital
committed
Merge branch 'master' into release
2 parents f39ce68 + 20cf28b commit 65c9023

File tree

16 files changed

+104
-80
lines changed

16 files changed

+104
-80
lines changed

‎_includes/head.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@
1818

1919
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
2020
<!--[if lt IE 9]><script src="/js/ie8-responsive-file-warning.js"></script><![endif]-->
21-
<script src="./js/ie-emulation-modes-warning.js"></script>
21+
<script src="{{site.url}}/js/ie-emulation-modes-warning.js"></script>
2222

2323
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
24-
<link href="./css/ie10-viewport-bug-workaround.css" rel="stylesheet">
24+
<link href="{{site.url}}/css/ie10-viewport-bug-workaround.css" rel="stylesheet">
2525

2626
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
2727
<!--[if lt IE 9]>
2828
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
2929
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
3030
<![endif]-->
3131

32-
<link rel="icon" href="./favicon.ico">
32+
<link rel="icon" href="{{site.url}}/favicon.ico">
3333
<link rel="stylesheet" crossorigin="anonymous" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk">
3434
<!-- <link rel="stylesheet" crossorigin="anonymous" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"> -->
3535
<link rel="stylesheet" crossorigin="anonymous" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.14.0/css/all.min.css" integrity="sha512-1PKOgIY59xJ8Co8+NE6FZ+LOAZKjy+KY8iq0G4B3CyeY6wYHN3yt9PW0XpSriVlkMXe40PTKnXrLnZ9+fkDaog=="/>
3636
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Boogaloo&family=Roboto&display=swap">
3737

38-
<link rel="stylesheet" href="./css/open-dyslexic.css" type="text/css" charset="utf-8" />
38+
<link rel="stylesheet" href="{{site.url}}/css/open-dyslexic.css" type="text/css" charset="utf-8" />
3939

40-
<link rel="stylesheet" href="css/style.css">
41-
<link rel="stylesheet" href="css/sidebar.css">
40+
<link rel="stylesheet" href="{{site.url}}/css/style.css">
41+
<link rel="stylesheet" href="{{site.url}}/css/sidebar.css">
4242

4343
<!-- I know scripts aren't supposed to go in the header, but we need this here in order to pick different suffix lists for the typewriter at the top -->
4444
<script lang="javascript">

‎_includes/person.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="row person-blurb">
33
<div class="col-md-4 col-lg-5 col-xl-3">
44
<div class="mb-2 box-shadow text-center">
5-
<img class="profile-photo" src="./images/{{ include.person.photo | default: 'keyboard-green.png' }}" />
5+
<img class="profile-photo" src="{{site.url}}/images/{{ include.person.photo | default: 'keyboard-green.png' }}" />
66
</div>
77
<div class="col-12 text-center">
88
<h4>{{ include.person.first_name }} {{ include.person.last_name }}</h4>

‎_includes/scripts.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<script crossorigin="anonymous" src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
1313
integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"></script>
1414

15-
<script type="text/javascript" src="./js/change-font.js"></script>
16-
<script type="text/javascript" src="./js/check-width.js"></script>
17-
<script type="text/javascript" src="./js/sidebar.js"></script>
18-
<script type="text/javascript" src="./js/typed-suffix.js"></script>
15+
<script type="text/javascript" src="{{site.url}}/js/change-font.js"></script>
16+
<script type="text/javascript" src="{{site.url}}/js/check-width.js"></script>
17+
<script type="text/javascript" src="{{site.url}}/js/sidebar.js"></script>
18+
<script type="text/javascript" src="{{site.url}}/js/typed-suffix.js"></script>
1919

2020
<!-- Page-specific scripts -->
2121
<script type="text/javascript">

‎_includes/sidebar.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</div>
1111
<div class="logo sidebar-logo">
1212
<a href="{{site.url}}">
13-
<img class="sidebar-logo" src="./images/noun-keyboard-licensed-white.svg">
13+
<img class="sidebar-logo" src="{{site.url}}/images/noun-keyboard-licensed-white.svg">
1414
</a>
1515
</div>
1616
<div class="sidebar-menu">
@@ -22,49 +22,49 @@
2222
</a>
2323
</li>
2424
<li class="sidebar-dropdown">
25-
<a href="events">
25+
<a href="{{site.url}}/events">
2626
<i class="fa fa-calendar-alt"></i>
2727
<span>Events</span>
2828
</a>
2929
</li>
3030
<li class="sidebar-dropdown">
31-
<a href="about">
31+
<a href="{{site.url}}/about">
3232
<i class="fas fa-chalkboard-teacher"></i>
3333
<span>About</span>
3434
</a>
3535
</li>
3636
<li class="sidebar-dropdown">
37-
<a href="activities">
37+
<a href="{{site.url}}/activities">
3838
<i class="fa fa-bell"></i>
3939
<span>Activities</span>
4040
</a>
4141
</li>
4242
<li class="sidebar-dropdown">
43-
<a href="resources">
43+
<a href="{{site.url}}/resources">
4444
<i class="fa fa-tools"></i>
4545
<span>Resources</span>
4646
</a>
4747
</li>
4848
<li class="sidebar-dropdown">
49-
<a href="people">
49+
<a href="{{site.url}}/people">
5050
<i class="fa fa-users"></i>
5151
<span>People</span>
5252
</a>
5353
</li>
5454
<li class="sidebar-dropdown">
55-
<a href="contact">
55+
<a href="{{site.url}}/contact">
5656
<i class="fa fa-address-book"></i>
5757
<span>Contact</span>
5858
</a>
5959
</li>
6060
<li class="sidebar-dropdown">
61-
<a href="feedback">
61+
<a href="{{site.url}}/feedback">
6262
<i class="fa fa-comment-alt"></i>
6363
<span>Feedback</span>
6464
</a>
6565
</li>
6666
<li class="sidebar-dropdown">
67-
<a href="branding">
67+
<a href="{{site.url}}/branding">
6868
<i class="fas fa-palette"></i>
6969
<span>Branding</span>
7070
</a>

‎_layouts/default.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<main role="main" class="page-content" id="page-content">
1515
<div class="row">
1616
<div class="main-logo">
17-
<a href="{{site.url}}"><img src="./images/keyboard-green.png"></a>
17+
<a href="{{site.url}}"><img src="{{site.url}}/images/keyboard-green.png"></a>
1818
</div>
1919
<div class="main-logo-title">
2020
<h1 class="cover-heading">CODEWITH<span id="small-screen-break"><br /></span><span id="suffix" class="typed-suffix">US</span></h1>

‎about.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h2>History</h2>
3131
<p>
3232
Over the years CodeUp spread to twenty different locations with multiple different organisers, and CodeWith is
3333
now consolidating that knowledge and experience into a single committee of organisers and mentors who run regular
34-
events. You can find out more about our committee and mentors on the <a href="people">people page</a>.
34+
events. You can find out more about our committee and mentors on the <a href="{{site.url}}/people">people page</a>.
3535
</p>
3636

3737
<h3>Committee</h3>
@@ -40,33 +40,33 @@ <h3>Committee</h3>
4040
</p>
4141
<div class="row committee-photos">
4242
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
43-
<img class="profile-photo" src="images/drew-profile-photo.png">
43+
<img class="profile-photo" src="{{site.url}}/images/drew-profile-photo.png">
4444
<br />
45-
<h4><a href="people#drew-morgan">Drew Morgan</a></h4>
45+
<h4><a href="{{site.url}}/people#drew-morgan">Drew Morgan</a></h4>
4646
<smaller>Benevolent Leader</smaller>
4747
</div>
4848
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
49-
<img class="profile-photo" src="images/keiran-profile-photo.png">
49+
<img class="profile-photo" src="{{site.url}}/images/keiran-profile-photo.png">
5050
<br />
51-
<h4><a href="people#keiran-wilkinson">Keiran Wilkinson</a></h4>
51+
<h4><a href="{{site.url}}/people#keiran-wilkinson">Keiran Wilkinson</a></h4>
5252
<smaller>Vice Benevolent Leader</smaller>
5353
</div>
5454
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
55-
<img class="profile-photo" src="images/jim-profile-photo.png">
55+
<img class="profile-photo" src="{{site.url}}/images/jim-profile-photo.png">
5656
<br />
57-
<h4><a href="people#jim-evans">Jim Evans</a></h4>
57+
<h4><a href="{{site.url}}/people#jim-evans">Jim Evans</a></h4>
5858
<smaller>Secretary</smaller>
5959
</div>
6060
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
61-
<img class="profile-photo" src="images/simon-profile-photo.png">
61+
<img class="profile-photo" src="{{site.url}}/images/simon-profile-photo.png">
6262
<br />
63-
<h4><a href="people#simon-davey">Simon Davey</a></h4>
63+
<h4><a href="{{site.url}}/people#simon-davey">Simon Davey</a></h4>
6464
<smaller>Interim Equity Officer</smaller>
6565
</div>
6666
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
67-
<img class="profile-photo" src="images/sean-profile-photo.png">
67+
<img class="profile-photo" src="{{site.url}}/images/sean-profile-photo.png">
6868
<br />
69-
<h4><a href="people#sean-omahoney">Sean O'Mahoney</a></h4>
69+
<h4><a href="{{site.url}}/people#sean-omahoney">Sean O'Mahoney</a></h4>
7070
<smaller>Publicity Officer</smaller>
7171
</div>
7272
</div>

‎branding.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ <h2>Logo</h2>
8888
<h3>Full CodeWith Logo</h3>
8989
<div class="row">
9090
<div class="col-5 col-lg-3 card text-center">
91-
<img class="img-fluid" src="images/logo/logo.svg" aria-labelledby="logo-label-full-svg">
91+
<img class="img-fluid" src="{{site.url}}/images/logo/logo.svg" aria-labelledby="logo-label-full-svg">
9292
<br />
9393
<h4 id="logo-label-full-svg">CodeWith Logo (SVG)</h4>
9494
</div>
9595
<div class="col-5 col-lg-3 card text-center">
96-
<img class="img-fluid" src="images/logo/logo.png" aria-labelledby="logo-label-full-png">
96+
<img class="img-fluid" src="{{site.url}}/images/logo/logo.png" aria-labelledby="logo-label-full-png">
9797
<br />
9898
<h4 id="logo-label-full-png">CodeWith Logo (PNG)</h4>
9999
</div>
@@ -107,12 +107,12 @@ <h4 class="mt-3">Full CodeWith Logo</h4>
107107
<h3>Full CodeWith Logo (White)</h3>
108108
<div class="row">
109109
<div class="col-5 col-lg-3 card text-center white-asset">
110-
<img class="img-fluid" src="images/logo/logo-white.svg" aria-labelledby="logo-label-full-white-svg">
110+
<img class="img-fluid" src="{{site.url}}/images/logo/logo-white.svg" aria-labelledby="logo-label-full-white-svg">
111111
<br />
112112
<h4 id="logo-label-full-white-svg">CodeWith Logo (White) (SVG)</h4>
113113
</div>
114114
<div class="col-5 col-lg-3 card text-center white-asset">
115-
<img class="img-fluid" src="images/logo/logo-white.png" aria-labelledby="logo-label-full-white-png">
115+
<img class="img-fluid" src="{{site.url}}/images/logo/logo-white.png" aria-labelledby="logo-label-full-white-png">
116116
<br />
117117
<h4 id="logo-label-full-white-png">CodeWith Logo (White) (PNG)</h4>
118118
</div>
@@ -126,12 +126,12 @@ <h4 class="mt-3">Full CodeWith Logo (White)</h4>
126126
<h3>CodeWith Keyboard Icon</h3>
127127
<div class="row">
128128
<div class="col-5 col-lg-3 card text-center">
129-
<img class="img-fluid" src="images/keyboard-green.svg" aria-labelledby="logo-keyboard-green-svg">
129+
<img class="img-fluid" src="{{site.url}}/images/keyboard-green.svg" aria-labelledby="logo-keyboard-green-svg">
130130
<br />
131131
<h4 id="logo-keyboard-green-svg">CodeWith Keyboard Icon (SVG)</h4>
132132
</div>
133133
<div class="col-5 col-lg-3 card text-center">
134-
<img class="img-fluid" src="images/keyboard-green.png" aria-labelledby="logo-keyboard-green-png">
134+
<img class="img-fluid" src="{{site.url}}/images/keyboard-green.png" aria-labelledby="logo-keyboard-green-png">
135135
<br />
136136
<h4 id="logo-keyboard-green-png">CodeWith Keyboard Icon (PNG)</h4>
137137
</div>
@@ -144,12 +144,12 @@ <h4 class="mt-3">CodeWith Keyboard Icon</h4>
144144
<h3>CodeWith Keyboard Icon (White)</h3>
145145
<div class="row">
146146
<div class="col-5 col-lg-3 card text-center white-asset">
147-
<img class="img-fluid" src="images/noun-keyboard-licensed-white.svg" aria-labelledby="logo-keyboard-white-svg">
147+
<img class="img-fluid" src="{{site.url}}/images/noun-keyboard-licensed-white.svg" aria-labelledby="logo-keyboard-white-svg">
148148
<br />
149149
<h4 id="logo-keyboard-white-svg">CodeWith Keyboard Icon (White) (SVG)</h4>
150150
</div>
151151
<div class="col-5 col-lg-3 card text-center white-asset">
152-
<img class="img-fluid" src="images/noun-keyboard-licensed-white.png" aria-labelledby="logo-keyboard-white-png">
152+
<img class="img-fluid" src="{{site.url}}/images/noun-keyboard-licensed-white.png" aria-labelledby="logo-keyboard-white-png">
153153
<br />
154154
<h4 id="logo-keyboard-white-png">CodeWith Keyboard Icon (White) (PNG)</h4>
155155
</div>

0 commit comments

Comments
 (0)