Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Remove Fx firstrun test. Bug 877202. #1753

Merged
merged 1 commit into from

2 participants

@jpetto
Collaborator
  • Removes images, CSS & JS files, & templates.

  • Class-based view remains for later use.

@alexgibson
Collaborator

Looks like you may also need to remove some of the tests here that are no longer needed?

@jpetto
Collaborator

Yes indeed. Issued the PR just before flying out the door yesterday. What's that thing haste makes? Fixing up tests now.

@jpetto jpetto Remove Fx firstrun test. Bug 877202.
- Removes images, CSS & JS files, & templates.

- Class-based view remains for later use.

- Updated class-based views & tests to use/expect a list
  of template names (conform to django intention)
f053285
@alexgibson
Collaborator

LGTM, r+

@alexgibson alexgibson merged commit 1c64a0e into from
@jpetto jpetto deleted the branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 5, 2014
  1. @jpetto

    Remove Fx firstrun test. Bug 877202.

    jpetto authored
    - Removes images, CSS & JS files, & templates.
    
    - Class-based view remains for later use.
    
    - Updated class-based views & tests to use/expect a list
      of template names (conform to django intention)
This page is out of date. Refresh to see the latest.
Showing with 9 additions and 898 deletions.
  1. +0 −147 bedrock/firefox/templates/firefox/firstrun-a.html
  2. +5 −42 bedrock/firefox/tests/test_base.py
  3. +4 −16 bedrock/firefox/views.py
  4. +0 −19 bedrock/settings/base.py
  5. +0 −194 media/css/firefox/firstrun/a.less
  6. +0 −164 media/css/firefox/firstrun/b.less
  7. +0 −197 media/css/firefox/firstrun/common.less
  8. BIN  media/img/firefox/firstrun/awesomebar-linux.jpg
  9. BIN  media/img/firefox/firstrun/awesomebar-mac.jpg
  10. BIN  media/img/firefox/firstrun/awesomebar-win.jpg
  11. BIN  media/img/firefox/firstrun/awesomebar.jpg
  12. BIN  media/img/firefox/firstrun/b/awesomebar-linux.jpg
  13. BIN  media/img/firefox/firstrun/b/awesomebar-mac.jpg
  14. BIN  media/img/firefox/firstrun/b/awesomebar-win.jpg
  15. BIN  media/img/firefox/firstrun/b/awesomebar.jpg
  16. BIN  media/img/firefox/firstrun/b/bookmarks-linux.jpg
  17. BIN  media/img/firefox/firstrun/b/bookmarks-mac.jpg
  18. BIN  media/img/firefox/firstrun/b/bookmarks-win.jpg
  19. BIN  media/img/firefox/firstrun/b/bookmarks.jpg
  20. BIN  media/img/firefox/firstrun/b/doing-good-collage.jpg
  21. BIN  media/img/firefox/firstrun/b/features-linux.jpg
  22. BIN  media/img/firefox/firstrun/b/features-mac.jpg
  23. BIN  media/img/firefox/firstrun/b/features-win.jpg
  24. BIN  media/img/firefox/firstrun/b/features.jpg
  25. BIN  media/img/firefox/firstrun/b/pinnedtabs-linux.jpg
  26. BIN  media/img/firefox/firstrun/b/pinnedtabs-mac.jpg
  27. BIN  media/img/firefox/firstrun/b/pinnedtabs-win.jpg
  28. BIN  media/img/firefox/firstrun/b/pinnedtabs.jpg
  29. BIN  media/img/firefox/firstrun/b/themes-linux.jpg
  30. BIN  media/img/firefox/firstrun/b/themes-mac.jpg
  31. BIN  media/img/firefox/firstrun/b/themes-win.jpg
  32. BIN  media/img/firefox/firstrun/b/themes.jpg
  33. BIN  media/img/firefox/firstrun/bookmarks-linux.jpg
  34. BIN  media/img/firefox/firstrun/bookmarks-mac.jpg
  35. BIN  media/img/firefox/firstrun/bookmarks-win.jpg
  36. BIN  media/img/firefox/firstrun/bookmarks.jpg
  37. BIN  media/img/firefox/firstrun/brand.jpg
  38. BIN  media/img/firefox/firstrun/brand.png
  39. BIN  media/img/firefox/firstrun/close.png
  40. BIN  media/img/firefox/firstrun/facebook.png
  41. BIN  media/img/firefox/firstrun/firefox-logo.png
  42. BIN  media/img/firefox/firstrun/pinnedtabs-linux.jpg
  43. BIN  media/img/firefox/firstrun/pinnedtabs-mac.jpg
  44. BIN  media/img/firefox/firstrun/pinnedtabs-poster.jpg
  45. BIN  media/img/firefox/firstrun/pinnedtabs-win.jpg
  46. BIN  media/img/firefox/firstrun/pinnedtabs.jpg
  47. BIN  media/img/firefox/firstrun/themes-linux.jpg
  48. BIN  media/img/firefox/firstrun/themes-mac.jpg
  49. BIN  media/img/firefox/firstrun/themes-win.jpg
  50. BIN  media/img/firefox/firstrun/themes.jpg
  51. BIN  media/img/firefox/firstrun/twitter.png
  52. +0 −22 media/js/firefox/firstrun/a.js
  53. +0 −97 media/js/firefox/firstrun/common.js
