Skip to content

Commit 5540ef7

Browse files
KeiranWDigitalKeiranWDigital
committed
Merge branch 'release'
2 parents b39b393 + 7b494ef commit 5540ef7

File tree

15 files changed

+2629
-905
lines changed

15 files changed

+2629
-905
lines changed

‎_data/questions/how-to-mentor.yaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ question: "How do I become a mentor/event organiser?"
33
answer: " <p>
44
First of all, let someone know you're interested. Have a chat with one of the existing mentors or
55
someone on the committee so that we can get an idea of what you want to achieve and what support you
6-
need. From there we'll be able to add you into the appropriate Slack channels, give you a folder
7-
of your own in our Google Drive, show you how to set up events, and so on.
6+
need.
7+
</p>
8+
<p>
9+
When you're ready to begin mentoring, complete the
10+
<a href=\"!SITE_URL!/mentor-application\">mentor application form</a>. From there we'll be able to
11+
add you into the appropriate Slack channels, give you a folder of your own in our Google Drive, show
12+
you how to set up events, and so on.
813
</p>"
14+
15+

‎_includes/question.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<div id="collapse-{{ include.question.name }}" class="collapse" aria-labelledby="heading-{{ include.question.name }}" data-parent="#accordion">
1010
<div class="card-body">
1111
<p>
12-
{{ include.question.answer }}
12+
{{ include.question.answer | replace: '!SITE_URL!', site.url }}
1313
</p>
1414
</div>
1515
</div>

‎_layouts/admin.html‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
{% include head.html %}
4+
5+
<body>
6+
<a class="sr-only sr-only-focusable" href="#page-content">Skip to main content</a>
7+
<!-- Google Tag Manager (noscript) -->
8+
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WPSF3G7" height="0" width="0"
9+
style="display:none;visibility:hidden"></iframe></noscript>
10+
<!-- End Google Tag Manager (noscript) -->
11+
12+
<div id="main-container" class="page-wrapper toggled">
13+
{% include sidebar.html %}
14+
<main role="main" class="page-content" id="page-content">
15+
<div class="row">
16+
<div class="main-logo">
17+
<a href="{{site.url}}"><img src="{{site.url}}/images/keyboard-green.png"></a>
18+
</div>
19+
<div class="main-logo-title">
20+
<h1 class="cover-heading">CODEWITH<span id="small-screen-break"><br /></span><span id="suffix"
21+
class="typed-suffix">US</span></h1>
22+
</div>
23+
</div>
24+
<div class="row unpadded">
25+
<div class="col-lg-10">
26+
<div class="row unpadded">
27+
<div class="col-12">
28+
<p>
29+
<br />
30+
<a href="{{site.url}}/admin">Back to admin</a>
31+
</p>
32+
</div>
33+
</div>
34+
{{content}}
35+
</div>
36+
</div>
37+
</main>
38+
</div>
39+
{% include scripts.html %}
40+
</body>
41+
42+
</html>

‎admin.html‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,15 @@ <h1>Useful Links</h1>
1616

1717
<div class="row">
1818
<div class="col-12">
19-
<h4>
20-
<a href="https://forms.gle/HDu49ukTBM6uLpBCA" target="_blank">Event Request/Kick-Off Form</a>
21-
</h4>
22-
<h4>
23-
<a href="https://analytics.google.com/analytics/web/#/report/visitors-overview/a174926144w242581676p226110493/_u.date00=20200901&_u.date01=20200913" target="_blank">Google Analytics</a>
24-
</h4>
25-
<h4>
26-
<a href="https://drive.google.com/drive/folders/1Tcl8a0EkjOB1FLnkaqtMES6Wg8xoW_tx?usp=sharing" target="_blank">Meeting Minutes</a>
27-
</h4>
28-
<h4>
29-
<a href="https://trello.com/codewith2" target="_blank">Trello</a>
30-
</h4>
31-
<h4>
32-
<a href="{{site.url}}/eventprocess" target="_blank">Event process</a>
33-
</h4>
19+
<h2>Admin</h2>
20+
<h4><a href="https://analytics.google.com/analytics/web/#/report/visitors-overview/a174926144w242581676p226110493/_u.date00=20200901&_u.date01=20200913" target="_blank">Google Analytics</a></h4>
21+
<h4><a href="https://drive.google.com/drive/folders/1Tcl8a0EkjOB1FLnkaqtMES6Wg8xoW_tx?usp=sharing" target="_blank">Meeting Minutes</a></h4>
22+
<h4><a href="{{site.url}}/mentor-process">Mentor Application Process</a></h4>
23+
<h4><a href="https://trello.com/codewith2" target="_blank">Trello</a></h4>
24+
25+
<h2>Events</h2>
26+
<h4><a href="https://docs.google.com/spreadsheets/d/1khRdEN3QSD9yQnv9zz_TshaJ4QcczEtEoy1BAv6_UKU/edit?usp=sharing" target="_blank">Feedback</a></h4>
27+
<h4><a href="https://forms.gle/HDu49ukTBM6uLpBCA" target="_blank">Request/Kick-Off Form</a></h4>
28+
<h4><a href="{{site.url}}/event-process">Process</a></h4>
3429
</div>
35-
</div>
30+
</div>

