mozilla · comzeradd · Sep 19, 2016 · Sep 15, 2016
diff --git a/LICENSE b/LICENSE
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,12 +1,12 @@
 <footer class="site-footer">
 
-  <div class="wrapper">
+  <div class="wrapper container row">
 
-      <div class="footer-col footer-col-1">
+      <div class="footer-col col-md-4">
         <h1 class="logo"><a href="https://www.mozilla.org/" data-link-type="footer" data-link-name="Mozilla">Mozilla</a></h1>
         <p class="license">Portions of this content are ©1998–2016 by individual mozilla.org contributors. Content available under a <a href="https://www.mozilla.org/foundation/licensing/website-content/">Creative Commons license</a>.</p>
       </div>
-      <div class="footer-col footer-col-2">
+      <div class="footer-col col-md-4">
         <ul class="links-join">
           <li><a href="https://www.mozilla.org/contact/" data-link-type="footer" data-link-name="Contact Us">Contact Us</a></li>
           <li class="wrap"><a href="https://donate.mozilla.org/en-US/?presets=100,50,25,15&amp;amount=50&amp;ref=EOYFR2015&amp;utm_campaign=EOYFR2015&amp;utm_source=mozilla.org&amp;utm_medium=referral&amp;utm_content=footer&amp;currency=usd" class="donate" data-link-type="footer" data-link-name="Donate">Donate</a></li>
@@ -21,21 +21,21 @@ <h1 class="logo"><a href="https://www.mozilla.org/" data-link-type="footer" data
           <li class="clear"><a href="https://www.mozilla.org/about/legal/fraud-report/" data-link-type="footer" data-link-name="Report Trademark Abuse">Report Trademark Abuse</a></li>
         </ul>
       </div>
-      <div class="footer-col footer-col-3">
+      <div class="footer-col col-md-4">
         <ul class="links-social">
           <li>
             Mozilla:
             <ul>
-              <li><a href="https://twitter.com/mozilla" data-link-type="footer" data-link-name="Twitter (@mozilla)">Twitter<span> (@mozilla)</span></a></li>
-              <li><a href="https://www.facebook.com/mozilla" data-link-type="footer" data-link-name="Facebook (Mozilla)">Facebook<span> (Mozilla)</span></a></li>
+              <li><a href="https://twitter.com/mozilla" data-link-type="footer" data-link-name="Twitter">Twitter</a></li>
+              <li><a href="https://www.facebook.com/mozilla" data-link-type="footer" data-link-name="Facebook">Facebook</a></li>
             </ul>
           </li>
           <li>
             Firefox:
             <ul>
-              <li><a href="https://twitter.com/firefox" data-link-type="footer" data-link-name="Twitter (@firefox)">Twitter<span> (@firefox)</span></a></li>
-              <li><a href="https://www.facebook.com/Firefox" data-link-type="footer" data-link-name="Facebook (Firefox)">Facebook<span> (Firefox)</span></a></li>
-              <li><a href="https://www.youtube.com/firefoxchannel" data-link-type="footer" data-link-name="YouTube (firefoxchannel)">YouTube<span> (firefoxchannel)</span></a></li>
+              <li><a href="https://twitter.com/firefox" data-link-type="footer" data-link-name="Twitter">Twitter</a></li>
+              <li><a href="https://www.facebook.com/Firefox" data-link-type="footer" data-link-name="Facebook">Facebook</a></li>
+              <li><a href="https://www.youtube.com/firefoxchannel" data-link-type="footer" data-link-name="YouTube">YouTube</a></li>
             </ul>
           </li>
         </ul>

diff --git a/_includes/head.html b/_includes/head.html
@@ -8,9 +8,10 @@
   <title>{% if page.title %}{{ page.title | escape }} - {{ l.site-title | escape }}{% else %}{{ l.site-title | escape }}{% endif %}</title>
   <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 