View
147 bedrock/firefox/templates/firefox/firstrun-a.html
@@ -1,147 +0,0 @@
-{# This Source Code Form is subject to the terms of the Mozilla Public
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#}
-
-{% extends "firefox/base.html" %}
-
-{% block extra_meta %}<meta name="robots" content="noindex">{% endblock %}
-
-{% block page_title %}{{ _('Welcome to Firefox') }}{% endblock %}
-{% block body_id %}firefox-firstrun{% endblock %}
-
-{% block site_header_nav %}{% endblock %}
-{% block site_header_logo %}{% endblock %}
-
-{% block extrahead %}
- <link rel="canonical" href="https://www.mozilla.org/en-US/firefox/22.0/firstrun/" />
-{% endblock %}
-
-{% block site_css %}
- {{ css('firefox_firstrun_new_a') }}
-{% endblock %}
-
-{% block string_data %}
- {# L10n: This is the label for a button that closes a modal dialog #}
- data-close="{{ _('Close') }}"
-{% endblock %}
-
-{% block content %}
-<main role="main">
- <header id="page-header">
- <img src="{{ media('img/firefox/firstrun/firefox-logo.png') }}" alt="Firefox" />
- <h1 class="large">{{_('Welcome to Firefox!')}}</h1>
- <h2>{{ _('Discover what makes it different.') }}</h2>
- </header>
-
- <ul class="social">
- <li>
- <img src="{{ media('img/firefox/firstrun/facebook.png') }}">
- <a class="facebook" href="https://www.facebook.com/Firefox">{{ _('Like us on Facebook') }}</a>
- </li>
- <li>
- <img src="{{ media('img/firefox/firstrun/twitter.png') }}">
- <a class="twitter" href="https://twitter.com/firefox">{{ _('Follow us on Twitter') }}</a>
- </li>
- </ul>
-
- <nav class="sticky-nav" id="sticky-nav" role="navigation">
- <ul>
- <li>
- <a href="#themes">{{ _('Customization') }}</a>
- </li>
- <li>
- <a href="#fasteasy">{{ _('Shortcuts') }}</a>
- </li>
- <li class="last">
- <a href="#pinnedtabs">{{ _('Innovative features') }}</a>
- </li>
- </ul>
- </nav>
-
- <article class="feature" id="themes">
- <div class="copy">
- <header>
- <h1>{{ _('Themes') }}</h1>
- </header>
-
- <p>
- {% trans %}
- Use Themes to change the look of your Firefox just about any way you like.
- {% endtrans %}
- </p>
-
- <a class="featurelink" href="https://addons.mozilla.org/en-us/firefox/themes/">{{ _('Explore Themes') }}</a>
- </div>
-
- <div class="screenshot">
- {{ platform_img('img/firefox/firstrun/themes.jpg', {'alt': _('Themes')}) }}
- </div>
- </article>
-
- <article class="feature img-right" id="fasteasy">
- <div class="copy">
- <header>
- <h1>{{ _('Awesome Bar') }}</h1>
- </header>
-
- <p>
- {% trans %}
- The address bar remembers sites as you browse and helps you find them quickly
- and easily using words from any part of the URL or page title.
- {% endtrans %}
- </p>
-
- <a class="featurelink" href="{{ url('firefox.features') }}#madeeasy">{{ _('See how it works') }}</a>
- </div>
-
- <div class="screenshot">
- {{ platform_img('img/firefox/firstrun/awesomebar.jpg', {'alt': _('Awesome Bar')}) }}
- </div>
- </article>
-
- <article class="feature img-right" id="pinnedtabs">
- <div class="copy">
- <header>
- <h1>{{ _('Pinned tabs') }}</h1>
- </header>
-
- <p>
- {% trans %}
- These small tabs open automatically when you start your browser and notify you
- with when something in them changes.
- {% endtrans %}
- </p>
-
- <p>
- {% trans url1='#pinnedtabs-video', id1='pinnedtabs-video-link' %}
- Try it for yourself: Right-click on any tab and click “Pin Tab”.
- <a id="{{ id1 }}" href="{{ url1 }}">See how they work</a>
- {% endtrans %}
- </p>
- </div>
-
- <div class="screenshot" id="pinnedtabs-screenshot">
- {{ platform_img('img/firefox/firstrun/pinnedtabs.jpg', {'alt': _('Pinned tabs')}) }}
- </div>
- </article>
-
- <aside class="form">
- {{ email_newsletter_form(title='Get Firefox Updates') }}
- </aside>
-</main>
-
-<div id="video-container">
- <video id="pinnedtabs-video" poster="{{ media('/img/firefox/firstrun/pinnedtabs-poster.jpg') }}" src="" controls></video>
-</div>
-
-{% endblock %}
-
-{% block email_form %}{% endblock %}
-
-{% block site_footer %}
- {% include 'firefox/includes/simple_footer.html' %}
-{% endblock %}
-
-{% block js %}
- {{ js('firefox_firstrun_new_a') }}
-{% endblock %}
View
47 bedrock/firefox/tests/test_base.py
@@ -420,7 +420,7 @@ def test_can_post(self, render_mock):
req = self.rf.post('/en-US/firefox/whatsnew/')
self.view(req)
# would return 405 before calling render otherwise
- render_mock.assert_called_once_with(req, 'firefox/whatsnew.html', ANY)
+ render_mock.assert_called_once_with(req, ['firefox/whatsnew.html'], ANY)
@patch.object(fx_views.WhatsnewView, 'fxos_locales', ['de'])
def test_fxos_locales(self, render_mock):
@@ -431,14 +431,14 @@ def test_fxos_locales(self, render_mock):
template = render_mock.call_args[0][1]
ctx = render_mock.call_args[0][2]
ok_('locales_with_video' not in ctx)
- eq_(template, 'firefox/whatsnew-fxos.html')
+ eq_(template, ['firefox/whatsnew-fxos.html'])
def test_fx_nightly_29(self, render_mock):
"""Should use special nightly template for 29.0a1."""
req = self.rf.get('/en-US/firefox/whatsnew/')
self.view(req, fx_version='29.0a1')
template = render_mock.call_args[0][1]
- eq_(template, 'firefox/whatsnew-nightly-29.html')
+ eq_(template, ['firefox/whatsnew-nightly-29.html'])
@override_settings(DEV=True)
def test_fx_nightly_29_australis(self, render_mock):
@@ -446,7 +446,7 @@ def test_fx_nightly_29_australis(self, render_mock):
req = self.rf.get('/en-US/firefox/whatsnew/')
self.view(req, fx_version='29.0a2')
template = render_mock.call_args[0][1]
- eq_(template, 'firefox/whatsnew-aurora-29.html')
+ eq_(template, ['firefox/whatsnew-aurora-29.html'])
@override_settings(DEV=False)
def test_fx_australis_secure_redirect(self, render_mock):
@@ -488,7 +488,7 @@ def test_can_post(self, render_mock):
req = self.rf.post('/en-US/firefox/firstrun/')
self.view(req)
# would return 405 before calling render otherwise
- render_mock.assert_called_once_with(req, 'firefox/firstrun.html', ANY)
+ render_mock.assert_called_once_with(req, ['firefox/firstrun.html'], ANY)
@patch.object(fx_views, 'firefox_details', firefox_details)
@@ -636,43 +636,6 @@ def test_firstrun_standard(self):
response = self.client.get(self.url, HTTP_USER_AGENT=user_agent)
self.assertIn(expected, response.content)
- @patch.dict(product_details.firefox_versions,
- LATEST_FIREFOX_VERSION='16.0')
- def test_firstrun_alternate(self):
- """
- Hitting /firefox/{version}/firstrun/?f={fx_views.FirstrunView.funnelcake_campaign}
- with latest Fx & en-US locale should render firefox/firstrun/a.html, regardless of
- {version}. Any other f value or locale should render firefox/firstrun.html.
- """
- user_agent = ('Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) '
- 'Gecko/20100101 Firefox/16.0')
-
- fc_id = fx_views.FirstrunView.funnelcake_campaign
- expected = 'Use Themes to change the look of your Firefox just about any way you like.'
-
- # en-US with proper funnelcake id should give expected content
- response = self.client.get(self.url + '?f=' + fc_id, HTTP_USER_AGENT=user_agent)
- self.assertIn(expected, response.content)
-
- # en-US with improper funnelcake id should not give expected content
- response = self.client.get(self.url + '?f=0', HTTP_USER_AGENT=user_agent)
- self.assertNotIn(expected, response.content)
-
- # en-US with no funnelcake id should not give expected content
- response = self.client.get(self.url, HTTP_USER_AGENT=user_agent)
- self.assertNotIn(expected, response.content)
-
- # en-US with proper funnelcake id and no {version} should give expected content
- self.url = reverse('firefox.firstrun')
- response = self.client.get(self.url + '?f=' + fc_id, HTTP_USER_AGENT=user_agent)
- self.assertIn(expected, response.content)
-
- # es-ES with proper funnelcake id should not give expected content
- with self.activate('es-ES'):
- self.url = reverse('firefox.firstrun', args=['16.0'])
- response = self.client.get(self.url + '?f=' + fc_id, HTTP_USER_AGENT=user_agent)
- self.assertNotIn(expected, response.content)
-
@patch.object(fx_views, 'firefox_details', firefox_details)
class TestReleaseNotesIndex(TestCase):
View
20 bedrock/firefox/views.py
@@ -22,7 +22,6 @@
from bedrock.firefox import version_re
from bedrock.firefox.forms import SMSSendForm
-from bedrock.mozorg.context_processors import funnelcake_param
from bedrock.mozorg.views import process_partnership_form
from bedrock.firefox.utils import is_current_or_newer
from bedrock.firefox.firefox_details import firefox_details, mobile_details
@@ -343,20 +342,7 @@ def render_to_response(self, context, **response_kwargs):
class FirstrunView(LatestFxView):
- funnelcake_campaign = '25'
-
- def get_template_names(self):
- locale = l10n_utils.get_locale(self.request)
- fc_ctx = funnelcake_param(self.request)
-
- if (locale == 'en-US' and
- fc_ctx.get('funnelcake_id', 0) == self.funnelcake_campaign):
-
- template = 'firefox/firstrun-a.html'
- else:
- template = 'firefox/firstrun.html'
-
- return template
+ template_name = 'firefox/firstrun.html'
class WhatsnewView(LatestFxView):
@@ -407,7 +393,9 @@ def get_template_names(self):
template = 'firefox/whatsnew-fxos.html'
else:
template = 'firefox/whatsnew.html'
- return template
+
+ # return a list to conform with original intention
+ return [template]
def fix_fx_version(fx_version):
View
19 bedrock/settings/base.py
@@ -210,14 +210,6 @@ def JINJA_CONFIG():
'css/sandstone/video.less',
'css/firefox/nightly_firstrun.less',
),
- 'firefox_firstrun_new_a': (
- 'css/sandstone/video.less',
- 'css/firefox/firstrun/a.less',
- ),
- 'firefox_firstrun_new_b': (
- 'css/sandstone/video.less',
- 'css/firefox/firstrun/b.less',
- ),
'firefox_fx': (
'css/firefox/fx.less',
'css/sandstone/video.less',
@@ -505,17 +497,6 @@ def JINJA_CONFIG():
'js/base/mozilla-modal.js',
'js/firefox/firstrun/firstrun.js',
),
- 'firefox_firstrun_new_a': (
- 'js/libs/jquery.waypoints.min.js',
- 'js/libs/jquery.waypoints-sticky.min.js',
- 'js/base/mozilla-modal.js',
- 'js/firefox/firstrun/common.js',
- 'js/firefox/firstrun/a.js',
- ),
- 'firefox_firstrun_new_b': (
- 'js/base/mozilla-modal.js',
- 'js/firefox/firstrun/common.js',
- ),
'firefox_fx': (
'js/base/mozilla-pager.js',
'js/base/mozilla-video-tools.js',
View
194 media/css/firefox/firstrun/a.less
@@ -1,194 +0,0 @@
-@import "../../sandstone/lib.less";
-@import "common.less";
-
-#page-header {
- h1 {
- font-size: 72px;
- margin: -20px 0 0 0;
- }
-
- h2 {
- font-size: 40px;
- font-style: italic;
- margin-bottom: @baseLine;
- }
-}
-
-ul.social {
- margin-bottom: (@baseLine/2);
- li {
- margin-top: (@baseLine/2);
- text-align: right;
- }
-}
-
-.sticky-nav {
- .content-box;
- margin-bottom: @baseLine;
- .transition;
- ul {
- list-style-type: none;
- text-align: center;
- margin: 0;
- }
- li {
- display: inline;
- padding: 4px 0;
- border-right: 1px dotted #d2d2d2;
- margin-left: 0;
- &.last {
- border-right: none;
- }
- }
- a {
- padding: 0 @baseLine;
- font-size: 16px;
- line-height: 44px;
- }
-}
-
-.stuck {
- position: fixed;
- top: 0px;
- z-index: 10;
- width: 980px;
-}
-
-.sticky-wrapper {
- .stuck {
- @shadow: 0 3px 4px 0px rgba(0, 0, 0, 0.4);
- .box-shadow(@shadow);
- }
-}
-
-.feature {
- h1 {
- font-size: 43px;
- color: #484848;
- }
-
- .copy {
- width: 49%;
- .border-box;
- padding: (@baseLine * 2) (@baseLine * 1.5) (@baseLine * 2) @baseLine;
- font-size: 16px;
-
- p {
- font-size: 18px;
- line-height: 26px;
- color: #666;
- }
- }
-
- .screenshot {
- width: 49%;
- }
-
- .screenshot-offset {
- margin-bottom: -30px;
- }
-}
-
-.img-right {
- .copy {
- float: left;
- padding: (@baseLine * 2) @baseLine (@baseLine * 2) (@baseLine * 1.5);
- }
-
- .screenshot {
- left: auto;
- right: 0px;
- }
-
- img {
- float: right;
- }
-}
-
-.column-last {
- margin-right: 0;
-}
-
-// uncomment the below if we go back to the responsive template.
-
-/* Tablet layout: 760px */
-//@media only screen and (max-width: @breakDesktop) and (min-width: @breakTablet) {
-// .stuck {
-// width: @breakTablet;
-// }
-//
-// .column {
-// width: (370px - (@baseLine * 2));
-// }
-//}
-//
-///* Mobile landscape layout: 480px */
-//@media only screen and (max-width: @breakTablet) {
-// #page-header {
-// h1 {
-// font-size: 52px;
-// }
-//
-// h2 {
-// font-size: 30px;
-// }
-// }
-//
-// .sticky-nav {
-// padding: (@baseLine/2) 0;
-// ul {
-// text-align: left;
-// }
-// li {
-// margin-left: 10px;
-// display: block;
-// border: none;
-// a {
-// line-height: 28px;
-// }
-// }
-// }
-//
-// .stuck {
-// width: @breakMobileLandscape - (@baseLine * 2);
-// }
-//
-// .feature {
-// .copy {
-// float: none;
-// width: auto;
-// }
-//
-// .screenshot {
-// position: relative;
-// width: auto;
-// }
-// }
-//
-// .column {
-// float: none;
-// margin: 0 0 @baseLine 0;
-// width: (@breakMobileLandscape - (@baseLine * 4));
-// }
-//}
-//
-///* Mobile layout: 320px */
-//@media only screen and (max-width: @breakMobileLandscape) {
-// #page-header {
-// h1 {
-// font-size: 38px;
-// }
-//
-// h2 {
-// font-size: 24px;
-// }
-// }
-//
-// .stuck {
-// width: @breakMobile;
-// }
-//
-// .column {
-// width: (@breakMobile - (@baseLine * 2));
-// }
-//}
View
164 media/css/firefox/firstrun/b.less
@@ -1,164 +0,0 @@
-@import "../../sandstone/lib.less";
-@import "common.less";
-
-#page-header {
- h1 {
- font-size: 84px;
- margin-bottom: (@baseLine * 2.5);
- }
-}
-
-.feature {
- font-size: 16px;
- h1 {
- font-size: 56px;
- line-height: 66px;
- }
-
- .copy {
- width: 456px;
- .border-box;
- padding: @baseLine @baseLine (@baseLine * 0.5) 0;
-
- p {
- font-size: 24px;
- line-height: 32px;
- }
-
- ul {
- margin-top: (@baseLine * 2);
- border-top: 1px dotted #b1b1b1;
- li {
- &:first-child {
- margin-right: (@baseLine * 2);
- }
- a {
- font-size: @baseFontSize;
- }
- }
- }
- }
-
- .screenshot {
- width: 524px;
- }
-}
-
-.feature-alt {
- .copy {
- width: 456px;
- padding: @baseLine @baseLine (@baseLine * 0.5) 0;
- ul {
- margin-top: (@baseLine * 2);
- }
- }
- .screenshot {
- width: 524px;
- }
-}
-
-ul.social {
- li {
- display: inline-block;
- img {
- display: inline;
- }
- }
-}
-
-.column {
- @shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
- .box-shadow(@shadow);
- position: relative;
- float: left;
- width: 313px;
- height: 200px;
- overflow: hidden;
- margin: 0 @baseLine @baseLine 0;
- color: #fff;
- text-shadow: 0 1px 0 rgba(0, 0, 0, 0.4);
- h1 {
- font-size: 24px;
- color: #fff;
- text-shadow: 0 1px 0 rgba(0, 0, 0, 0.4);
- letter-spacing: 0px;
- }
- a {
- color: #ffde00;
- &:hover {
- color: #ffde00;
- }
- }
-
- .copy {
- position: relative;
- padding: @baseLine @baseLine 0 @baseLine;
- z-index: 2;
-
- p {
- line-height: 1.4;
- }
- }
-
- .screenshot {
- z-index: 1;
- }
-}
-
-.column-last {
- margin-right: 0;
-}
-
-.pinnedtabs {
- background: #386394;
-
- .screenshot {
- left: auto;
- right: 0px;
- }
-}
-
-.themes {
- background: #33607a;
-}
-
-.awesomebar {
- background: #675e8a;
-
- p {
- width: 45%;
- }
-
- .screenshot {
- left: auto;
- right: 0px;
- }
-}
-
-.bookmarks {
- background: #8a5e5e;
-}
-
-
-// include the below if we go back to the responsive template.
-// this version (B) was never completely responsivized - there will
-// be a little work to do here if we go back to responsive.
-
-///* Tablet layout: 760px */
-//@media only screen and (max-width: @breakDesktop) and (min-width: @breakTablet) {
-// .feature {
-// h1 {
-// font-size: 50px;
-// line-height: 60px;
-// }
-//
-// .copy {
-// padding: (@baseLine * 1.5) (@baseLine * 1.5) (@baseLine * 0.5) (@baseLine * 2);
-// }
-//
-// .screenshot {
-// top: (@baseLine * 2);
-// bottom: auto;
-// }
-// }
-//}
View
197 media/css/firefox/firstrun/common.less
@@ -1,197 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-@import "../template.less";
-@import "../simple_footer-resp.less";
-
-// wipe out the below if we go back to being responsive
-#wrapper {
- width: 980px;
- margin: 0 auto;
- padding-bottom: 150px;
-}
-
-#colophon {
- background: #fff;
- width: 100%;
-
- .row {
- margin-left: 0;
- }
-}
-// yep, wipe out the above if we switch back to the responsive template
-
-.sky a {
- color: #00539F;
- &:hover {
- color: #0095DD;
- }
-}
-
-.content-box {
- @shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
- .box-shadow(@shadow);
- background: #fff;
- width: 980px;
-}
-
-#page-header {
- text-align: center;
-}
-
-.feature a:after, .column a:after {
- content: "\0000a0\00BB";
-}
-
-.feature {
- position: relative;
- overflow: hidden;
- .content-box;
- .clearfix;
- margin-bottom: @baseLine;
- font-weight: 100;
- .open-sans-light;
-
- .copy {
- float: right;
- }
-}
-
-.screenshot {
- position: absolute;
- bottom: 0px;
- left: 0px;
-
- img {
- display: block;
- }
-}
-
-ul.social {
- list-style-type: none;
- li {
- margin: @baseLine 0 0 0;
- img {
- vertical-align: middle;
- margin-right: 12px;
- width: 25px;
- height: 25px;
- }
- }
-}
-
-.columns {
- .clearfix;
-}
-
-.button {
- display: block;
- margin-top: 30px;
- padding: 12px 50px;
- font-size: 18px;
- border-radius: 0.35em;
- font-weight: 100;
- min-width: 0;
-}
-
-.button img {
- margin-left: 7px;
- vertical-align: middle;
-}
-
-input[type="email"] {
- padding: 9px 14px;
- border-radius: 5px;
- @shadow: inset 0 2px 3px rgba(12, 12, 12, 0.2);
- .box-shadow(@shadow);
- width: 250px;
-}
-
-#video-container {
- display: none;
-}
-
-#pinnedtabs-video {
- display: block;
- position: absolute;
- border: 7px solid #fff;
- @shadow: 0 4px 10px rgba(5, 6, 6, 0.75);
- width: 415px;
- height: 232px;
- .box-shadow(@shadow);
-}
-
-.form {
- .content-box;
- width: 100%;
-
- .billboard {
- width: auto;
- padding: 0;
- border-bottom: 0;
-
- .button {
- margin-top: 0;
- }
- }
-
- #footer-email-form {
- margin-left: @baseLine;
- h3 {
- margin-top: 10px;
- }
-
- .form-contents {
- margin-top: 6px;
- }
-
- .form-submit {
- float: right;
- }
- }
-}
-
-// extract to modal.less?
-body.noscroll {
- overflow: hidden;
-}
-
-#modal {
- background: #444;
- background: rgba(0, 0, 0, 0.9);
- width: 100%;
- height: 101%;
- position: fixed;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- z-index: 9999999;
- overflow: auto;
- display: none;
-}
-
-#modal .inner {
- margin: 40px auto;
- padding: 0 20px;
- color: #f3f3f3;
-}
-
-#modal .close {
- position: fixed;
- z-index: 99;
-}
-// end generic modal
-
-#modal .close {
- background: url(/media/img/firefox/firstrun/close.png) center center no-repeat;
- width: 32px;
- height: 32px;
- overflow: hidden;
- border: 0;
- cursor: pointer;
- .close-text {
- visibility: hidden;
- }
-}
View
BIN  media/img/firefox/firstrun/awesomebar-linux.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/awesomebar-mac.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/awesomebar-win.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/awesomebar.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/awesomebar-linux.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/awesomebar-mac.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/awesomebar-win.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/awesomebar.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/bookmarks-linux.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/bookmarks-mac.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/bookmarks-win.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/bookmarks.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/doing-good-collage.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/features-linux.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/features-mac.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/features-win.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/features.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/pinnedtabs-linux.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/pinnedtabs-mac.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/pinnedtabs-win.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/pinnedtabs.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/themes-linux.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/themes-mac.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/themes-win.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/b/themes.jpg
Deleted file not rendered
View
BIN  media/img/firefox/firstrun/bookmarks-linux.jpg
Diff not rendered
View
BIN  media/img/firefox/firstrun/bookmarks-mac.jpg
Diff not rendered
View
BIN  media/img/firefox/firstrun/bookmarks-win.jpg
Diff not rendered
View
BIN  media/img/firefox/firstrun/bookmarks.jpg
Diff not rendered
View
BIN  media/img/firefox/firstrun/brand.jpg
Diff not rendered
View
BIN  media/img/firefox/firstrun/brand.png
Diff not rendered
View
BIN  media/img/firefox/firstrun/close.png
Diff not rendered
View
BIN  media/img/firefox/firstrun/facebook.png
Diff not rendered
View
BIN  media/img/firefox/firstrun/firefox-logo.png
Diff not rendered
View
BIN  media/img/firefox/firstrun/pinnedtabs-linux.jpg
Diff not rendered
View
BIN  media/img/firefox/firstrun/pinnedtabs-mac.jpg
Diff not rendered
View
BIN  media/img/firefox/firstrun/pinnedtabs-poster.jpg
Diff not rendered
View
BIN  media/img/firefox/firstrun/pinnedtabs-win.jpg
Diff not rendered
View
BIN  media/img/firefox/firstrun/pinnedtabs.jpg
Diff not rendered
View
BIN  media/img/firefox/firstrun/themes-linux.jpg
Diff not rendered
View
BIN  media/img/firefox/firstrun/themes-mac.jpg
Diff not rendered
View
BIN  media/img/firefox/firstrun/themes-win.jpg
Diff not rendered
View
BIN  media/img/firefox/firstrun/themes.jpg
Diff not rendered
View
BIN  media/img/firefox/firstrun/twitter.png
Diff not rendered
View
22 media/js/firefox/firstrun/a.js
@@ -1,22 +0,0 @@
-;(function($) {
- 'use strict';
-
- $('#sticky-nav').waypoint('sticky');
-
- // Scroll to the linked section
- $(window).on('click', '#sticky-nav a[href^="#"]', function(e) {
- e.preventDefault();
-
- // Extract the target element's ID from the link's href.
- var elem = $(this).attr("href").replace( /.*?(#.*)/g, "$1" );
-
- $('html, body').animate({
- scrollTop: $(elem).offset().top - 70
- }, 700, function() {
- $(elem).attr('tabindex','100').focus().removeAttr('tabindex');
- });
-
- // GA tracking
- window.gaq_track('navigation interaction', 'click', $(this).attr('href'));
- });
-})(window.jQuery);
View
97 media/js/firefox/firstrun/common.js
@@ -1,97 +0,0 @@
-;(function($) {
- 'use strict';
-
- var $video_container = $('#video-container');
- var $video = $('#pinnedtabs-video');
- var $video_content;
- var video_closing = false;
-
- if ($('html').hasClass('osx')) {
- $video.attr('src', '//videos-cdn.mozilla.net/serv/drafts/pinnedtabs-mac.webm');
- } else {
- $video.attr('src', '//videos-cdn.mozilla.net/serv/drafts/pinnedtabs-win.webm');
- }
-
- window.gaq_track = function(category, action, label) {
- if (window._gaq) {
- window._gaq.push(['_trackEvent', category, action, label]);
- }
- };
-
- // delay redirect so GA tracking has time to fire
- var track_and_redirect = function(category, action, label, url) {
- gaq_track(category, action, label);
-
- setTimeout(function() {
- window.location.href = url;
- }, 500);
- };
-
- // video should be positioned directly over pinned tabs screenshot
- var position_video = function() {
- var pos = $('#pinnedtabs-screenshot').offset();
- var scroll_top = $(window).scrollTop();
-
- var top = pos.top - scroll_top;
- var left = pos.left;
-
- $video.css({
- 'top': top,
- 'left': left
- });
-
- $('#modal-close').css({
- 'top': (top - 16),
- 'left': (left + $video.width() - 4)
- });
- };
-
- var reattach_video = function() {
- // to avoid tracking video pause event fired when modal closes
- if (!$video[0].paused) {
- video_closing = true;
- }
- $video_container.append($video_content);
- };
-
- $('a[href="#pinnedtabs-video"]').on('click', function(e) {
- e.preventDefault();
-
- $video_content = $video.detach();
-
- Mozilla.Modal.createModal(this, $video_content, { onCreate: position_video, onDestroy: reattach_video });
-
- video_closing = false;
-
- gaq_track('first run interaction', 'open video', 'Pinned Tabs Video');
- });
-
- // GA tracking
- $('a.featurelink').on('click', function(e) {
- e.preventDefault();
- track_and_redirect('first run interaction', 'click', $(this).attr('href'), $(this).attr('href'));
- });
-
- $('.social a').on('click', function(e) {
- e.preventDefault();
- track_and_redirect('social interaction', 'click', $(this).attr('class'), $(this).attr('href'));
- });
-
- $video.on('play', function() {
- gaq_track("first run interaction", "play", "Pinned Tabs Video");
- }).on('pause', function() {
- // video pause event is fired when modal closes
- // do not track this particular pause event
- if (!video_closing) {
- // is video over?
- // 'pause' event fires just before 'ended', so
- // using 'ended' results in extra pause tracking.
- var action = ($video[0].currentTime === $video[0].duration) ? 'finish' : 'pause';
-
- gaq_track("first run interaction", action, "Pinned Tabs Video");
-
- video_closing = false;
- }
- });
-
-})(window.jQuery);
Something went wrong with that request. Please try again.