Merge pull request #66 from rubyforgood/add-events-to-menu

Add "Events" to menu and move CoC page
rubyforgood · Mar 29, 2024 · 4b72730 · 4b72730
2 parents 4e021a8 + a144ec2
commit 4b72730
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 65 deletions.
diff --git a/_data/navigation.yml b/_data/navigation.yml
@@ -21,3 +21,14 @@
       url: /join-us
     - text: Non-Profit Partners
       url: /join-us/non-profit-partners
+- text: Events
+  url: /events
+  submenu:
+    - text: Ruby for Good 2024
+      url: /events
+    - text: Event Schedule
+      url: /events/schedule
+    - text: Team Lead Guide
+      url: /events/team-leads
+    - text: Event FAQ
+      url: /events/faq
diff --git a/_includes/events/coc.html → _includes/coc.html b/_includes/events/coc.html → _includes/coc.html
diff --git a/_includes/events/faq.html b/_includes/events/faq.html
@@ -167,7 +167,7 @@ <h3 id="registering" class="faq-title">Registering</h3>
           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>
         </p>
         <p>
-          Please read our <a href="/events/coc">Code of Conduct</a> prior to attending.
+          Please read our <a href="/code-of-conduct">Code of Conduct</a> prior to attending.
         </p>
       </div>
     </div>

diff --git a/_includes/events/landing_page.html b/_includes/events/landing_page.html
@@ -137,7 +137,7 @@ <h2 class="mb-20 unbold text-center">Code of Conduct</h2>
     <div class="row">
       <div class="col-12 mb-20">
         <p>
-          Please take a moment to read our <a href="/events/coc">Code of Conduct</a>. Violation of the code of conduct
+          Please take a moment to read our <a href="/code-of-conduct">Code of Conduct</a>. Violation of the code of conduct
           will not be tolerated.
         </p>
       </div>

diff --git a/_includes/mixins/copyright_bar.html b/_includes/mixins/copyright_bar.html
@@ -15,15 +15,7 @@
         <div class="footer-menu">
           <ul>
             <li><a href="{{ site.url }}">Home</a></li>
-            <li>
-              <a
-                href="https://github.com/rubyforgood/r4g-github-provisioning/blob/master/code-of-conduct.md"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                Code of Conduct
-              </a>
-            </li>
+            <li><a href="/code-of-conduct">Code of Conduct</a></li>
             <li>
               <a
                 href="https://github.com/rubyforgood/"

diff --git a/_includes/mixins/navbar.html b/_includes/mixins/navbar.html
@@ -15,7 +15,7 @@
   </button>
 
   <div class="collapse navbar-collapse" id="navbarSupportedContent">
-    <ul class="navbar-nav ml-auto">
+    <ul class="navbar-nav">
       {% for link in site.data.navigation %} {% assign active = nil %}
       <!-- prettier-ignore -->
       {% for sublink in link.submenu %} {% if page.url contains sublink.url %}

