Skip to content

Commit 4b72730

Browse files
authored
Merge pull request #66 from rubyforgood/add-events-to-menu
Add "Events" to menu and move CoC page
2 parents 4e021a8 + a144ec2 commit 4b72730

9 files changed

Lines changed: 59 additions & 65 deletions

File tree

_data/navigation.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,14 @@
2121
url: /join-us
2222
- text: Non-Profit Partners
2323
url: /join-us/non-profit-partners
24+
- text: Events
25+
url: /events
26+
submenu:
27+
- text: Ruby for Good 2024
28+
url: /events
29+
- text: Event Schedule
30+
url: /events/schedule
31+
- text: Team Lead Guide
32+
url: /events/team-leads
33+
- text: Event FAQ
34+
url: /events/faq

_includes/events/faq.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ <h3 id="registering" class="faq-title">Registering</h3>
167167
We are particularly interested in creating a diverse and inclusive space, and especially encourage those underrepresented in tech to join the event. Want to help make the event more inclusive? Invite others who will make the space welcoming and <a href="https://ti.to/codeforgood/rubyforgood" target="_blank" rel="noopener noreferrer">sponsor a scholarship recipient waitlisted for lack of funds</a>. <i class="fa fa-heart-o red-salsa"></i>
168168
</p>
169169
<p>
170-
Please read our <a href="/events/coc">Code of Conduct</a> prior to attending.
170+
Please read our <a href="/code-of-conduct">Code of Conduct</a> prior to attending.
171171
</p>
172172
</div>
173173
</div>

_includes/events/landing_page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ <h2 class="mb-20 unbold text-center">Code of Conduct</h2>
137137
<div class="row">
138138
<div class="col-12 mb-20">
139139
<p>
140-
Please take a moment to read our <a href="/events/coc">Code of Conduct</a>. Violation of the code of conduct
140+
Please take a moment to read our <a href="/code-of-conduct">Code of Conduct</a>. Violation of the code of conduct
141141
will not be tolerated.
142142
</p>
143143
</div>

_includes/mixins/copyright_bar.html

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,7 @@
1515
<div class="footer-menu">
1616
<ul>
1717
<li><a href="{{ site.url }}">Home</a></li>
18-
<li>
19-
<a
20-
href="https://github.com/rubyforgood/r4g-github-provisioning/blob/master/code-of-conduct.md"
21-
target="_blank"
22-
rel="noopener noreferrer"
23-
>
24-
Code of Conduct
25-
</a>
26-
</li>
18+
<li><a href="/code-of-conduct">Code of Conduct</a></li>
2719
<li>
2820
<a
2921
href="https://github.com/rubyforgood/"

_includes/mixins/navbar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</button>
1616

1717
<div class="collapse navbar-collapse" id="navbarSupportedContent">
18-
<ul class="navbar-nav ml-auto">
18+
<ul class="navbar-nav">
1919
{% for link in site.data.navigation %} {% assign active = nil %}
2020
<!-- prettier-ignore -->
2121
{% for sublink in link.submenu %} {% if page.url contains sublink.url %}