‎css/style.css‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ hr {
171171

172172
iframe {
173173
width: 100%;
174-
height: 300vh;
174+
height: 100vh;
175175
}
176176

177177
.center-when-small {
@@ -322,6 +322,10 @@ div.row.intro {
322322
margin: 2em 0;
323323
}
324324

325+
div.row.intro>div {
326+
min-height: 72px;
327+
}
328+
325329
p.intro-icon {
326330
color: var(--colour-dark-primary);
327331
}
@@ -330,7 +334,7 @@ p.intro-icon {
330334
color: var(--colour-dark-primary);
331335
} */
332336

333-
p.intro-text {
337+
div.intro-text>p {
334338
font-size: large;
335339
}
336340

@@ -346,7 +350,8 @@ img.profile-photo {
346350

347351
/* Events */
348352
section#events-drop-ins .card,
349-
section#events-scheduled .card {
353+
section#events-huddles .card,
354+
section#events-workshops .card {
350355
margin: 0.5em 0.5em 0.5em -0.5em
351356
}
352357

eventProcess.html renamed to event-process.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
permalink: /eventprocess/
3-
layout: default
2+
permalink: /event-process/
3+
layout: admin
44
suffixes:
55
- Assistance,
66
- Power,
@@ -15,6 +15,6 @@ <h1>Event Process</h1>
1515

1616
<div class="row">
1717
<div class="col-12">
18-
<img class="img-fluid" src="{{site.url}}/images/flowchart-event.svg">
18+
<img class="img-fluid" src="{{site.url}}/images/flowchart-event.svg" style="max-width: 50em;">
1919
</div>
20-
</div>
20+
</div>

‎events.html‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,19 @@ <h1>{{page.title}}</h1>
1717
<a href="#workshops">scheduled workshops</a>. You can read more about each of these below.
1818
</p>
1919
<p>
20-
Before attending any CodeWith event, please read our <a href="{{site.url}}/code-of-conduct">Code of Conduct</a>, which
21-
applies to all events we run. All speakers, mentors, and attendees must agree with this; it helps us all to
20+
Before attending any CodeWith event, please read our <a href="{{site.url}}/code-of-conduct">Code of Conduct</a>,
21+
which applies to all events we run. All speakers, mentors, and attendees must agree with this; it helps us all to
2222
understand the community&apos;s shared values and provides clear guidelines on how we should behave.
2323
</p>
2424

25+
<h2>Previous Events</h2>
26+
<p>
27+
Slides from previous events and workshops can be found in our
28+
<a href="https://drive.google.com/drive/folders/1j6irw_cUfU_u2P1LLe_tJiM6T4dBID5Q?usp=sharing">Google Drive
29+
folder</a>.
30+
</p>
31+
32+
2533
{% include_relative pages-events/events-drop-ins.html %}
2634
<br />
2735
{% include_relative pages-events/events-huddles.html %}

‎feedback.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
title: Feedback
1111
---
1212

13-
<iframe name="feedback" class="feedback-form"
13+
<iframe name="feedback" class="embedded-google-form"
1414
src="https://docs.google.com/forms/d/e/1FAIpQLSfp26KbuYZXc49kXPfAlZaq9IfAvAtDStAK8aCSC0-nVLqwtQ/viewform?embedded=true"
1515
frameborder="0" marginheight="0" marginwidth="0">Loading…</iframe>

0 commit comments

Comments
 (0)