Skip to content

Commit 649c463

Browse files
dangerwormdangerworm
authored
Merge branch 'release' into master
2 parents 4b3af5a + c7c6440 commit 649c463

File tree

16 files changed

+109
-65
lines changed

16 files changed

+109
-65
lines changed

‎404.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ <h2>404 Not Found</h2>
1717
Sorry, an error has occurred. Requested page not found!
1818
</div>
1919
<div class="error-actions">
20-
<a href="index.html" class="btn btn-primary btn-lg"><span class="fas fa-home"></span>Take Me Home</a>
21-
<a href="contact.html" class="btn btn-primary btn-lg"><span class="fas fa-envelope"></span> Contact Us </a>
20+
<a href="{{site.url}}" class="btn btn-primary btn-lg"><span class="fas fa-home"></span>Take Me Home</a>
21+
<a href="contact" class="btn btn-primary btn-lg"><span class="fas fa-envelope"></span> Contact Us </a>
2222
</div>
2323
</div>
2424
</div>

‎_includes/sidebar.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,62 +9,62 @@
99
</div>
1010
</div>
1111
<div class="logo sidebar-logo">
12-
<a href="index.html">
12+
<a href="{{site.url}}">
1313
<img class="sidebar-logo" src="./images/noun-keyboard-licensed-white.svg">
1414
</a>
1515
</div>
1616
<div class="sidebar-menu">
1717
<ul>
1818
<li class="sidebar-dropdown">
19-
<a href="index.html">
19+
<a href="{{site.url}}">
2020
<i class="fa fa-home"></i>
2121
<span>Home</span>
2222
</a>
2323
</li>
2424
<li class="sidebar-dropdown">
25-
<a href="events.html">
25+
<a href="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.html">
31+
<a href="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.html">
37+
<a href="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.html">
43+
<a href="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.html">
49+
<a href="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.html">
55+
<a href="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.html">
61+
<a href="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.html">
67+
<a href="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="index.html"><img src="./images/keyboard-green.png"></a>
17+
<a href="{{site.url}}"><img src="./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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h2>History</h2>
3030
<p>
3131
Over the years CodeUp spread to twenty different locations with multiple different organisers, and CodeWith is
3232
now consolidating that knowledge and experience into a single committee of organisers and mentors who run regular
33-
events. You can find out more about our committee and mentors on the <a href="people.html">people page</a>.
33+
events. You can find out more about our committee and mentors on the <a href="people">people page</a>.
3434
</p>
3535

3636
<h3>Committee</h3>
@@ -41,31 +41,31 @@ <h3>Committee</h3>
4141
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
4242
<img class="profile-photo" src="images/drew-profile-photo.png">
4343
<br />
44-
<h4><a href="people.html#drew-morgan">Drew Morgan</a></h4>
44+
<h4><a href="people#drew-morgan">Drew Morgan</a></h4>
4545
<smaller>Benevolent Leader</smaller>
4646
</div>
4747
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
4848
<img class="profile-photo" src="images/keiran-profile-photo.png">
4949
<br />
50-
<h4><a href="people.html#keiran-wilkinson">Keiran Wilkinson</a></h4>
50+
<h4><a href="people#keiran-wilkinson">Keiran Wilkinson</a></h4>
5151
<smaller>Vice Benevolent Leader</smaller>
5252
</div>
5353
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
5454
<img class="profile-photo" src="images/jim-profile-photo.png">
5555
<br />
56-
<h4><a href="people.html#jim-evans">Jim Evans</a></h4>
56+
<h4><a href="people#jim-evans">Jim Evans</a></h4>
5757
<smaller>Secretary</smaller>
5858
</div>
5959
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
6060
<img class="profile-photo" src="images/simon-profile-photo.png">
6161
<br />
62-
<h4>Simon Davey</h4>
63-
<smaller>Equity Officer</smaller>
62+
<h4><a href="people#simon-davey">Simon Davey</a></h4>
63+
<smaller>Interim Equity Officer</smaller>
6464
</div>
6565
<div class="col-sm-5 col-md-4 col-lg-3 card text-center">
6666
<img class="profile-photo" src="images/sean-profile-photo.png">
6767
<br />
68-
<h4><a href="people.html#sean-omahoney">Sean O'Mahoney</a></h4>
68+
<h4><a href="people#sean-omahoney">Sean O'Mahoney</a></h4>
6969
<smaller>Publicity Officer</smaller>
7070
</div>
7171
</div>

‎activities.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- CSSTricks,
88
- FreeCodeCamp,
99
- git,
10-
- Javascript,
10+
- JavaScript,
1111
- Udemy,
1212
- #100DaysOfCode,
1313
- AdventOfCode,

‎branding.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ <h2>Colours</h2>
7676

7777
<p>Please ensure that text-background pairings have sufficient colour contrast for everyone to read. See information
7878
from the WCAG on colour contrast <a
79-
href="https://www.w3.org/TR/UNDERSTANDING-WCAG20/visual-audio-contrast-contrast.html" target="_blank"
79+
href="https://www.w3.org/TR/UNDERSTANDING-WCAG20/visual-audio-contrast-contrast" target="_blank"
8080
rel="noopener">here</a> and a useful contrast checking tool <a href="https://contrastchecker.com/"
8181
target="_blank" rel="noopener">here</a>.</p>
8282