diff --git a/assets/css/style.css b/assets/css/style.css
@@ -483,7 +483,7 @@ label {
 *::placeholder {
   color: #555;
   font-size: 1.4rem;
-  opacity: 100%;
+  opacity: 1;
 }
 
 .separator {
@@ -605,12 +605,13 @@ label {
 
 /* Navbar */
 
-.navbar-brand > img {
-  max-width: 200px;
+ul.navbar-nav {
+  justify-content: space-around;
+  width: 100%;
 }
 
-.nav-item {
-  margin-left: 2rem;
+.navbar-brand > img {
+  max-width: 200px;
 }
 
 .nav-link {
@@ -720,7 +721,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
   border-right: 1px solid rgb(0 0 0 / 12%);
   border-top: 3px solid #f2454e;
   left: 0;
-  opacity: 0%;
+  opacity: 0;
   position: absolute;
   top: 110%;
   transition: 0.3s;
@@ -734,7 +735,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
 }
 
 .main-menu ul li:hover .sub-menu {
-  opacity: 100%;
+  opacity: 1;
   top: 100%;
   visibility: visible;
 }
@@ -811,7 +812,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
 
 .menu-active::before,
 .menu-active::after {
-  opacity: 100% !important;
+  opacity: 1 !important;
 }
 
 .menu-icon .menu-tigger span {
@@ -1054,7 +1055,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
   background-color: #000;
   height: 100%;
   left: 0;
-  opacity: 0%;
+  opacity: 0;
   position: fixed;
   top: 0;
   transition: 0.3s;
@@ -1064,7 +1065,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
 }
 
 .offcanvas-overly.active {
-  opacity: 50%;
+  opacity: 0.5;
   visibility: visible;
 }
 
@@ -1087,7 +1088,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
   font-weight: 700;
   letter-spacing: 1px;
   line-height: 1.2;
-  margin: 1rem 0 1rem 2rem;
+  margin: 1rem 0 1rem 1.5rem;
   padding: 1.5rem 2rem;
   text-align: center;
   text-transform: uppercase;
@@ -1115,7 +1116,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
   font-weight: 700;
   letter-spacing: 0.2px;
   line-height: 1.2;
-  margin: 1rem 0 1rem 2rem;
+  margin: 1rem 0 1rem 1.5rem;
   padding: 1.5rem 2rem;
   text-align: center;
   text-transform: uppercase;
@@ -1138,15 +1139,15 @@ span.navbar-toggler-icon > i.fas.fa-bars {
   background-position: center center;
   background-size: cover;
   height: 81rem;
-  width: 100%;
   position: relative;
+  width: 100%;
 }
 
 .slider-bg::before {
   background-color: #000;
   content: "";
   height: 100%;
-  opacity: 70%;
+  opacity: 0.7;
   position: absolute;
   width: 100%;
 }
@@ -1162,7 +1163,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
   background-color: #000;
   content: "";
   height: 100%;
-  opacity: 70%;
+  opacity: 0.7;
   position: absolute;
   width: 100%;
 }
@@ -1212,11 +1213,11 @@ span.navbar-toggler-icon > i.fas.fa-bars {
 }
 
 .flickity-page-dots .dot {
-  height: 0.18rem;
-  width: 2.5rem;
-  border-radius: 0;
   background-color: #fff;
+  border-radius: 0;
+  height: 0.18rem;
   opacity: 1;
+  width: 2.5rem;
 }
 
 .flickity-page-dots .dot.is-selected {
@@ -1615,7 +1616,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
 .portfolio-wrapper:hover .portfolio-thumb::before,
 .portfolio-wrapper:hover .portfolio-thumb::after,
 .portfolio-wrapper:hover .view i {
-  opacity: 80%;
+  opacity: 0.8;
 }
 
 .portfolio-wrapper:hover .portfolio-content {
@@ -1642,7 +1643,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
   content: "";
   height: 100%;
   left: 0;
-  opacity: 0%;
+  opacity: 0;
   position: absolute;
   top: 0;
   transition: 0.3s;
@@ -1655,7 +1656,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
   bottom: 1rem;
   content: "";
   left: 1rem;
-  opacity: 0%;
+  opacity: 0;
   position: absolute;
   right: 1rem;
   top: 1rem;
@@ -1667,7 +1668,7 @@ span.navbar-toggler-icon > i.fas.fa-bars {
   color: #f2454e;
   font-size: 2.4rem;
   left: 0;
-  opacity: 0%;
+  opacity: 0;
   position: absolute;
   right: 0;
   text-align: center;
@@ -1805,11 +1806,6 @@ span.navbar-toggler-icon > i.fas.fa-bars {
   text-align: center;
 }
 
-.single-clients img {
-  display: inline-block;
-  width: 100%;
-}
-
 /* ---------------- 10. Team ---------------- */
 
 .single-team {
@@ -1827,15 +1823,15 @@ span.navbar-toggler-icon > i.fas.fa-bars {
   content: "";
   height: 100%;
   left: 0;
-  opacity: 0%;
+  opacity: 0;
   position: absolute;
   top: 0;
   transition: 0.5s;
   width: 100%;
 }
 
 .single-team:hover .team-img::before {
-  opacity: 70%;
+  opacity: 0.7;
 }
 
 .team-img img {
@@ -2392,7 +2388,7 @@ h4.team-member-facts {
 .sidebar-form form input::placeholder {
   color: #999;
   font-size: 1.2rem;
-  opacity: 50%;
+  opacity: 0.5;
 }
 
 .sidebar-form form button {
@@ -2518,7 +2514,7 @@ h4.team-member-facts {
 }
 
 .widget-social a:hover {
-  opacity: 80%;
+  opacity: 0.8;
 }
 
 /* .sidebar-link{} */
@@ -2846,19 +2842,20 @@ blockquote {
 /* ---------------- 18. Our Supporters ---------------- */
 
 .clients-active {
-  width: 100%;
   height: 100%;
   margin: 3rem;
+  width: 100%;
 }
 
 .container-single-clients {
-  width: 19rem;
   margin-right: 3.5rem;
+  width: 19rem;
 }
 
 .single-clients img {
-  width: 100%;
+  display: inline-block;
   height: 100%;
+  width: 100%;
 }
 
 .flickity-button {
@@ -2880,8 +2877,8 @@ blockquote {
 }
 
 .flickity-button:focus {
-  outline: none;
   box-shadow: none;
+  outline: none;
 }
 
 /* ---------------- 19. Projects ---------------- */
@@ -3022,7 +3019,7 @@ h3.project-sidebar-header {
   box-shadow: inset 1px 1px 10px #51a4a1, inset -1px -1px 10px #17a2b8;
   left: 0;
   margin: auto;
-  padding: 1rem min(1vw, 1rem);
+  padding: 1rem math.min(1vw, 1rem);
   position: absolute;
   right: 0;
   transition: 0.5s;
@@ -3035,7 +3032,7 @@ h3.project-sidebar-header {
 
 .project-info h3 {
   color: #fff;
-  font-size: min(3.5vw, 2rem);
+  font-size: math.min(3.5vw, 2rem);
   margin-bottom: 0.5rem;
 }
 

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: Code of Conduct
+description:
+bg:
+style:
+permalink: /code-of-conduct
+---
+
+{% include coc.html %}
diff --git a/events/coc.md b/events/coc.md