Team revisions done

Author: andrewrmn

README.md

@@ -27,8 +27,8 @@ The All In community will collaborate and build on research and initiatives that
 
 ## Access
 
-### All In for Students 
-All In for Students is an online program for tech students from underrepresented backgrounds that provides open source education, training, and internship opportunities. 
+### All In for Students
+All In for Students is an online program for tech students from underrepresented backgrounds that provides open source education, training, and internship opportunities.
 
 **Who is eligible to participate?**
 Students enrolled full time or part time at a:
@@ -38,7 +38,7 @@ Students enrolled full time or part time at a:
 - U.S. Community College
 - Any U.S. four-year institution and identify as a racial or ethnic minority
 
-To learn more about the All In for Students program, check out our [website](https://allinopensource.org/access/). If you're interested in participating in the All In for Students Program, fill out this [form](https://docs.google.com/forms/d/e/1FAIpQLSfMJM7ILztN9Mv1fjLZYN5GniJrcfP_0uG8VW7e3lBULmfohw/viewform). 
+To learn more about the All In for Students program, check out our [website](https://allinopensource.org/students/). If you're interested in participating in the All In for Students Program, fill out this [form](https://docs.google.com/forms/d/e/1FAIpQLSfMJM7ILztN9Mv1fjLZYN5GniJrcfP_0uG8VW7e3lBULmfohw/viewform). 
 
 
 ### All in for Maintainers
@@ -47,20 +47,20 @@ This program is an immersive program that provides inclusive development and tra
 ## Community
 
 ### Maintainers Listening Tour
-The Maintainers Listening Tour is a series of focus groups and individual interviews with maintainers who are interested in attracting and retaining new contributors with diverse backgrounds in an inclusive way. 
+The Maintainers Listening Tour is a series of focus groups and individual interviews with maintainers who are interested in attracting and retaining new contributors with diverse backgrounds in an inclusive way.
 
 As a part of  the 2021 Maintainers Listening Tour, we collected best practices, lessons learned, and stories that highlight:
 - What maintainers are doing to advance diversity, inclusion, and belonging within their communities;
 - What is working well;
 - What is not working well;
-- What challenges they are facing that may be prohibiting them from creating a culture of inclusion within their communities; and 
+- What challenges they are facing that may be prohibiting them from creating a culture of inclusion within their communities; and
 - What they would like to see in a program that is designed for them, All in for Maintainers.
 
 ## Equity
-All In will seek to leverage [GitHub Sponsors](https://github.com/sponsors) which allows you to provide direct financial support to the maintainers and projects you love and the open source projects you depend on. We are developing a robust outreach campaign to increase the number of maintainers from underrepresented and/or historically excluded backgrounds and projects that serve under resourced communities. The campaign will also include increased funding to those projects as well. 
+All In will seek to leverage [GitHub Sponsors](https://github.com/sponsors) which allows you to provide direct financial support to the maintainers and projects you love and the open source projects you depend on. We are developing a robust outreach campaign to increase the number of maintainers from underrepresented and/or historically excluded backgrounds and projects that serve under resourced communities. The campaign will also include increased funding to those projects as well.
 
 ## Data
-All In will prioritize consistently gathering and analyzing data that will provide insight into the current state of diversity, equity, and inclusion within open source, challenges that need to be addressed and strengths that can be leveraged to take advantage of opportunities to create a more inclusive culture within our communities. We will make informed data-driven decisions, ensure we have short term metrics of success, and monitor longitudinal data to measure long term impact. 
+All In will prioritize consistently gathering and analyzing data that will provide insight into the current state of diversity, equity, and inclusion within open source, challenges that need to be addressed and strengths that can be leveraged to take advantage of opportunities to create a more inclusive culture within our communities. We will make informed data-driven decisions, ensure we have short term metrics of success, and monitor longitudinal data to measure long term impact.
 
 Our first initiative was to create the 2021 Open Source Diversity, Equity, and Inclusion Survey and partner with the Linux Foundation to survey across the open source ecosystem. View the final report [here](https://www.prnewswire.com/news-releases/linux-foundation-research-reveals-new-open-source-diversity-equity-and-inclusion-trends-301444234.html). We are now collaborating with corporate partners to research inequities in computer science and other technical education programs.
 

_data/faqNew.yml

@@ -3,13 +3,13 @@
     - question: Who is this DEI Resource Hub designed for?
       answer: Though designed in response to the feedback we received from maintainers, this resource hub is for anyone interested in learning more about current trends, research, best practices and more, related to advancing DEI in open source.
     - question: Are these resources free to access?
-      answer: Yes! Although some may require registration on the source’s website, all resources included in our Hub are free for anyone to use.
+      answer: Yes! Although some may require registration on the source’s website, all resources included in the DEI Resource Hub are free for anyone to use.
     - question: What types of resources are included in the Hub?
-      answer: We have included videos, articles, research papers, and full training courses in our Hub.
+      answer: We have included videos, articles, research papers, and full training courses in the DEI Resource Hub.
     - question: What if I have a resource to suggest?
-      answer: We’d love to hear about it! Please use our form to give us a little more information about the resource you’d like to add to our list. (Please note, the All In Editorial Team may decide to include only those resources that align with the All In mission and meet the criteria for inclusion.)
-    - question: What if I’m looking for information on a DEI topic that is not included in your Hub?
-      answer: The Resource Hub is not meant to be a comprehensive list of all resources available, but we would love to know if there are topics that are of interest that we are missing. Please email us at [email protected] and tell us more about what you’re looking for.
+      answer: We’d love to hear about it! Please use the <a href="/maintainers/share-your-resources/">DEI Resource Hub Submission Form</a> to give us a little more information about the resource you’d like to add to our list. Please note that while we appreciate suggestions from the community for new resources, the All In editorial team will prioritize content that aligns to the specific challenges shared during the Maintainers Listening Tour.
+    - question: What if I’m looking for information on a DEI topic that is not included in the DEI Resource Hub?
+      answer: The DEI Resource Hub is not meant to be a comprehensive list of all resources available, but we would love to know if there are topics that are of interest that we are missing. Please email us at [email protected] and tell us more about what you’re looking for.
 
 
 - group: DEI Project Badging

_includes/header.html

@@ -9,24 +9,24 @@
 		</div>
 
 		<ul class="desktop-navigation">
-			<li{% if page.id == 'access' %} class="is-active"{% endif %}>
-				<a href="{{ '/access/' | relative_url }}">
+			<li{% if page.id == 'students' %} class="is-active"{% endif %}>
+				<a href="{{ '/students/' | relative_url }}">
 					<span>Students</span>
 				</a>
 			</li>
-			<li class="has-sub-nav {% if page.id == 'community' or page.id == 'resources' %} is-parent{% endif %}">
-				<a href="{{ '/community/' | relative_url }}">
+			<li class="has-sub-nav {% if page.id == 'maintainers' or page.id == 'resources' or page.id == 'faq' or page.id == 'listening-tour' %} is-parent{% endif %}">
+				<a href="{{ '/maintainers/' | relative_url }}">
 					<span>Maintainers</span>
 				</a>
 
 				<ul class="sub-nav">
-					<li{% if page.id == 'community' %} class="is-active"{% endif %}>
-						<a href="{{ '/community/' | relative_url }}">
+					<li{% if page.id == 'maintainers' %} class="is-active"{% endif %}>
+						<a href="{{ '/maintainers/' | relative_url }}">
 							<span>Overview</span>
 						</a>
 					</li>
 					<li{% if page.id == 'listening-tour' %} class="is-active"{% endif %}>
-						<a href="{{ '/community/maintainers-listening-tour/' | relative_url }}">
+						<a href="{{ '/maintainers/maintainers-listening-tour/' | relative_url }}">
 							<span>Maintainers Listening Tour</span>
 						</a>
 					</li>
@@ -37,13 +37,13 @@
 					</li>
 
 					<li class="bold-link">
-						<a href="{{ '/community/#programs' | relative_url }}">
+						<a href="{{ '/maintainers/#programs' | relative_url }}">
 							<span>Programs</span>
 						</a>
 					</li>
 
 					<li{% if page.id == 'resources' %} class="is-active"{% endif %}>
-						<a href="{{ '/community/DEI-resources/' | relative_url }}">
+						<a href="{{ '/maintainers/DEI-resources/' | relative_url }}">
 							<span>DEI Resource Hub</span>
 						</a>
 					</li>
@@ -111,20 +111,20 @@
 							<span>Overview</span>
 						</a>
 					</li>
-					<li{% if page.id == 'access' %} class="is-active"{% endif %}>
-						<a href="/access/">
+					<li{% if page.id == 'students' %} class="is-active"{% endif %}>
+						<a href="/students/">
 							<span>Students</span>
 						</a>
 					</li>
 
-					<li{% if page.id == 'community' %} class="is-active"{% endif %}>
-						<a href="{{ '/community/' | relative_url }}">
+					<li{% if page.id == 'maintainers' %} class="is-active"{% endif %}>
+						<a href="{{ '/maintainers/' | relative_url }}">
 							<span>Maintainers</span>
 						</a>
 					</li>
 
 					<li{% if page.id == 'listening-tour' %} class="is-active"{% endif %}>
-						<a href="{{ '/community/maintainers-listening-tour/' | relative_url }}">
+						<a href="{{ '/maintainers/maintainers-listening-tour/' | relative_url }}">
 							<span>Maintainers Listening Tour</span>
 						</a>
 					</li>
@@ -135,7 +135,7 @@
 					</li>
 
 					<li{% if page.id == 'resources' %} class="is-active"{% endif %}>
-						<a href="{{ '/community/DEI-resources/' | relative_url }}">
+						<a href="{{ '/maintainers/DEI-resources/' | relative_url }}">
 							<span>DEI Resource Hub</span>
 						</a>
 					</li>

access.html

@@ -1,139 +1,7 @@
 ---
-layout: default
-id: access
+sitemap: false
 permalink: /access/
-title: Access Programs
+redirect_to: /students/
 ---
 
-<div class="hero">
-  <div class="hero__content text-white">
-    <div class="wrapper">
-      <div class="d-md-flex text-center text-left-md">
-        <div class="col-12 col-md-4 col-lg-5 mb-6 mb-md-0 px-md-6" data-animate-in="up">
-          <img class="mx-auto col-4 col-md-12" style="max-width: 248px;" src="/assets/img/direction/access-icon.svg" alt="Access icon" />
-        </div>
-        <div class="col-12 col-md-8 col-lg-6" data-animate-in="up">
-          <h1 class="h5">{ All In Access }</h1>
-          <h1 class="h2">All In for Students</h1>
-          <p class="p-lg mt-0">All In for Students is an online program for tech students from underrepresented backgrounds that provides open source education, training, and internship opportunities.</p>
-          <div class="mt-6">
-            <a class="btn mt-2" href="https://docs.google.com/forms/d/e/1FAIpQLSfMJM7ILztN9Mv1fjLZYN5GniJrcfP_0uG8VW7e3lBULmfohw/viewform?usp=sf_link" target="_blank">
-              <span>Join All In For Students Program</span>
-            </a>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="bg-white bg-pattern-right py-7">
-  <div class="wrapper d-md-flex py-lg-6">
-    <div class="col-12 col-md-4 col-lg-5" style="order: 3;" data-animate-in="up">
-      <img class="mx-auto col-10" src="{{ '/assets/img/direction/student-on-computer.png' | relative_url }}" alt="student on computer" />
-    </div>
-    <div class="col-12 col-md-7 pr-md-6">
-      <h2 class="h3 mb-6" data-animate-in="up">Program Overview</h2>
-      <h3 class="h3 h3--alt mb-4">{ Who is eligible to participate? }</h3>
-      <p><b>Students enrolled full time or part time at a:</b></p>
-      <div class="rte" data-animate-in="up">
-        <ul>
-          <li>U.S. Historically Black College or University (HBCU)</li>
-          <li>U.S. Hispanic Serving Institution (HSI)</li>
-          <li>U.S. Women’s College </li>
-          <li>U.S. Community College </li>
-          <li>Any U.S. four-year institution and identify as a racial or ethnic minority</li>
-        </ul>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<section class="wrapper-full bg-static py-8" id="benefits">
-  <div class="wrapper text-white" data-animate-in="up">
-    <h3 class="h3 h3--alt">{ Benefits of participating }</h3>
-    <p>There are many reasons to particpate in the program, including:</p>
-
-    <div class="row mt-6 pt-lg-6">
-      {% for item in site.data.benefits %}
-      <div class="col--xs--12 col--sm--6 col--md--4 mb-6">
-        <img src="/assets/img/direction/icons/{{ item.image }}" alt="{{ item.title }} icon" />
-        <h4>{{ item.title }}</h4>
-        <p>{{ item.description }}</p>
-      </div>
-      {% endfor %}
-    </div>
-
-    <small class="mt-6">Benefits are subject to program completion and availability. Internships are not guaranteed. Program requirements must be completed and students must apply and be accepted to various internships and other opportunities.</small>
-
-
-    <div class="my-6 d-md-flex flex-justify-between pt-6">
-      <div class="col-md-6 mb-4">
-        <h3 class="h3 h3--alt">{ How to get started with All In }</h3>
-      </div>
-      <div class="col-md-6 pl-md-6">
-        <p>If you're interested in participating in the All In for Students Program, follow the instructions below to learn next steps!</p>
-      </div>
-    </div>
-
-    <div class="row row--img-icons mt-6 pt-6">
-      <div class="col--xs--12 col--md--4 mb-6 mb-md-0">
-        <img src="/assets/img/direction/icons/orb-blue.svg" alt="blue orb" />
-        <h4>Sign Up Online</h4>
-        <p><b>Step 1</b> - Watch <a href="https://www.youtube.com/watch?v=-FdzqYiJkcA" target="_blank">What Is All In for Students</a></p>
-        <p><b>Step 2</b> - <a href="https://docs.google.com/forms/d/1HEcZI098qTdMSKTi3FcUO0cg33IhQorbcal2SyfSMjQ/edit" target="_blank">Join All In for Students</a></p>
-      </div>
-
-      <div class="col--xs--12 col--md--4 mb-6 mb-md-0">
-        <img src="/assets/img/direction/icons/orb-green.svg" alt="green orb" />
-        <h4>Complete the Introductory Coursework</h4>
-        <p><b>Step 1</b> - Watch <a href="https://www.youtube.com/watch?v=muDFF1Hra5A" target="_blank">4 Things You Must Have on Your Resume</a></p>
-        <p><b>Step 2</b> - Watch <a href="https://www.youtube.com/watch?v=ApDQ2xQAuGs" target="_blank">Level Up with LinkedIn</a></p>
-        <p><b>Step 3</b> - <a href="https://docs.google.com/forms/d/1ZdoJbw5cknufdLCZLcJTLX6XFIwPBlQyJvggBElx7go/edit" target="_blank">Submit Resume and LinkedIn Profile</a></p>
-      </div>
-
-      <div class="col--xs--12 col--md--4 mb-6 mb-md-0">
-        <img src="/assets/img/direction/icons/orb-pink.svg" alt="pink orb" />
-        <h4>Join the Group</h4>
-        <p>Someone from the All In program will review your resume and LinkedIn profile.</p>
-
-        <p><b>If your resume and/or LinkedIn profiles do not need edits:</b><br />
-          You will receive an invitation via LinkedIn to join the All In for Students LinkedIn group, where you will have access to internship opportunities and other benefits.</p>
-
-          <p><b>If your resume and/or LinkedIn profiles needs edits:</b><br />
-            We will email you directly to make the necessary edits. Then, you can <a href="https://docs.google.com/forms/d/1CjdmaxY1LEGdyL-gnHsWrYsT3sF8WjCRH69fRP6J1YI/edit" target="_blank">resubmit your information to be admitted into the LinkedIn group</a>.</p>
-      </div>
-    </div>
-  </div>
-</section>
-
-
-<section class="wrapper-full bg-white py-8" id="faq">
-  <div class="wrapper" data-animate-in="up">
-    <h3 class="h3">FAQs</h3>
-
-    <div class="faqs mt-6 pt-lg-6">
-      {% for item in site.data.faq %}
-      <div>
-        <h4>{{ item.question }}</h4>
-        <p>{{ item.answer }}</p>
-      </div>
-      {% endfor %}
-    </div>
-  </div>
-</section>
-
-
-<section class="bg-white bg-static py-8">
-  <div class="wrapper-thin text-center text-white" data-animate-in="up">
-    <p class="h2">Are you All In?</p>
-    <p>All In for Students provides open source curriculum, career development, and opportunities at companies, nonprofits and within open source communities. Consider becoming a corporate partner today.</p>
-    <div class="mt-6">
-      <a class="btn" href="/become-a-partner/">
-        <span>Request Partner Information</span>
-        {% include arrow.html %}
-      </a>
-    </div>
-  </div>
-</section>
+<script>location='{{ page.redirect_to }}'</script>

assets/css/layout/_wrappers.scss

@@ -31,5 +31,5 @@
 }
 .wrapper-md2 {
     @include wrapper;
-    max-width: 920px;
+    max-width: 940px;
 }