mozilla
/
bedrock
зеркало из https://github.com/mozilla/bedrock.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix bug 1026573 - replace world cup home promo with Firefox desktop 

And revert tabzilla back to the Web We Want promo
This commit is contained in:
Craig Cook 2014-07-02 00:47:51 -07:00
Родитель f7649adce0
Коммит f28e02cb0f
12 изменённых файлов: 7 добавлений и 258 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

21
bedrock/mozorg/templates/mozorg/home.html
Просмотреть файл

@ -118,26 +118,7 @@
{% endif %}
{# Position 2: "Build Products" #}
{% if l10n_has_tag('promo_worldcup2014') or settings.DEV %}
<li id="panel-worldcup2014" class="panel" tabindex="0">
{# L10n: The active word should be wrapped in <i></i> tags, though it may appear at a different position in the translated title. #}
<h2 class="panel-title">{{ _('Football <i>fanatic?</i>') }}</h2>
<div class="ball"></div>
<div class="panel-inner">
<div class="panel-content">
{% if request.locale in ['pt-BR','es-ES','es-CL','es-AR','es-MX','id','de','fr','it'] %}
<a href="https://activations.cdn.mozilla.net/{{ LANG }}/goal.html?utm_source=mozcarousel&amp;utm_medium=banner&amp;utm_content=goalcom{{ LANG }}&amp;utm_campaign=WC2014">
{% else %}
<a href="https://activations.cdn.mozilla.net/en-US/goal.html?utm_source=mozcarousel&amp;utm_medium=banner&amp;utm_content=goalcomen-US&amp;utm_campaign=WC2014" hreflang="en-US">
{% endif %}
<h3>{{ _('Football fanatic?') }}</h3>
<p>{{ _('Firefox lets you keep up with all the action in Brazil.') }}</p>
<p class="go">{{ _('Activate the Goal.com sidebar') }}</p>
</a>
</div>
</div>
</li>
{% elif l10n_has_tag('promo_fxdesktop') %}
{% if l10n_has_tag('promo_fxdesktop') or settings.DEV %}
<li id="panel-fxdesktop" class="panel" tabindex="0">
{# L10n: This is the label seen when the panel is collapsed so it may need to be altered to fit a limited space. The active phrase should be wrapped in <i></i> tags. #}
<h2 class="panel-title">{{ _('<i>Try the best</i> Firefox yet') }}</h2>

14
bedrock/tabzilla/templates/tabzilla/tabzilla.js
Просмотреть файл

@ -652,15 +652,11 @@ var Tabzilla = (function (Tabzilla) {
'<div id="tabzilla-panel" class="tabzilla-closed" tabindex="-1">'
+ ' <div id="tabzilla-contents">'
+ ' <div id="tabzilla-promo">'
{% if l10n_has_tag('promo_worldcup2014_tabzilla') or settings.DEV %}
+ ' <div class="snippet" id="tabzilla-promo-worldcup2014">'
{% if request.locale in ['pt-BR','es-ES','es-CL','es-AR','es-MX','id','de','fr','it'] %}
+' <a href="https://activations.cdn.mozilla.net/{{ LANG }}/goal.html?icn=tabz&amp;utm_source=tabzilla&amp;utm_medium=banner&amp;utm_content=goalcom{{ LANG }}&amp;utm_campaign=WC2014">'
{% else %}
+' <a href="https://activations.cdn.mozilla.net/en-US/goal.html?icn=tabz&amp;utm_source=tabzilla&amp;utm_medium=banner&amp;utm_content=goalcomen-US&amp;utm_campaign=WC2014" hreflang="en-US">'
{% endif %}
+ ' <h4>{{ _('Football fanatic?')|js_escape }}</h4>'
+ ' <p><b class="button">{{ _('Activate the Goal.com sidebar')|js_escape }}</b></p>'
{% if l10n_has_tag('promo_webwewant') or settings.DEV %}
+ ' <div class="snippet" id="tabzilla-promo-webwewant">'
+ ' <a href="https://webwewant.mozilla.org/?icn=tabz">'
+ ' <h4>{{ _('What kind of Web do you want?')|js_escape }}</h4>'
+ ' <p>{{ _('Share your vision')|js_escape }}</p>'
+ ' </a>'
+ ' </div>'
{% else %}

8
media/css/mozorg/home-ie.less
Просмотреть файл

@ -106,14 +106,6 @@
}
}
#panel-worldcup2014 {
background: #3191c4 url(/media/img/home/panel/worldcup2014/bg-flat.png) no-repeat;
.ball {
display: none;
}
}
#panel-netneutrality {
background-position: 0 -30px;
}

11
media/css/mozorg/home-ie8.less
Просмотреть файл

@ -100,17 +100,6 @@
}
}
// World Cup 2014
#panel-worldcup2014,
#panel-worldcup2014.expanded,
#panel-worldcup2014.compressed {
background-position: 350px -10px, 0 0;
.ball {
left: -100px;
}
}
// IE8 doesn't do gradients or rgba() so it gets solid, opaque colors.
#panel-mission .panel-title {
background: #821117;