-  <link rel="shortcut icon" href="{{"/asserts/img/favicon.ico" | prepend: site.baseurl | prepend: site.url }}">
-  <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600' rel='stylesheet' type='text/css'>
-  <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl | prepend: site.url }}">
+  <link rel="shortcut icon" href="{{"/asserts/favicon.ico" | prepend: site.baseurl | prepend: site.url }}">
+  <link rel="stylesheet" href="//code.cdn.mozilla.net/fonts/fira.css">
+  <link rel="stylesheet" href="{{ "/asserts/css/bootstrap.min.css" | prepend: site.baseurl | prepend: site.url }}">
+  <link rel="stylesheet" href="{{ "/asserts/css/main.css" | prepend: site.baseurl | prepend: site.url }}">
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
 
@@ -20,6 +21,8 @@
     <link rel="alternate" hreflang="{{ page.lang }}" href="{{ page.url }}" />
   {% endfor %}
 
+  <script src="{{ "/asserts/js/jquery.min.js" | prepend: site.baseurl | prepend: site.url }}"></script>
+  <script src="{{ "/asserts/js/bootstrap.min.js" | prepend: site.baseurl | prepend: site.url }}"></script>
   <!-- Analytics -->
   <script>
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

diff --git a/_includes/header.html b/_includes/header.html
@@ -2,20 +2,24 @@
 
 <header class="site-header">
 
-  <div class="wrapper">
+  <div class="wrapper container">
 
-    <a class="site-title" href="{{ site.baseurl }}/{{ l.lang-url }}">{{ l.site-title }}</a>
+    <a class="site-title" href="{{ site.baseurl }}/{{ l.lang-url }}">
+      <img src="/asserts/img/activate.png" alt="{{ l.site-title }}" class="brand"></a>
 
-    <div class="trigger">
-        <a class="page-link" href="{{ site.baseurl }}/{{ l.lang-url }}faq">{{ l.faq }}</a>
-        <a class="page-link" href="{{ site.baseurl }}/{{ l.lang-url }}roadmap">{{ l.roadmap }}</a>
-        <a class="page-link" href="{{ site.baseurl }}/{{ l.lang-url }}participation">{{ l.participation }}</a>
+    <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#CollapsingNavbar" aria-controls="CollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      &#9776;
+    </button>
+
+    <div class="trigger collapse navbar-collapse" id="CollapsingNavbar">
+      <a class="page-link" href="{{ site.baseurl }}/{{ l.lang-url }}faq">{{ l.faq }}</a>
+      <a class="page-link" href="{{ site.baseurl }}/{{ l.lang-url }}roadmap">{{ l.roadmap }}</a>
+      <a class="page-link" href="{{ site.baseurl }}/{{ l.lang-url }}participation">{{ l.participation }}</a>
     </div>
 
-      <div id="tabzilla">
-            <a href="https://www.mozilla.org/" data-link-type="nav" data-link-name="tabzilla">Mozilla</a>
-        </div>
-    </nav>
+    <div id="tabzilla" class="hidden-xs">
+      <a href="https://www.mozilla.org/" data-link-type="nav" data-link-name="tabzilla">Mozilla</a>
+    </div>
 
   </div>
 

diff --git a/_includes/index.md b/_includes/index.md
@@ -5,31 +5,34 @@ A campaign for Mozillians around the world to have impact in areas key to Mozill
 
 ## Focus Initiatives
 