assets/css/style.css

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ label {
483483
*::placeholder {
484484
color: #555;
485485
font-size: 1.4rem;
486-
opacity: 100%;
486+
opacity: 1;
487487
}
488488

489489
.separator {
@@ -605,12 +605,13 @@ label {
605605

606606
/* Navbar */
607607

608-
.navbar-brand > img {
609-
max-width: 200px;
608+
ul.navbar-nav {
609+
justify-content: space-around;
610+
width: 100%;
610611
}
611612

612-
.nav-item {
613-
margin-left: 2rem;
613+
.navbar-brand > img {
614+
max-width: 200px;
614615
}
615616

616617
.nav-link {
@@ -720,7 +721,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
720721
border-right: 1px solid rgb(0 0 0 / 12%);
721722
border-top: 3px solid #f2454e;
722723
left: 0;
723-
opacity: 0%;
724+
opacity: 0;
724725
position: absolute;
725726
top: 110%;
726727
transition: 0.3s;
@@ -734,7 +735,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
734735
}
735736

736737
.main-menu ul li:hover .sub-menu {
737-
opacity: 100%;
738+
opacity: 1;
738739
top: 100%;
739740
visibility: visible;
740741
}
@@ -811,7 +812,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
811812

812813
.menu-active::before,
813814
.menu-active::after {
814-
opacity: 100% !important;
815+
opacity: 1 !important;
815816
}
816817

817818
.menu-icon .menu-tigger span {
@@ -1054,7 +1055,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
10541055
background-color: #000;
10551056
height: 100%;
10561057
left: 0;
1057-
opacity: 0%;
1058+
opacity: 0;
10581059
position: fixed;
10591060
top: 0;
10601061
transition: 0.3s;
@@ -1064,7 +1065,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
10641065
}
10651066

10661067
.offcanvas-overly.active {
1067-
opacity: 50%;
1068+
opacity: 0.5;
10681069
visibility: visible;
10691070
}
10701071

@@ -1087,7 +1088,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
10871088
font-weight: 700;
10881089
letter-spacing: 1px;
10891090
line-height: 1.2;
1090-
margin: 1rem 0 1rem 2rem;
1091+
margin: 1rem 0 1rem 1.5rem;
10911092
padding: 1.5rem 2rem;
10921093
text-align: center;
10931094
text-transform: uppercase;
@@ -1115,7 +1116,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
11151116
font-weight: 700;
11161117
letter-spacing: 0.2px;
11171118
line-height: 1.2;
1118-
margin: 1rem 0 1rem 2rem;
1119+
margin: 1rem 0 1rem 1.5rem;
11191120
padding: 1.5rem 2rem;
11201121
text-align: center;
11211122
text-transform: uppercase;
@@ -1138,15 +1139,15 @@ span.navbar-toggler-icon > i.fas.fa-bars {
11381139
background-position: center center;
11391140
background-size: cover;
11401141
height: 81rem;
1141-
width: 100%;
11421142
position: relative;
1143+
width: 100%;
11431144
}
11441145

11451146
.slider-bg::before {
11461147
background-color: #000;
11471148
content: "";
11481149
height: 100%;
1149-
opacity: 70%;
1150+
opacity: 0.7;
11501151
position: absolute;
11511152
width: 100%;
11521153
}
@@ -1162,7 +1163,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
11621163
background-color: #000;
11631164
content: "";
11641165
height: 100%;
1165-
opacity: 70%;
1166+
opacity: 0.7;
11661167
position: absolute;
11671168
width: 100%;
11681169
}
@@ -1212,11 +1213,11 @@ span.navbar-toggler-icon > i.fas.fa-bars {
12121213
}
12131214

12141215
.flickity-page-dots .dot {
1215-
height: 0.18rem;
1216-
width: 2.5rem;
1217-
border-radius: 0;
12181216
background-color: #fff;
1217+
border-radius: 0;
1218+
height: 0.18rem;
12191219
opacity: 1;
1220+
width: 2.5rem;
12201221
}
12211222

12221223
.flickity-page-dots .dot.is-selected {
@@ -1615,7 +1616,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
16151616
.portfolio-wrapper:hover .portfolio-thumb::before,
16161617
.portfolio-wrapper:hover .portfolio-thumb::after,
16171618
.portfolio-wrapper:hover .view i {
1618-
opacity: 80%;
1619+
opacity: 0.8;
16191620
}
16201621

16211622
.portfolio-wrapper:hover .portfolio-content {
@@ -1642,7 +1643,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
16421643
content: "";
16431644
height: 100%;
16441645
left: 0;
1645-
opacity: 0%;
1646+
opacity: 0;
16461647
position: absolute;
16471648
top: 0;
16481649
transition: 0.3s;
@@ -1655,7 +1656,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
16551656
bottom: 1rem;
16561657
content: "";
16571658
left: 1rem;
1658-
opacity: 0%;
1659+
opacity: 0;
16591660
position: absolute;
16601661
right: 1rem;
16611662
top: 1rem;
@@ -1667,7 +1668,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
16671668
color: #f2454e;
16681669
font-size: 2.4rem;
16691670
left: 0;
1670-
opacity: 0%;
1671+
opacity: 0;
16711672
position: absolute;
16721673
right: 0;
16731674
text-align: center;
@@ -1805,11 +1806,6 @@ span.navbar-toggler-icon > i.fas.fa-bars {
18051806
text-align: center;
18061807
}
18071808

1808-
.single-clients img {
1809-
display: inline-block;
1810-
width: 100%;
1811-
}
1812-
18131809
/* ---------------- 10. Team ---------------- */
18141810

18151811
.single-team {
@@ -1827,15 +1823,15 @@ span.navbar-toggler-icon > i.fas.fa-bars {
18271823
content: "";
18281824
height: 100%;
18291825
left: 0;
1830-
opacity: 0%;
1826+
opacity: 0;
18311827
position: absolute;
18321828
top: 0;
18331829
transition: 0.5s;
18341830
width: 100%;
18351831
}
18361832

18371833
.single-team:hover .team-img::before {
1838-
opacity: 70%;
1834+
opacity: 0.7;
18391835
}
18401836

18411837
.team-img img {
@@ -2392,7 +2388,7 @@ h4.team-member-facts {
23922388
.sidebar-form form input::placeholder {
23932389
color: #999;
23942390
font-size: 1.2rem;
2395-
opacity: 50%;
2391+
opacity: 0.5;
23962392
}
23972393

23982394
.sidebar-form form button {
@@ -2518,7 +2514,7 @@ h4.team-member-facts {
25182514
}
25192515

25202516
.widget-social a:hover {
2521-
opacity: 80%;
2517+
opacity: 0.8;
25222518
}
25232519

25242520
/* .sidebar-link{} */
@@ -2846,19 +2842,20 @@ blockquote {
28462842
/* ---------------- 18. Our Supporters ---------------- */
28472843

28482844
.clients-active {
2849-
width: 100%;
28502845
height: 100%;
28512846
margin: 3rem;
2847+
width: 100%;
28522848
}
28532849

28542850
.container-single-clients {
2855-
width: 19rem;
28562851
margin-right: 3.5rem;
2852+
width: 19rem;
28572853
}
28582854

28592855
.single-clients img {
2860-
width: 100%;
2856+
display: inline-block;
28612857
height: 100%;
2858+
width: 100%;
28622859
}
28632860

28642861
.flickity-button {
@@ -2880,8 +2877,8 @@ blockquote {
28802877
}
28812878

28822879
.flickity-button:focus {
2883-
outline: none;
28842880
box-shadow: none;
2881+
outline: none;
28852882
}
28862883

28872884
/* ---------------- 19. Projects ---------------- */
@@ -3022,7 +3019,7 @@ h3.project-sidebar-header {
30223019
box-shadow: inset 1px 1px 10px #51a4a1, inset -1px -1px 10px #17a2b8;
30233020
left: 0;
30243021
margin: auto;
3025-
padding: 1rem min(1vw, 1rem);
3022+
padding: 1rem math.min(1vw, 1rem);
30263023
position: absolute;
30273024
right: 0;
30283025
transition: 0.5s;
@@ -3035,7 +3032,7 @@ h3.project-sidebar-header {
30353032
30363033
.project-info h3 {
30373034
color: #fff;
3038-
font-size: min(3.5vw, 2rem);
3035+
font-size: math.min(3.5vw, 2rem);
30393036
margin-bottom: 0.5rem;
30403037
}
30413038

code-of-conduct.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
layout: page
3+
title: Code of Conduct
4+
description:
5+
bg:
6+
style:
7+
permalink: /code-of-conduct
8+
---
9+
10+
{% include coc.html %}

events/coc.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)