13
media/css/mozorg/home-ie9.less
Просмотреть файл

@ -78,18 +78,7 @@
}
}
// World Cup 2014
#panel-worldcup2014,
#panel-worldcup2014.expanded,
#panel-worldcup2014.compressed {
background-position: 350px -10px, 0 0;
.ball {
left: -100px;
.transform(rotate(0deg));
}
}
// Net Neutrality
#panel-netneutrality.expanded,
#panel-netneutrality.compressed {
background-position: 50px 60px, -660px 0, 0 0;

134
media/css/mozorg/home-promo.less
Просмотреть файл

@ -297,50 +297,6 @@
/****************************************************************************/
// World Cup 2014
#panel-worldcup2014 {
background: #3191c4 url(/media/img/home/panel/worldcup2014/bg-flat.png) no-repeat;
background: url(/media/img/home/panel/worldcup2014/bg-player.png) 450px -10px no-repeat,
#3191c4 url(/media/img/home/panel/worldcup2014/bg-stripes.png) no-repeat;
.ball {
background: url(/media/img/home/panel/worldcup2014/bg-ball.svg) no-repeat;
background-size: 370px 370px;
position: absolute;
left: -150px;
top: -20px;
width: 370px;
height: 370px;
-webkit-transition: -webkit-transform .7s ease-in-out,
left .7s ease-in-out;
transition: transform .7s ease-in-out,
left .7s ease-in-out;
}
&.expanded {
background-position: 350px -10px, 0 0;
.ball {
.transform(rotate(20deg));
left: -100px;
}
}
&.compressed .ball {
left: -160px;
}
}
.wide #panel-worldcup2014 .panel-title {
background: #2c4721;
background: rgba(0, 0, 0, .8);
background: -webkit-linear-gradient(bottom, rgba(0, 0, 0, .55) 65%, rgba(0, 0, 0, 0) 100%);
background: linear-gradient(to top, rgba(0, 0, 0, .55) 65%, rgba(0, 0, 0, 0) 100%);
}
/****************************************************************************/
// Net Neutrality
#panel-netneutrality {
@ -544,30 +500,6 @@
}
}
// World Cup 2014
#panel-worldcup2014 {
.ball {
left: -130px;
top: -20px;
width: 350px;
height: 350px;
background-size: 350px 350px;
}
&.expanded {
background-position: 240px -10px, 0 0;
.ball {
left: -170px;
.transform(rotate(-40deg));
}
}
&.compressed .ball {
left: -180px;
}
}
// Net Neutrality
#panel-netneutrality {
@ -775,39 +707,6 @@
}
}
// World Cup 2014
#panel-worldcup2014 {
background-size: 180px 294px, auto auto;
background-position: 320px -10px, 0 -30px;
.ball {
left: -60px;
top: -50px;
width: 160px;
height: 160px;
background-size: 160px 160px;
-webkit-transition: -webkit-transform .7s ease-in-out,
top .7s ease-in-out;
transition: transform .7s ease-in-out,
top .7s ease-in-out;
}
&.expanded {
background-position: 120px -10px, 0 -30px;
.ball {
left: -60px;
top: -20px;
.transform(rotate(-40deg));
}
}
&.compressed .ball {
top: -60px;
left: -60px;
}
}
// Net Neutrality
#panel-netneutrality {
background-position: 0 0;
@ -968,39 +867,6 @@
}
}
// World Cup 2014
#panel-worldcup2014 {
background-size: 180px 294px, auto auto;
background-position: 460px -10px, 0 -30px;
.ball {
left: -50px;
top: -90px;
width: 200px;
height: 200px;
background-size: 200px 200px;
-webkit-transition: top .7s ease-in-out,
-webkit-transform .7s ease-in-out;;
transition: top .7s ease-in-out,
transform .7s ease-in-out;
}
&.expanded {
background-position: 220px -10px, 0 -30px;
.ball {
left: -50px;
top: -20px;
.transform(rotate(-40deg));
}
}
&.compressed .ball {
top: -120px;
left: -50px;
}
}
// Net Neutrality
#panel-netneutrality {
background-position: 0 0;