-{: #area-deveng .area}
-[![image](/asserts/img/development.png)
-Empower developer communities](/developer-engagement/)
+{: #area-deveng .col-md-3 .area}
+[![image](/asserts/img/development.png)](/developer-engagement/)<br>
+[Empower developer communities](/developer-engagement/)
 
-{: #area-servo .area .disabled}
-![image](/asserts/img/servo.png)
+{: #area-servo .col-md-3 .area .disabled}
+![image](/asserts/img/servo.png)<br>
 Support the future Mozilla Web engine (coming soon)
 
-{: #area-privacy .area .disabled}
-![image](/asserts/img/privacy.png)
+{: #area-privacy .col-md-3 .area .disabled}
+![image](/asserts/img/privacy.png)<br>
 Defend Internet Privacy and Policy (coming soon)
 
-{: #area-testpilot .area}
-[![image](/asserts/img/test-pilot.png)
-Use and test experimental Firefox features](/experiments/)
+{: #area-testpilot .col-md-3 .area}
+[![image](/asserts/img/test-pilot.png)](/experiments/)<br>
+[Use and test experimental Firefox features](/experiments/)
+
+{: .clearfix}
+&nbsp;
 
 {: .center}
 _Are you interested in other areas? Check [our roadmap](/roadmap) to see what's coming soon._
 
 ## Stay updated about new activities
 
-{: #area-mozparticipate .area .area-small}
-[![image](/asserts/img/participation.png)
-Follow @MozParticipate on Twitter](https://twitter.com/intent/follow/?screen_name=MozParticipate)
+{: #area-mozparticipate .col-md-6 .area .area-small}
+[![image](/asserts/img/participation.png)](https://twitter.com/intent/follow/?screen_name=MozParticipate)<br>
+[Follow @MozParticipate on Twitter](https://twitter.com/intent/follow/?screen_name=MozParticipate)
 
-{: #area-discourse .area .area-small}
-[![image](/asserts/img/discourse.png)
-Subscribe to the Participation Leaders forum](https://discourse.mozilla-community.org/c/participation-leaders)
+{: #area-discourse .col-md-6 .area .area-small}
+[![image](/asserts/img/discourse.png)](https://discourse.mozilla-community.org/c/participation-leaders)<br>
+[Subscribe to the Participation Leaders forum](https://discourse.mozilla-community.org/c/participation-leaders)
diff --git a/_includes/page-languages.html b/_includes/page-languages.html
@@ -2,6 +2,11 @@
 
 {% assign pages=site.pages | where:"ref", page.ref | sort: 'lang' %}
 
-<p class="language-list">{{ l.languages }}: {% for page in pages %} <a  class="{{ page.lang }}" title="{{ page.title }}" href="{{ page.url | prepend: site.baseurl }}">{{page.lang}}</a> {% endfor %}</p>
-
-<p class="add-translation"><a href="https://github.com/mozilla/activate.mozilla.community#submit-a-new-localization">{{ l.submit-translation }}</a></p>
+<div class="row">
+  <div class="col-md-6">
+    <p class="language-list text-left">{{ l.languages }}: {% for page in pages %} <a  class="{{ page.lang }}" title="{{ page.title }}" href="{{ page.url | prepend: site.baseurl }}">{{page.lang}}</a> {% endfor %}</p>
+  </div>
+  <div class="col-md-6">
+    <p class="add-translation text-right"><a href="https://github.com/mozilla/activate.mozilla.community#submit-a-new-localization">{{ l.submit-translation }}</a></p>
+  </div>
+</div>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -8,13 +8,13 @@
     {% include header.html %}
 
     <div class="page-content">
-      <div class="wrapper">
+      <div class="wrapper container">
         {{ content }}
 
         <div class="post-languages">
-            {% include page-languages.html %}
+          {% include page-languages.html %}
         </div>
-        
+
       </div>
     </div>
 

diff --git a/_layouts/index.html b/_layouts/index.html
@@ -10,13 +10,13 @@
     {% include header.html %}
 
     <div class="page-content">
-      <div class="wrapper">
+      <div class="wrapper container">
         <div class="home">
-            {{ content }}
+          {{ content }}
 
-            <div class="post-languages">
-                {% include page-languages.html %}
-            </div>
+          <div class="post-languages">
+            {% include page-languages.html %}
+          </div>
 
         </div>
       </div>

diff --git a/_layouts/page.html b/_layouts/page.html
@@ -6,9 +6,9 @@
 <article class="post">
 
   {% if page.parent %}
-  {% assign parent=site.pages | where:"ref", page.parent | where: 'lang', page.lang %}
+    {% assign parent=site.pages | where:"ref", page.parent | where: 'lang', page.lang %}
     <section class="breadcumbs">
-        <p><a href="{{ parent[0].permalink }}">{{ parent[0].title }}</a> - {{page.title}}</p>
+      <p><a href="{{ parent[0].permalink }}">{{ parent[0].title }}</a> - {{page.title}}</p>
     </section>
   {% endif %}
 
@@ -17,10 +17,11 @@ <h1 class="post-title">{{ page.title }}</h1>
   </header>
 
   <div class="share twitter">
-          <p class="twitter"><a title="{{ l.twitter-text1 }}" href="https://twitter.com/home?status={{ l.twitter-text2 }} {{ page.title }} {{ l.twitter-text3 }} {{ page.url | prepend: site.baseurl | prepend: site.url }}?utm_source=twitter.com%26utm_medium=social%26utm_campaign=moz-community-share" data-related="mozparticipate,mozilla" data-dnt="true" data-show-count="false">Tweet</a></p>
+    <p class="twitter"><a title="{{ l.twitter-text1 }}" href="https://twitter.com/home?status={{ l.twitter-text2 }} {{ page.title }} {{ l.twitter-text3 }} {{ page.url | prepend: site.baseurl | prepend: site.url }}?utm_source=twitter.com%26utm_medium=social%26utm_campaign=moz-community-share" data-related="mozparticipate,mozilla" data-dnt="true" data-show-count="false">Tweet</a></p>
   </div>
+
   <div class="share facebook">
-          <p class="facebook"><a title="{{ l.facebook-text }}" href="https://www.facebook.com/sharer/sharer.php?u={{ page.url | prepend: site.baseurl | prepend: site.url }}?utm_source=facebook.com%26utm_medium=social%26utm_campaign=moz-community-share" >{{ l.share }}</a></p>
+    <p class="facebook"><a title="{{ l.facebook-text }}" href="https://www.facebook.com/sharer/sharer.php?u={{ page.url | prepend: site.baseurl | prepend: site.url }}?utm_source=facebook.com%26utm_medium=social%26utm_campaign=moz-community-share" >{{ l.share }}</a></p>
   </div>
 
   <div class="post-content">

diff --git a/_layouts/post.html b/_layouts/post.html
diff --git a/_pages/developer-engagement/rust-hack.md b/_pages/developer-engagement/rust-hack.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title:  "Dive Into Rust"
-permalink: /developer-engagement/rust-hack
+permalink: /developer-engagement/rust-hack/
 lang: en
 ref: rust-hack
 parent: developer-engagement

diff --git a/_pages/developer-engagement/webcompat-sprint.md b/_pages/developer-engagement/webcompat-sprint.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title:  "Web Compatibility Sprint"
-permalink: /developer-engagement/webcompat-sprint
+permalink: /developer-engagement/webcompat-sprint/
 lang: en
 ref: webcompat-sprint
 parent: developer-engagement

diff --git a/_pages/es/developer-engagement/rust-hack.md b/_pages/es/developer-engagement/rust-hack.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title:  "Dive Into Rust"
-permalink: /es/developer-engagement/rust-hack
+permalink: /es/developer-engagement/rust-hack/
 lang: es
 ref: rust-hack
 parent: developer-engagement

diff --git a/_pages/es/developer-engagement/webcompat-sprint.md b/_pages/es/developer-engagement/webcompat-sprint.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title:  "Web Compatibility Sprint"
-permalink: /es/developer-engagement/webcompat-sprint
+permalink: /es/developer-engagement/webcompat-sprint/
 lang: es
 ref: webcompat-sprint
 parent: developer-engagement

diff --git a/_pages/es/experiments/test-pilot.md b/_pages/es/experiments/test-pilot.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title:  "Install Test Pilot"
-permalink: /es/experiments/test-pilot
+permalink: /es/experiments/test-pilot/
 lang: es
 ref: test-pilot
 parent: experiments

diff --git a/_pages/es/faq.md b/_pages/es/faq.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 title:  "Frequently Asked Questions"
-permalink: /es/faq
+permalink: /es/faq/
 lang: es
 ref: faq
 ---
@@ -53,6 +53,6 @@ We encourage you to run these as lean as possible, but realise that sometimes th
 * Venue rental (in the case of the no other alternative)
 * Travel for expert on the field (currently allowed only for Rust events)
 
-Assets to use will be included in some activities. Unless explicitly mentioned in the activity, there will be no other swag available for the campaign. 
+Assets to use will be included in some activities. Unless explicitly mentioned in the activity, there will be no other swag available for the campaign.
 
 To make the request, you will need to make a Reps budget request. If you are not a Rep, please contact a local Rep to help you. We will fast-track valid requests, which are ones that meet the requirements of the activity. For larger budget requests, it will be processed like any other Reps budget request and there is no guarantee it will be approved and even if so, whether it will be on time.
diff --git a/_pages/es/index.md b/_pages/es/index.md
@@ -13,31 +13,34 @@ A campaign for Mozillians around the world to have impact in areas key to Mozill
 
 ## Focus Initiatives
 
-{: #area-deveng .area}
-[![image](/asserts/img/development.png)
-Empower developer communities](/es/developer-engagement/)
+{: #area-deveng .col-md-3 .area}
+[![image](/asserts/img/development.png)](/es/developer-engagement/)<br>
+[Empower developer communities](/es/developer-engagement/)
 
-{: #area-servo .area .disabled}
-![image](/asserts/img/servo.png)
+{: #area-servo .col-md-3 .area .disabled}
+![image](/asserts/img/servo.png)<br>
 Support the future Mozilla Web engine (coming soon)
 
-{: #area-privacy .area .disabled}
-![image](/asserts/img/privacy.png)
+{: #area-privacy .col-md-3 .area .disabled}
+![image](/asserts/img/privacy.png)<br>
 Defend Internet Privacy and Policy (coming soon)
 
-{: #area-testpilot .area}
-[![image](/asserts/img/test-pilot.png)
-Use and test experimental Firefox features](/es/experiments/)
+{: #area-testpilot .col-md-3 .area}
+[![image](/asserts/img/test-pilot.png)](/es/experiments/)<br>
+[Use and test experimental Firefox features](/es/experiments/)
+
+{: .clearfix}
+&nbsp;
 
 {: .center}
 _Are you interested in other areas? Check [our roadmap](/roadmap) to see what's coming soon._
 
 ## Stay updated about new activities
 
-{: #area-mozparticipate .area .area-small}
-[![image](/asserts/img/participation.png)
-Follow @MozParticipate on Twitter](https://twitter.com/intent/follow/?screen_name=MozParticipate)
+{: #area-mozparticipate .col-md-6 .area .area-small}
+[![image](/asserts/img/participation.png)](https://twitter.com/intent/follow/?screen_name=MozParticipate)<br>
+[Follow @MozParticipate on Twitter](https://twitter.com/intent/follow/?screen_name=MozParticipate)
 
-{: #area-discourse .area .area-small}
-[![image](/asserts/img/discourse.png)
-Subscribe to the Participation Leaders forum](https://discourse.mozilla-community.org/c/participation-leaders)
+{: #area-discourse .col-md-6 .area .area-small}
+[![image](/asserts/img/discourse.png)](https://discourse.mozilla-community.org/c/participation-leaders)<br>
+[Subscribe to the Participation Leaders forum](https://discourse.mozilla-community.org/c/participation-leaders)
diff --git a/_pages/es/participation.md b/_pages/es/participation.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 title:  "Participation"
-permalink: /es/participation
+permalink: /es/participation/
 lang: es
 ref: participation
 ---

diff --git a/_pages/es/roadmap.md b/_pages/es/roadmap.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 title:  "Roadmap"
-permalink: /es/roadmap
+permalink: /es/roadmap/
 lang: es
 ref: roadmap
 ---

diff --git a/_pages/experiments/test-pilot.md b/_pages/experiments/test-pilot.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title:  "Install Test Pilot"
-permalink: /experiments/test-pilot
+permalink: /experiments/test-pilot/
 lang: en
 ref: test-pilot
 parent: experiments