Permalink
Browse files

Fixing botched merge

  • Loading branch information...
1 parent 567a435 commit adc92bfc63931ac01b43dcdb4ca81d805bd6a837 @craigcook craigcook committed Jun 23, 2012
Showing with 16 additions and 1 deletion.
  1. +15 −0 settings/base.py
  2. +1 −1 templates/base-resp.html
View
15 settings/base.py
@@ -119,6 +119,10 @@ def JINJA_CONFIG():
'css/firefox/template-resp.less',
'css/firefox/mobile-features.less',
),
+ 'firefox_faq': (
+ 'css/firefox/template-resp.less',
+ 'css/mozilla-expanders.less',
+ ),
'firefox_fx': (
'css/firefox/fx.less',
'css/sandstone/video.less',
@@ -137,6 +141,11 @@ def JINJA_CONFIG():
'firefox_organizations': (
'css/firefox/organizations.less',
),
+ 'firefox_platforms': (
+ 'css/firefox/template-resp.less',
+ 'css/mozilla-expanders.less',
+ 'css/firefox/platforms.less',
+ ),
'firefox_security': (
'css/firefox/security.less',
),
@@ -254,6 +263,12 @@ def JINJA_CONFIG():
'js/libs/jquery-css-transform.js',
'js/libs/jquery-animate-css-rotate-scale.js',
),
+ 'firefox_platforms': (
+ 'js/mozilla-expanders.js',
+ ),
+ 'firefox_faq': (
+ 'js/mozilla-expanders.js',
+ ),
'firefox_speed': (
'js/libs/jquery-1.4.4.min.js',
'js/libs/jquery-css-transform.js',
View
2 templates/base-resp.html
@@ -7,7 +7,7 @@
<title>{% block page_title_prefix %}Mozilla — {% endblock %}{% block page_title %}{% endblock %}{% block page_title_suffix %} — mozilla.org{% endblock %}</title>
- <link href="//mozilla.org/tabzilla/media/css/tabzilla.css" rel="stylesheet">
+ <link href="/tabzilla/media/css/tabzilla.css" rel="stylesheet">
<!--[if lte IE 8]>
<script src="{{ MEDIA_URL }}js/libs/html5shiv.js"></script>

0 comments on commit adc92bf

Please sign in to comment.