Skip to content
Browse files

More changes for new style, mostly on landing pages. [bug 674266]

  • Loading branch information...
1 parent 196b14a commit 52d6c85d666cb3aa88e1bf6c72dd9f9fb7346753 @rlr rlr committed Jul 26, 2011
View
20 apps/landings/templates/landings/base.html
@@ -8,14 +8,18 @@
{% block content %}
<div id="featured-wrap">{# Top area, includes "Need Help With FIREFOX?" #}
<div id="featured">
- <h1>{{ h1_text|safe }}</h1>
- <p>{% block intro_text %}{% trans %}
- You've come to the right place! Start by searching for solutions,
- or by choosing one of our support articles below. If you can't
- find the answer you need, our community of volunteers are ready
- to help.
- {% endtrans %}{% endblock %}</p>
- {{ search_box(settings, id='support-search', params=search_params) }}
+ {% if waffle.flag('new-header') %}
+ {{ search_box(settings, id='support-search', placeholder=_('What do you need help with?'), params=search_params) }}
+ {% else %}
+ <h1>{{ h1_text|safe }}</h1>
+ <p>{% block intro_text %}{% trans %}
+ You've come to the right place! Start by searching for solutions,
+ or by choosing one of our support articles below. If you can't
+ find the answer you need, our community of volunteers are ready
+ to help.
+ {% endtrans %}{% endblock %}</p>
+ {{ search_box(settings, id='support-search', params=search_params) }}
+ {% endif %}
</div>
</div>
<div id="home-content">
View
1 apps/landings/templates/landings/fxhome.html
@@ -6,4 +6,5 @@
{% set hide_plugin_check = True %}
{% set top_link = url('home.fxhome') %}
{% set top_text = _('Firefox Help for Firefox Home') %}
+{% set active_site_nav = 'fxhome' %}
{% set h1_text = _('Need Help With <mark>Firefox Home?</mark>') %}
View
1 apps/landings/templates/landings/home.html
@@ -3,6 +3,7 @@
{% set classes = ('home desktop') %}
{% set title = _('Firefox Support Home Page') %}
{% set active_side_link = 1 %}
+{% set active_site_nav = 'desktop' %}
{% set h1_text = _('Need Help With <mark>Firefox?</mark>') %}
{% block intro_text %}
View
1 apps/landings/templates/landings/mobile.html
@@ -6,4 +6,5 @@
{% set hide_plugin_check = True %}
{% set top_link = url('home.mobile') %}
{% set top_text = _('Firefox Help for Mobile') %}
+{% set active_site_nav = 'mobile' %}
{% set h1_text = _('Need Help With <mark>Firefox for Mobile?</mark>') %}
View
1 apps/landings/templates/landings/sync.html
@@ -6,4 +6,5 @@
{% set hide_plugin_check = True %}
{% set top_link = url('home.sync') %}
{% set top_text = _('Firefox Help for Sync') %}
+{% set active_site_nav = 'sync' %}
{% set h1_text = _('Need Help With <mark>Firefox Sync?</mark>') %}
View
40 media/css/home.css
@@ -8,6 +8,10 @@
z-index: 2;
}
+body.new-header #side {
+ margin-top: -25px;
+}
+
#featured {
background: url("../img/nurse.png") no-repeat scroll right top transparent;
height: 279px;
@@ -18,11 +22,21 @@
z-index: 1;
}
+body.new-header #featured {
+ background: url("../img/nurse.small.png") no-repeat scroll 550px 0px transparent;
+ height: 125px;
+}
+
body.mobile #featured,
body.fxhome #featured {
background: url("../img/nurse.mobile.png") no-repeat scroll right top transparent;
}
+body.new-header.mobile #featured,
+body.new-header.fxhome #featured {
+ background: url("../img/nurse.mobile.small.png") no-repeat scroll 570px 0px transparent;
+}
+
/* Bug 615495 - Don't send the nursecat to Japanese audiences. */
html[lang=ja] body div#featured {
background: none;
@@ -37,6 +51,11 @@ html[lang=ja] body div#featured {
height: 279px;
}
+body.new-header #featured-wrap {
+ background: none;
+ height: 125px;
+}
+
#featured h1 {
font-size: 280%;
font-style: italic;
@@ -60,6 +79,12 @@ body.new-header #featured h1 {
width: 380px;
}
+body.new-header #support-search {
+ margin: 0;
+ padding: 20px 0 0 57px;
+ width: 384px;
+}
+
#support-search input.text {
width: 288px;
}
@@ -78,9 +103,22 @@ body.new-header #featured h1 {
padding-bottom: 0;
}
+body.new-header #home-content {
+ background: transparent url(../img/home.divider.jpg) no-repeat left top;
+ zoom: 1;
+}
+
+body.new-header #home-content:after {
+ clear: both;
+ content: ".";
+ display: block;
+ height: 0;
+ visibility: hidden;
+}
+
#home-content-top {
font-size: 14px;
- margin: 20px 10px 0;
+ padding: 20px 10px 0;
}
#home-content-quick, #home-content-explore {
View
7 media/css/ie.css
@@ -68,7 +68,12 @@ div.ans-attachments div.attachment {
body.mobile #featured {
/* nurse .gif for IE6 */
- _background: url("../img/nurse.mobile.gif") no-repeat scroll right top transparent;
+ _background: url(../img/nurse.mobile.gif) no-repeat scroll right top transparent;
+}
+
+body.new-header #featured {
+ /* nurse .gif for IE6 */
+ _background: url(../img/nurse.small.gif) no-repeat scroll right top transparent;
}
/* IE6 only */
View
74 media/css/main.css
@@ -80,7 +80,16 @@ header.global {
.sumo-header {
font-family: "Trebuchet MS",sans-serif;
- height: 125px;
+ padding: 0 0 25px;
+ zoom: 1;
+}
+
+.sumo-header:after {
+ clear: both;
+ content: ".";
+ display: block;
+ height: 0;
+ visibility: hidden;
}
#masthead {
@@ -89,41 +98,25 @@ header.global {
}
h1.site-title {
- font-family: MetaBlack;
- font-size: 40px;
+ color: #333333;
+ font-family: Georgia, freeserif, serif;
+ font-size: 32px;
+ font-style: italic;
letter-spacing: -1px;
margin-bottom: 7px;
+}
+
+h1.site-title mark {
+ font-family: MetaBlack;
+ font-style: normal;
text-transform: uppercase;
}
.site-title img {
float: left;
+ height: 62px;
margin-right: 10px;
-}
-
-.site-title a {
- color: #333333;
- text-decoration: none;
-}
-
-.site-title a small {
- color: #333333;
- display: block;
- font-size: 0.6em;
- line-height: 0.5em;
-}
-
-.site-title a:hover, .site-title a:focus {
- color: #043B84;
- text-shadow: 0 0 40px #FFFFFF, 0 0 20px #FFFFFF, 0 0 10px #FFFFFF;
-}
-
-.site-title.prominent a, .site-title strong {
- color: #D64203;
-}
-
-.site-title.prominent a:hover, .site-title strong:hover {
- text-shadow: 0 0 #FFFFFF;
+ width: 54px;
}
.menu-nav {
@@ -361,6 +354,7 @@ header.global #support-search {
position: absolute;
right: 0;
top: 63px;
+ width: 314px;
}
#site-nav > ul > li {
@@ -378,6 +372,15 @@ header.global #support-search {
text-transform: uppercase;
}
+#site-nav > ul > li > a.active {
+ color: #333;
+ cursor: default;
+}
+
+#site-nav > ul > li > a.active:hover {
+ text-decoration: none;
+}
+
/*----------------------------------
User messages
----------------------------------*/
@@ -520,6 +523,12 @@ div.support-search form {
padding: 5px 7px 7px;
}
+body.new-header div.support-search form {
+ background: #fff;
+ border: solid 1px #98b2c9;
+ padding-bottom: 9px;
+}
+
div.support-search input.text {
background: #fff url(../img/icon.searchloupe.png) no-repeat 7px 2px;
border: none;
@@ -535,6 +544,11 @@ div.support-search input.text {
width: 218px;
}
+body.new-header div.support-search input.text {
+ border: solid 1px #d9d9d9;
+ box-shadow: inset 0 0 3px #d9d9d9;
+}
+
div.support-search button.img-submit {
float: left;
height: 33px;
@@ -615,6 +629,10 @@ div.support-search button.img-submit {
margin: 25px 0 0 20px;
}
+body.new-header #quick-links {
+ margin-top: 0;
+}
+
#quick-links li {
background: #cde6f5;
border-radius: 10px;
View
BIN media/img/home.divider.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN media/img/nurse.mobile.small.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN media/img/nurse.mobile.small.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN media/img/nurse.small.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
18 templates/base.html
@@ -88,17 +88,19 @@
{% endif %}
<div id="masthead">
<h1 class="site-title">
- <a title="{{ _('Return to the Firefox Help homepage') }}" href="{{ url('home') }}">
- <img src="{{ MEDIA_URL }}img/firefox-54x62.png" alt="{{ _('Firefox') }}" />
- {{ _('Firefox Help') }}
- </a>
+ <img src="{{ MEDIA_URL }}img/firefox-54x62.png" alt="{{ _('Firefox') }}" />
+ {% if h1_text %}
+ {{ h1_text }}
+ {% else %}
+ <mark>{{ _('Firefox Help') }}</mark>
+ {% endif %}
</h1>
<nav class="menu-nav" id="site-nav">
<ul>
- <li><a href="{{ url('home') }}">{{ _('Desktop') }}</a></li>
- <li><a href="{{ url('home.mobile') }}">{{ _('Mobile') }}</a></li>
- <li><a href="{{ url('home.fxhome') }}">{{ _('Firefox Home') }}</a></li>
- <li><a href="{{ url('home.sync') }}">{{ _('Firefox Sync') }}</a></li>
+ <li><a href="{{ url('home') }}"{% if active_site_nav == 'desktop' %} class="active"{% endif %}>{{ _('Desktop') }}</a></li>
+ <li><a href="{{ url('home.mobile') }}"{% if active_site_nav == 'mobile' %} class="active"{% endif %}>{{ _('Mobile') }}</a></li>
+ <li><a href="{{ url('home.fxhome') }}"{% if active_site_nav == 'fxhome' %} class="active"{% endif %}>{{ _('Firefox Home') }}</a></li>
+ <li><a href="{{ url('home.sync') }}"{% if active_site_nav == 'sync' %} class="active"{% endif %}>{{ _('Firefox Sync') }}</a></li>
<li><a href="http://www.mozilla.org/support/thunderbird/">{{ _('Thunderbird') }}</a></li>
</ul>
</nav>

0 comments on commit 52d6c85

Please sign in to comment.
Something went wrong with that request. Please try again.