Revert "Merge branch 'master' of github.com:mozilla/bedrock"

This reverts commit 1f2108d1f8, reversing
changes made to f3df06b2f8.

apps/marketplace/urls.py

@@ -1,6 +1,7 @@
 from django.conf.urls.defaults import *
 from views import marketplace
+from bedrock_util import secure_required
 
 urlpatterns = patterns('',
-    (r'^$', marketplace),
+    (r'^$', secure_required(marketplace)),
 )

apps/marketplace/views.py

@@ -1,7 +1,6 @@
 import l10n_utils
 from django.conf import settings
 from django.core.validators import email_re
-from bedrock_util import secure_required
 from django.views.decorators.csrf import csrf_exempt
 
 import basket
@@ -9,7 +8,6 @@ import basket
 from mozorg.forms import NewsletterForm
 
 @csrf_exempt
-@secure_required
 def marketplace(request):
     success = False
     form = NewsletterForm(request.POST or None)

apps/mozorg/templates/mozorg/download_button_base.html

@@ -1,4 +1,10 @@
 <aside id="{{ id }}" class="download-button {% block class %}download-button-large{% endblock %}">
+  {% block noscript %}
+  <noscript>
+    {% include "mozorg/download_button_dumb.html" %}
+  </noscript>
+  {% endblock %}
+
   {% block unsupported %}
   <div class="unsupported-download">
     {% include "mozorg/download_button_dumb.html" %}

media/css/firefox/new.less

@@ -16,6 +16,10 @@
     }
 }
 
+.download-button {
+    width: 300px;
+}
+
 ul#benefits {
     padding: 4px 0 24px 12px;
     margin: 0;
@@ -45,18 +49,13 @@ ul#benefits li span {
     display: block;
 }
 
-.download-button {
-    width: 300px;
-    small.download-other {
+
+.download-button small.download-other {
     color: #ffcf72;
     a:link,
     a:visited {
         color: #ffcf72;
     }
-    }
-    .unsupported-download h4 {
-        color: #fff;
-    }
 }
 
 #beta-promo {

media/css/sandstone/buttons.less

@@ -91,6 +91,10 @@
 
 // Product download buttons
 
+.download-button .unsupported-download {
+    display: none;
+}
+
 .download-button {
     .inline-block;
     ul {
@@ -201,17 +205,11 @@ li.os_android,
     }
 }
 
-.download-button .unsupported-download {
-    display: none;
-}
-
-.no-js,
-.other {
-    .download-button .unsupported-download {
+.other .download-button .unsupported-download {
     display: block;
-    }
 }
 
+.download-button noscript,
 .download-button .unsupported-download {
     text-align: right;
     h4 {