‎events.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ <h1>{{page.title}}</h1>
1616
<a href="#workshops">scheduled workshops</a>; you can read more about each of these below.
1717
</p>
1818
<p>
19-
Before attending any CodeWith event, please read our <a href="code-of-conduct.html">Code of Conduct</a>, which
19+
Before attending any CodeWith event, please read our <a href="code-of-conduct">Code of Conduct</a>, which
2020
applies to all events we run. All speakers, mentors, and attendees must agree with this; it helps us all to
2121
understand the community&apos;s shared values and provides clear guidelines on how we should behave.
2222
</p>

‎images/simon-profile-photo.png‎

131 KB
Loading

‎index.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ <h1>Welcome to CodeWith!</h1>
4848
<div class="row intro">
4949
<div class="col-sm-3 col-md-2 text-center">
5050
<p class="intro-icon">
51-
<a href="events.html"><span class="fas fa-3x fa-calendar-alt"></span></a>
51+
<a href="events"><span class="fas fa-3x fa-calendar-alt"></span></a>
5252
</p>
5353
</div>
5454
<div class="col-sm-9 col-md-10">
@@ -59,15 +59,15 @@ <h1>Welcome to CodeWith!</h1>
5959
</p>
6060
<p class="intro-text">
6161
For more information about the workshops, events, and drop-ins, have a look at the
62-
<a href="events.html">events page</a>.
62+
<a href="events">events page</a>.
6363
</p>
6464
</div>
6565
</div>
6666

6767
<div class="row intro">
6868
<div class="col-sm-3 col-md-2 text-center">
6969
<p class="intro-icon">
70-
<a href="about.html"><span class="fas fa-3x fa-book-open"></span></a>
70+
<a href="about"><span class="fas fa-3x fa-book-open"></span></a>
7171
</p>
7272
</div>
7373
<div class="col-sm-9 col-md-10">
@@ -78,35 +78,35 @@ <h1>Welcome to CodeWith!</h1>
7878
<p class="intro-text">
7979
We offer a friendly space where anyone, from complete beginners to accomplished software engineers, can get
8080
together with like-minded people to learn and share a passion for coding. For more information, check out
81-
our <a href="about.html">about page</a>.
81+
our <a href="about">about page</a>.
8282
</p>
8383
</div>
8484
</div>
8585

8686
<div class="row intro">
8787
<div class="col-sm-3 col-md-2 text-center">
8888
<p class="intro-icon">
89-
<a href="contact.html"><span class="fas fa-3x fa-envelope"></span></a>
89+
<a href="contact"><span class="fas fa-3x fa-envelope"></span></a>
9090
</p>
9191
</div>
9292
<div class="col-sm-9 col-md-10">
9393
<p class="intro-text">
9494
<strong>Stay up to date!</strong> There will be a lot of announcements over the coming
9595
weeks and the best way to hear about what we're doing is to sign up to our mailing list. There's a form
96-
where you can give us your details on our <a href="contact.html">contact page</a>.
96+
where you can give us your details on our <a href="contact">contact page</a>.
9797
</p>
9898
</div>
9999
</div>
100100

101101
<div class="row intro">
102102
<div class="col-sm-3 col-md-2 text-center">
103103
<p class="intro-icon">
104-
<a href="feedback.html"><span class="fas fa-3x fa-smile"></span></a>
104+
<a href="feedback"><span class="fas fa-3x fa-smile"></span></a>
105105
</p>
106106
</div>
107107
<div class="col-sm-9 col-md-10">
108108
<p class="intro-text">
109-
We'd love to hear your feedback. Let us know your thoughts on our <a href="feedback.html">feedback form</a>.
109+
We'd love to hear your feedback. Let us know your thoughts on our <a href="feedback">feedback form</a>.
110110
</p>
111111
</div>
112112
</div>

‎pages-events/events-drop-ins.html‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -73,33 +73,4 @@ <h3>National Coding Week</h3>
7373
</div>
7474
</div>
7575
</div>
76-
<div class="row card">
77-
<div class="col-12">
78-
<div class="row">
79-
<div class="col-sm-4 col-lg-2 event-date">
80-
<span class="event-date-month">OCT</span>
81-
<span class="event-date-day">12</span>
82-
<p>
83-
<span class="event-date-start-time">7pm - </span>
84-
85-
<span class="event-date-end-time">9pm</span>
86-
</p>
87-
</div>
88-
<div class="col-sm-8 col-lg-10 event-title">
89-
<span class="event-title">CodeWith Drop-In</span>
90-
</div>
91-
</div>
92-
<div class="row">
93-
<div class="col-md-12 col-lg-9 event-description">
94-
<span class="event-description">
95-
An ad-hoc event for anyone who would like help with coding or coding-related stuff. This can be
96-
something related to one of our workshops, a question about how to get started, or anything else! </span>
97-
</div>
98-
<div class="col-md-12 col-lg-3 event-book-button">
99-
<a class="btn btn-primary float-right" type="button" href="https://join.codewith.org.uk">Jitsi Link
100-
<span class="fas fa-link"></span></a>
101-
</div>
102-
</div>
103-
</div>
104-
</div>
10576
</section>

0 commit comments

Comments
 (0)