Merge remote branch 'sgarrity-fork/bug-756356-dnt2' into dev

apps/landing/templates/landing/base-firefox.html

@@ -1,76 +0,0 @@
-{% extends "base.html" %}
-
-{% block body_class %}sky{% endblock %}
-
-{% block page_title_prefix %}Mozilla Firefox Web Browser — {% endblock %}
-
-{% block extrahead %}
-<meta name="og:image" content="{{ media('img/firefox/firefox-100.jpg') }}">
-{% endblock %}
-
-{% block site_header_nav %}
-<nav role="navigation" id="nav-main">
-  <ul role="menubar">
-    <li class="first" id="nav-main-features"><a href="/en-US/firefox/features/" tabindex="0" aria-owns="nav-main-features-submenu" aria-haspopup="true">Desktop</a>
-      <ul aria-expanded="false" id="nav-main-features-submenu">
-        <li class="first"><a href="{{ php_url('/firefox/features') }}" tabindex="-1">Features</a></li>
-        <li><a href="{{ php_url('/firefox/customize') }}" tabindex="-1">Customize</a></li>
-        <li><a href="{{ php_url('/firefox/performance') }}" tabindex="-1">Performance</a></li>
-        <li><a href="{{ php_url('/firefox/technology') }}" tabindex="-1">Technology</a></li>
-        <li class="last"><a href="{{ php_url('/firefox/security') }}" tabindex="-1">Privacy &amp; Security</a></li>
-      </ul>
-    </li>
-    <li id="nav-main-mobile"><a href="{{ php_url('/mobile/') }}" tabindex="0" aria-owns="nav-main-mobile-submenu" aria-haspopup="true">Mobile</a>
-      <ul aria-expanded="false" id="nav-main-mobile-submenu">
-        <li class="first"><a href="{{ php_url('/mobile/') }}" tabindex="-1">Download</a></li>
-        <li><a href="{{ php_url('/mobile/features/') }}" tabindex="-1">Features</a></li>
-        <li><a href="https://addons.mozilla.org/en-US/mobile/?browse=featured" tabindex="-1">Customize</a></li>
-        <li class="last"><a href="{{ php_url('/mobile/faq/') }}" tabindex="-1">FAQ</a></li>
-      </ul>
-    </li>
-    <li id="nav-main-releases" class=""><a href="{{ php_url('/firefox/channel/') }}" tabindex="0" aria-owns="nav-main-releases-submenu" aria-haspopup="true">Releases</a>
-      <ul aria-expanded="false" id="nav-main-releases-submenu">
-        <li class="first"><a href="{{ php_url('/firefox/channel/') }}" tabindex="-1">Overview</a></li>
-        <li><a href="{{ php_url('/firefox/aurora/') }}" tabindex="-1">Firefox Aurora</a></li>
-        <li><a href="{{ php_url('/firefox/beta/') }}" tabindex="-1">Firefox Beta</a></li>
-        <li><a href="{{ php_url('/firefox/') }}" tabindex="-1">Firefox</a></li>
-        <li class="last"><a href="{{ php_url('/firefox/organizations/') }}" tabindex="-1">Firefox for Organizations</a></li>
-      </ul>
-    </li>
-    <li id="nav-main-addons"><a href="https://addons.mozilla.org/" tabindex="0" aria-owns="nav-main-addons-submenu" aria-haspopup="true">Add-ons</a>
-      <ul aria-expanded="false" id="nav-main-addons-submenu">
-        <li class="first"><a href="https://addons.mozilla.org/firefox/" tabindex="-1">Desktop Add-ons</a></li>
-        <li><a href="https://addons.mozilla.org/mobile/" tabindex="-1">Mobile Add-ons</a></li>
-        <li class="last"><a href="http://www.getpersonas.com/" tabindex="-1">Personas</a></li>
-      </ul>
-      </li>
-      <li id="nav-main-support"><a href="http://support.mozilla.org/" tabindex="0" aria-owns="nav-main-support-submenu" aria-haspopup="true">Support</a>
-      <ul aria-expanded="false" id="nav-main-support-submenu">
-        <li class="first"><a href="http://support.mozilla.org/en-US/kb/" tabindex="-1">Desktop Support</a></li>
-        <li class="last"><a href="http://support.mozilla.org/mobile" tabindex="-1">Mobile Support</a></li>
-      </ul>
-    </li>
-    <li class="last" id="nav-main-about"><a href="/en-US/firefox/about/" tabindex="0" aria-owns="nav-main-about-submenu" aria-haspopup="true">About</a>
-      <ul aria-expanded="false" id="nav-main-about-submenu">
-        <li class="first"><a href="http://blog.mozilla.com/" tabindex="-1">Blog</a></li>
-        <li><a href="{{ php_url('/firefox/about/') }}" tabindex="-1">About Firefox</a></li>
-        <li><a href="http://www.mozilla.org/join" tabindex="-1">Join Mozilla</a></li>
-        <li><a href="{{ php_url('/about/participate/') }}" tabindex="-1">Participate</a></li>
-        <li><a href="http://blog.mozilla.org/press/" tabindex="-1">Press Center</a></li>
-        <li><a href="{{ php_url('/firefox/brand/') }}" tabindex="-1">Brand Toolkit</a></li>
-        <li><a href="{{ php_url('/about/careers.html') }}" tabindex="-1">Careers</a></li>
-        <li><a href="{{ php_url('/about/partnerships.html') }}" tabindex="-1">Partnerships</a></li>
-        <li class="last"><a href="{{ php_url('/about/contact.html') }}" tabindex="-1">Contact Us</a></li>
-      </ul>
-    </li>
-  </ul>
-</nav>
-{% endblock %}
-
-{% block site_header_logo %}
-<h1><img src="{{ media('img/firefox/template/header-logo.png') }}" alt="Mozilla Firefox" height="95" width="250"></h1>
-{% endblock %}
-
-{% block site_js %}
-  {{ js('firefox') }}
-{% endblock %}

apps/landing/templates/landing/devices.html

@@ -1,4 +1,4 @@
-{% extends "/landing/base-firefox.html" %}
+{% extends "/firefox/base.html" %}
 
 {% block page_title %}{{ _('Firefox is Made for Your Devices') }}{% endblock %}
 

media/css/sandstone/sandstone.less

@@ -323,7 +323,7 @@ px      68    160    252    344    436    528    620    712    804    896    */
 #masthead {
 
     h2 {
-        padding: (@baseLine * 1.5)  0;
+        padding: (@baseLine * 1.5) 0 @baseLine 0;
         margin: 0;
     }
 
@@ -373,9 +373,8 @@ px      68    160    252    344    436    528    620    712    804    896    */
 #masthead {
 
     nav.breadcrumbs {
-        padding: @baseLine / 2  0;
+        padding: 0 0 (@baseLine / 2)  0;
         float: none;
-        padding: 12px 0;
 
         a,
         span {