63
media/css/tabzilla/tabzilla.less
Просмотреть файл

@ -47,16 +47,6 @@
font-style: normal;
}
// Montserrat used in the World Cup 2014 promo
@font-face {
font-family: 'Montserrat';
src: url('/media/fonts/Montserrat-Bold.eot?#iefix') format('embedded-opentype'),
url('/media/fonts/Montserrat-Bold.woff') format('woff'),
url('/media/fonts/Montserrat-Bold.ttf') format('truetype');
font-weight: bold;
font-style: normal;
}
// Tab
@ -605,59 +595,6 @@ html[dir="rtl"] {
}
}
// World Cup 2014 Promo
#tabzilla-promo .snippet#tabzilla-promo-worldcup2014 a {
background: #3191c4 url(/media/img/tabzilla/promo-worldcup2014.jpg) no-repeat;
width: 180px;
height: 140px;
padding: 60px 90px 10px 30px;
color: #fff;
h4 {
color: #fff;
font: bold 28px/1 'Montserrat', 'Open Sans', sans-serif;
letter-spacing: -.025em;
text-shadow: 0 1px 1px rgba(0, 0, 0, .2);
text-transform: uppercase;
margin: 0 0 8px;
}
.button {
text-align: left;
&:after {
content: "\00A0\00BB"; /* nbsp raquo */
}
}
}
[lang='pl'],
[lang='sr'] {
#tabzilla-promo .snippet#tabzilla-promo-worldcup2014 a h4 {
font-size: 24px;
}
}
[lang='fr'],
[lang='el'] {
#tabzilla-promo .snippet#tabzilla-promo-worldcup2014 a h4 {
font-size: 22px;
}
}
[lang='de'],
[lang='da'] {
#tabzilla-promo .snippet#tabzilla-promo-worldcup2014 a {
padding-top: 110px;
height: 90px;
h4 {
font-size: 18px;
}
}
}
@media (-webkit-min-device-pixel-ratio: 1.5),
( min-resolution: 1.5dppx),
( min-resolution: 144dpi) {

1
media/img/home/panel/worldcup2014/bg-ball.svg
Просмотреть файл

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" version="1.1" x="0px" y="0px" width="421px" height="433px" viewBox="0.001 0 421 433" style="overflow:visible;enable-background:new 0.001 0 421 433;" xml:space="preserve"><style type="text/css">.st0{fill:#FFFFFF;}</style><defs></defs><g><path class="st0" d="M232.214 405.606c-18.691 6.83-70.882 1.277-90.104-4.797c-1.632 7.488-2.93 14.802-3.925 21.94 c48.237 15.52 101.77 14.09 150.834-6.781C273.099 416.17 251.91 414.3 232.21 405.61 M259.448 334 c2.3-0.768 5.979-2.002 10.607-3.805c8.1-3.11 20.471-8.393 33.452-15.873c15.329-8.846 28.097-18.73 37.945-29.445 c3.083-23.605 3.304-53.086 0.633-90.05c-20.774-22.937-61.604-38.474-78.308-44.11c-1.678-0.564-3.196-1.08-4.551-1.504 c-3.363 1.881-6.832 3.849-10.254 5.804c-15.404 8.893-28.654 17.406-41.457 25.632c-7.8 5.02-15.157 9.807-22.837 14.5 c-0.3 1.545-0.816 4.27-1.398 7.9c-1.431 8.651-2.472 17.326-3.207 25.779c-1.48 17.741-2.015 42.92 3.93 62.6 c22.054 14.76 47.71 31.34 74.64 42.823C258.89 334.18 259.16 334.07 259.45 334 M289.037 415.97 c0.3-0.144 0.598-0.273 0.884-0.379c-0.3 0.109-0.605 0.239-0.902 0.371C289.021 415.97 289.04 415.97 289.04 415.97 M35.292 185.737c-2.168 28.688-3.71 59.77-0.189 92.781c1.226 1.16 3.28 3.07 5.97 5.44 c4.406 3.95 11.46 9.96 19.98 16.379c13.373 10.09 33.19 23.19 52.33 28.901c3.823-2.172 8.142-4.629 13.169-7.53 c6.375-3.674 13.068-7.583 19.913-11.558c10.544-6.14 21.36-12.437 31.582-18.267c-9.642-33.888-2.328-80.527 0.676-96.534 c-18.028-11.776-35.893-25.336-53.205-38.389c-5.246-3.984-10.649-8.074-15.998-12.077c-13.456 2.78-30.521 9.655-45.87 18.5 l-0.035 0.02l-0.604-1.033l-0.061 0.044l0.592 1.037C50.499 170.98 40.25 179.05 35.29 185.74 M344.416 290.2 c-10.076 10.613-22.849 20.405-38.002 29.132c-19.036 10.986-36.957 17.481-45.037 20.13 c-2.229 20.637-15.558 51.233-23.961 62.029c24.317 9.8 50.31 9.44 65.58 7.926c3.253-1.636 6.464-3.389 9.64-5.217 c25.035-14.443 46.099-33.139 62.774-54.605c0.916-2.328 1.811-4.639 2.646-6.936c4.819-13.363 8.22-26.365 10.125-38.752 C377.094 305.32 362.74 300.81 344.42 290.2 M132.715 420.916c-0.055-0.034-0.105-0.038-0.146-0.053h-0.004 C132.609 420.88 132.66 420.88 132.72 420.92 M110.22 334.335c-33.886-10.703-69.106-42.16-78.492-51.021 c-6.406 3.277-18.69 9.203-29.083 11.902c3.942 10.03 8.62 19.94 14.18 29.571c26.924 46.67 68.61 79.52 115.75 96.08 c1.095-7.416 2.468-15.04 4.182-22.767C119.106 380.55 112.57 351.32 110.22 334.33 M278.454 13.06 c0.002 0 0.01 0.01 0.01 0.011c0.414 0.17 0.8 0.28 1.18 0.429C279.253 13.36 278.87 13.22 278.45 13.06 M147.624 62.732c16.724-5.436 71.634-4.375 88.697-0.394c18.6-15.86 37.416-26.553 54.757-31.197 c-2.371-3.411-4.798-6.85-6.957-9.967c-2.14-3.085-4.071-5.826-5.659-8.1c-50.41-18.311-107.318-17.877-159.2 4.39 c-2.748 4.669-5.803 9.249-9.263 13.097C119.517 37.2 135.93 50.16 147.62 62.73 M31.803 180.84 c5.754-7.058 15.921-14.944 28.933-22.459c15.755-9.09 33.311-16.153 47.233-19.111c3.912-13.15 21.886-56.524 35.186-72.805 c-11.958-12.79-29.573-26.585-38.779-32.657c-7.324 1.908-14.966 3.242-23.046 4.66c-0.032 0.013-0.083 0-0.109 0 C42.368 65.29 14.72 103.04 0 145.122C8.991 158.91 22.3 173.07 31.8 180.84 M395.071 159.85 c12.281 14.87 20.98 33.51 25.97 55.535c-0.172-36.369-9.5-73.208-28.979-106.983c-4.59-7.982-9.632-15.568-15.078-22.717 C385.286 102.02 396.74 130.41 395.07 159.85 M387.647 332.118c12.946-20.543 22.28-43.074 27.738-66.52 c-6.34 15.903-14.104 27.041-20.951 35.56C393.133 311.14 390.86 321.5 387.65 332.12 M240.983 65.97 c12.98 24.21 20.32 51.76 20.8 77.948c15.655 5.06 60.12 21.07 83.54 45.833c1.31-0.622 2.824-1.454 4.557-2.46 c12.061-6.95 31.41-20.902 39.354-27.116c2.24-35.277-16.153-70.221-21.885-80.158c-0.548-0.961-1.021-1.712-1.382-2.334 c-18.312-17.677-49.569-34.54-70.127-41.717c-9.407 2.131-19.373 6.121-29.563 12.01 C257.915 52.81 249.44 58.85 240.98 65.97"/></g></svg>
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 3.8 KiB

Двоичные данные
media/img/home/panel/worldcup2014/bg-flat.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 64 KiB

Двоичные данные
media/img/home/panel/worldcup2014/bg-player.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 2.9 KiB

Двоичные данные
media/img/home/panel/worldcup2014/bg-stripes.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 75 KiB

Двоичные данные
media/img/tabzilla/promo-worldcup2014.jpg
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 13 KiB