Permalink
Browse files

Fix some issues addressed in bug 648002

  • Loading branch information...
1 parent 20fc1b2 commit 8fbdc0d3ff9b0a71686abbd53ba3d1bd13eb1051 @tofumatt tofumatt committed Oct 15, 2011
View
@@ -1,16 +1,4 @@
@font-face {
- font-family: 'MetaWeb-Medium';
- src: local(''), url('../fonts/MetaWebPro-Medium.woff') format('woff');
- font-weight: bold;
-}
-
-@font-face {
- font-family: 'MetaWeb-Normal';
- src: local(''), url('../fonts/MetaWebPro-Normal.woff') format('woff');
- font-weight: normal;
-}
-
-@font-face {
font-family: 'MuseoSans500';
src: url('../fonts/MuseoSans_500-webfont.eot');
src: url('../fonts/MuseoSans_500-webfont.eot?iefix') format('eot'),
@@ -37,6 +25,20 @@ body {
background: rgba(0, 0, 0, .95);
}
+#header {
+ background: none;
+ border: 0;
+ border-radius: 0;
+ box-shadow: none;
+ height: 57px;
+ margin: 0 10px;
+}
+
+#header:after {
+ content: "";
+ display: none;
+}
+
#header h1 a,
#header h1 a:link,
#header h1 a:visited {
@@ -45,6 +47,7 @@ body {
#header a.mozilla {
background: url(../img/nightly-title.png) 100% 0 no-repeat;
+ text-indent: -9999px;
}
#nav-main li a,
@@ -142,7 +145,7 @@ body {
}
#main-content {
- background: url(../img/nightly-content-bg.png) top center no-repeat;
+ background: url(../img/nightly-content-bg.png) 50% -40px no-repeat;
color: #fff;
margin: 0 auto;
padding: 0 20px;
@@ -160,28 +163,10 @@ body {
}
#nightly-title h1, #nightly-title h2 {
+ left: -9999px;
margin: 0;
-}
-
-#nightly-title h1 {
- color: #fff;
- font: normal 48px 'MetaWeb-Normal', MetaBold, sans-serif;
-}
-
-#nightly-title h1 span {
- font-family: 'MetaWeb-Medium', MetaBold, sans-serif;
- font-weight: bold;
-}
-
-#nightly-title sup {
- font: normal 10px 'MetaWeb-Normal', MetaBold, sans-serif;
- position: relative;
- top: -5px;
-}
-
-#nightly-title h2 {
- color: #a5dcff;
- font: normal 18px Georgia, Times, serif;
+ position: absolute;
+ top: 0;
}
#builds {
View
@@ -74,8 +74,8 @@ body {
transition: background 0.2s ease-in-out;
}
-#footer h3 a:hover,
-#footer h3 a:active {
+#footer-logo a:hover,
+#footer-logo a:active {
background: -moz-radial-gradient(center 45deg, ellipse closest-side, rgba(255,255,255,0.3) 0%, rgba(255,255,255,0) 100%),
url(../img/template/header-logos.png) 15px 0 no-repeat;
-moz-transition: background 0.2s ease-in-out;
@@ -521,9 +521,9 @@ body {
text-align: right;
}
-#footer h3 a,
-#footer h3 a:link,
-#footer h3 a:visited {
+#footer-logo a,
+#footer-logo a:link,
+#footer-logo a:visited {
display: block;
height: 40px;
width: 100px;
@@ -571,7 +571,7 @@ body {
#footer-menu li a:visited,
#lang_form label {
color: #fff;
- font: bold 14px MetaBlack, Trechuchet MS, sans-serif;
+ font: bold 14px MetaBlack, 'MetaWeb-Medium', Trechuchet MS, sans-serif;
text-transform: uppercase;
}
@@ -597,9 +597,10 @@ body {
#footer-menu ul ul li {
float: none;
+ line-height: .8em;
padding: 0 0 .3em 0;
margin: 0;
- font-weight: normal;
+ font-weight: bold;
display: block;
width: auto;
}
@@ -633,9 +634,9 @@ body {
#copyright p {
clear: both;
- margin-bottom: .5em;
- padding-top: .5em;
- font-size: 85%;
+ font-size: 11px;
+ line-height: 16px;
+ margin: 0 0 6px;
}
#copyright a:hover,
@@ -773,4 +774,4 @@ body {
#main-content, #main-feature {
font-size: 130%;
}
-}
+}
Binary file not shown.
Binary file not shown.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -2,15 +2,20 @@
import os
import shutil
-import simplejson as json
import sys
import urllib2
from optparse import OptionParser
from sgmllib import SGMLParser
-# Use our local copy of jinja2
+
+# Use our local copies of simplejson and jinja2
sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)),
- 'jinja2'))
+ 'vendor'))
+sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)),
+ 'vendor', 'jinja2'))
+
+
+import simplejson as json
import jinja2
@@ -19,8 +24,10 @@
CURRENT_PATH = os.path.dirname(__file__)
-ENV = jinja2.Environment(loader=jinja2.FileSystemLoader(
- os.path.join(CURRENT_PATH, 'templates')),
+ENV = jinja2.Environment(loader=jinja2.FileSystemLoader([
+ os.path.join(CURRENT_PATH, 'templates'),
+ os.path.join(CURRENT_PATH, 'vendor',
+ 'django-moz-header')]),
extensions=['jinja2.ext.i18n'])
# We use django-moz-header, so we need to stub out the gettext functionality
# in those templates.
@@ -239,6 +246,34 @@ def main():
shutil.rmtree(folder_path)
shutil.copytree(os.path.join(CURRENT_PATH, folder), folder_path)
+ # Copy resources from Django-moz-header
+ django_moz_header = os.path.join(CURRENT_PATH, 'vendor',
+ 'django-moz-header')
+ for f in os.listdir(django_moz_header):
+ if f.endswith('.css'):
+ if os.path.exists(os.path.join(CURRENT_PATH, OUTPUT_PATH,
+ 'css', f)):
+ os.remove(os.path.join(CURRENT_PATH, OUTPUT_PATH, 'css', f))
+
+ shutil.copyfile(os.path.join(django_moz_header, f),
+ os.path.join(CURRENT_PATH, OUTPUT_PATH, 'css', f))
+ elif f.endswith('.js'):
+ if os.path.exists(os.path.join(CURRENT_PATH, OUTPUT_PATH,
+ 'js', f)):
+ os.remove(os.path.join(CURRENT_PATH, OUTPUT_PATH, 'js', f))
+
+
+ shutil.copyfile(os.path.join(django_moz_header, f),
+ os.path.join(CURRENT_PATH, OUTPUT_PATH, 'js', f))
+ elif f.endswith('.png'):
+ if os.path.exists(os.path.join(CURRENT_PATH, OUTPUT_PATH,
+ 'img', f)):
+ os.remove(os.path.join(CURRENT_PATH, OUTPUT_PATH, 'img', f))
+
+ shutil.copyfile(os.path.join(django_moz_header, f),
+ os.path.join(CURRENT_PATH, OUTPUT_PATH, 'img', f))
+
+
write_output(OUTPUT_PATH, 'index.html', template.render({'files': files}))
@@ -0,0 +1,19 @@
+<div id="copyright">
+ <p id="footer-links">
+ {% block footer_links %}
+ <a href="http://www.mozilla.org/privacy-policy.html">{{ _('Privacy Policy') }}</a> &nbsp;|&nbsp;
+ <a href="http://www.mozilla.org/about/legal.html">{{ _('Legal Notices') }}</a> &nbsp;|&nbsp;
+ <a href="http://www.mozilla.org/legal/fraud-report/index.html">{{ _('Report Trademark Abuse') }}</a>
+ {% block extra_footer_links %}{% endblock %}
+ {% endblock %}
+ </p>
+ <p>
+ {% trans %}
+ Except where otherwise <a href="http://www.mozilla.org/about/legal.html#site">noted</a>,
+ content on this site is licensed under the <br />
+ <a href="http://creativecommons.org/licenses/by-sa/3.0/">
+ Creative Commons Attribution Share-Alike License v3.0
+ </a> or any later version.
+ {% endtrans %}
+ </p>
+</div>
@@ -0,0 +1,72 @@
+<ul>
+ {% block feature_links %}
+ <li class="first"><a href="http://www.mozilla.org/firefox/features/">{{ _('Features') }}</a>
+ <ul>
+ <li class="first"><a href="http://www.mozilla.org/firefox/features/">{{ _('Features') }}</a></li>
+ <li><a href="http://www.mozilla.org/firefox/security/">{{ _('Security') }}</a></li>
+ <li><a href="http://www.mozilla.org/firefox/performance/">{{ _('Performance') }}</a></li>
+ <li><a href="http://www.mozilla.org/firefox/customize/">{{ _('Customization') }}</a></li>
+ <li><a href="http://www.mozilla.org/firefox/video/">{{ _('Videos') }}</a></li>
+ <li class="last"><a href="http://www.mozilla.org/firefox/central/">{{ _('Tour') }}</a></li>
+ <li><a href="http://www.mozilla.org/en-US/firefox/channel/">{{ _('Future Releases') }}</a></li>
+ </ul>
+ </li>
+ {% endblock %}
+ {% block mobile_links %}
+ <li><a href="http://www.mozilla.org/mobile/">{{ _('Mobile') }}</a>
+ <ul>
+ <li class="first"><a href="http://www.mozilla.org/mobile/">{{ _('Mobile Overview') }}</a></li>
+ <li><a href="http://www.mozilla.org/mobile/download/">{{ _('Download') }}</a></li>
+ <li><a href="http://www.mozilla.org/mobile/features/">{{ _('Features') }}</a></li>
+ <li><a href="https://addons.mozilla.org/mobile/?browse=featured">{{ _('Customize') }}</a></li>
+ <li><a href="http://www.mozilla.org/mobile/sync/">{{ _('Sync') }}</a></li>
+ <li><a href="https://developer.mozilla.org/mobile">{{ _('Develop') }}</a></li>
+ <li><a href="http://www.mozilla.org/mobile/getinvolved/">{{ _('Get Involved') }}</a></li>
+ <li><a href="http://www.mozilla.org/mobile/faq/">{{ _('FAQ') }}</a></li>
+ <li class="last"><a href="https://blog.mozilla.com/mobile/">{{ _('Blog') }}</a></li>
+ <li><a href="http://www.mozilla.org/en-US/firefox/video?video=fx4-mobile-greatday">{{ _('Videos') }}</a></li>
+ <li><a href="http://www.mozilla.org/en-US/firefox/channel/">{{ _('Future Releases') }}</a></li>
+ </ul>
+ </li>
+ {% endblock %}
+ {% block amo_links %}
+ <li class=""><a href="https://addons.mozilla.org/">{{ _('Add-ons') }}</a>
+ <ul>
+ <li class="first"><a href="https://addons.mozilla.org/firefox/">{{ _('Firefox Add-ons') }}</a></li>
+ <li><a href="https://addons.mozilla.org/firefox/featured/">{{ _('Featured Add-ons') }}</a></li>
+ <li><a href="https://addons.mozilla.org/firefox/extensions/">{{ _('Extensions') }}</a></li>
+ <li><a href="https://addons.mozilla.org/firefox/themes/">{{ _('Themes') }}</a></li>
+ <li><a href="http://www.getpersonas.com/">{{ _('Personas') }}</a></li>
+ <li><a href="https://addons.mozilla.org/firefox/search-tools/">{{ _('Search Tools') }}</a></li>
+ <li><a href="https://addons.mozilla.org/firefox/language-tools/">{{ _('Language Support') }}</a></li>
+ <li><a href="https://addons.mozilla.org/firefox/collections/">{{ _('Collections') }}</a></li>
+ <li><a href="https://addons.mozilla.org/mobile/">{{ _('Mobile Add-ons') }}</a></li>
+ <li class="last"><a href="https://addons.mozilla.org/firefox/developers/">{{ _('Developer Hub') }}</a></li>
+ </ul>
+ </li>
+ {% endblock %}
+ {% block sumo_links %}
+ <li><a href="http://support.mozilla.com/">{{ _('Support') }}</a>
+ <ul>
+ <li class="first"><a href="http://support.mozilla.com/home/">{{ _('Firefox Support') }}</a></li>
+ <li><a href="http://support.mozilla.com/mobile/">{{ _('Mobile Support') }}</a></li>
+ <li class="last"><a href="http://www.mozilla.org/support/thunderbird/">{{ _('Thunderbird Support') }}</a></li>
+ </ul>
+ </li>
+ {% endblock %}
+ {% block about_links %}
+ <li class="last"><a href="http://www.mozilla.org/about/">{{ _('About') }}</a>
+ <ul>
+ <li class="first"><a href="http://www.mozilla.org/about/">{{ _('About Firefox') }}</a></li>
+ <li><a href="http://www.mozilla.org/about/participate/">{{ _('Participate') }}</a></li>
+ <li><a href="http://www.mozilla.org/press/">{{ _('Communications') }}</a></li>
+ <li><a href="http://www.mozilla.org/en-US/firefox/brand/">{{ _('Brand Toolkit') }}</a></li>
+ <li><a href="http://www.mozilla.org/about/careers.html">{{ _('Careers') }}</a></li>
+ <li><a href="http://www.mozilla.org/about/partnerships.html">{{ _('Partnerships') }}</a></li>
+ <li><a href="http://www.mozilla.org/about/legal.html">{{ _('Legal') }}</a></li>
+ <li><a href="http://www.mozilla.org/about/contact.html">{{ _('Contact Us') }}</a></li>
+ <li class="last"><a href="http://blog.mozilla.com/">{{ _('Blog') }}</a></li>
+ </ul>
+ </li>
+ {% endblock %}
+</ul>
Oops, something went wrong.

0 comments on commit 8fbdc0d

Please sign in to comment.