Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge remote branch 'mozilla/master'

  • Loading branch information...
commit 820fd805e616e8568616379ce8d00f4c3d457c40 2 parents dadc3d6 + 1c14eb8
James Long authored
9  apps/mozorg/forms.py
@@ -57,18 +57,19 @@ def __init__(self, locale, *args, **kwargs):
57 57
 
58 58
 INTEREST_CHOICES = (('', 'Area of interest?'),
59 59
                     ('Support', 'Helping Users'),
60  
-                    ('Localization', 'Localization'),
61 60
                     ('QA', 'Testing and QA'),
62 61
                     ('Coding', 'Coding'),
63  
-                    ('Add-ons', 'Add-ons'),
64 62
                     ('Marketing', 'Marketing'),
65  
-                    ('Students', 'Student Reps'),
  63
+                    ('Localization', 'Localization'),
66 64
                     ('Webdev', 'Web Development'),
  65
+                    ('Add-ons', 'Add-ons'),
  66
+                    ('Design', 'Graphic Design'),
  67
+                    ('Students', 'Student Reps'),
67 68
                     ('Documentation', 'Developer Documentation'),
  69
+                    ('Accessibility', 'Accessibility'),
68 70
                     ('IT', 'Systems Administration'),
69 71
                     ('Research', 'User Research'),
70 72
                     ('Thunderbird', 'Thunderbird'),
71  
-                    ('Accessibility', 'Accessibility'),
72 73
                     (' ', 'Other'),
73 74
                     ('Firefox Suggestions', 'I have a suggestion for Firefox'),
74 75
                     ('Firefox Issue', 'I need help with a Firefox issue'))
2  apps/mozorg/templates/mozorg/contribute.html
@@ -25,7 +25,7 @@ <h1 id="main-feature" class="large">Get Involved</h1>
25 25
       controls="controls">
26 26
       <source src="//videos-cdn.mozilla.net/brand/Mozilla_Firefox_Manifesto_v0.2_640.webm" type="video/webm" />
27 27
       <source src="//videos-cdn.mozilla.net/brand/Mozilla_Firefox_Manifesto_v0.2_640.theora.ogv" type="video/ogg; codecs=&quot;theora, vorbis&quot;" />
28  
-      <source src="//http://videos-cdn.mozilla.net/brand/Mozilla_Firefox_Manifesto_v0.2_640.mp4" type="video/mp4" />
  28
+      <source src="//videos-cdn.mozilla.net/brand/Mozilla_Firefox_Manifesto_v0.2_640.mp4" type="video/mp4" />
29 29
       <object type="application/x-shockwave-flash"
30 30
         style="width: 640px; height: 388px;"
31 31
         data="/media/flash/playerWithControls.swf?flv=brand/Mozilla_Firefox_Manifesto_v0.2_640.mp4&amp;autoplay=false&amp;msg=Play%20Video">
12  apps/mozorg/templates/mozorg/sandstone.html
@@ -2,6 +2,7 @@
2 2
 
3 3
 {% block page_title %}Sandstone - Bedrock’s Layer of CSS Love{% endblock %}
4 4
 
  5
+{% block body_id %}sandstone{% endblock %}
5 6
 {% block body_class %}stone {{ super() }}{% endblock %}
6 7
 
7 8
 {% block site_css %}
@@ -77,7 +78,7 @@ <h2 class="mozilla-red">Less Framework</h2>
77 78
       <h4 class="mozilla-red">Responsive Grid</h4>
78 79
     </hgroup>
79 80
 
80  
-      <p>Pages are built on a responsive gride, with 10, 6, or 3 columns, depending on the viewer. Columns are 68px wide with a 24px gutter. CSS classes for grids (<code>.row</code>, <code>.span1</code>, <code>.span2</code> etc.) are provided, or you can roll-your-own. If you’re using <a href="http://lesscss.org/">LESS</a> (the dynamic style sheet language, not to be confused with the <a href="http://lessframework.com/">Less Framework</a>, mixins are provided for columns (<code>.span(1)</code>, <code>.span(2)</code>, etc.).</p>
  81
+      <p>Pages are built on a responsive grid, with 10, 6, or 3 columns, depending on the viewer. Columns are 68px wide with a 24px gutter. CSS classes for grids (<code>.row</code>, <code>.span1</code>, <code>.span2</code> etc.) are provided, or you can roll-your-own. If you’re using <a href="http://lesscss.org/">LESS</a> (the dynamic style sheet language, not to be confused with the <a href="http://lessframework.com/">Less Framework</a>, mixins are provided for columns (<code>.span(1)</code>, <code>.span(2)</code>, etc.).</p>
81 82
 <a class="top" href="#top">back to top</a>
82 83
 
83 84
   </div>
@@ -152,7 +153,7 @@ <h2 class="mozilla-red">Typefaces</h2>
152 153
       <h4>Open Sans + Georgia</h4>
153 154
     </hgroup>
154 155
 
155  
-    <p>Body copy is set in 16px Georgia with a 24px baseline. Headlines are set in Open Sans Light. The Open Sans font family is avaiable as a hosted web font from mozilla.org. The Sandstone CSS provides headings styled with Open Sans and you can add the LESS mixin <code>.open-sans</code> or <code>.open-sans-light</code> to any element.</p>
  156
+    <p>Body copy is set in 16px Georgia with a 24px baseline. Headlines are set in Open Sans Light. The Open Sans font family is available as a hosted web font from mozilla.org. The Sandstone CSS provides headings styled with Open Sans and you can add the LESS mixin <code>.open-sans</code> or <code>.open-sans-light</code> to any element.</p>
156 157
 
157 158
     <a class="top" href="#top">back to top</a>
158 159
 
@@ -171,8 +172,8 @@ <h2 class="mozilla-red">Typefaces</h2>
171 172
 
172 173
     <h4>Type Examples</h4>
173 174
 
174  
-    <h1 class="huge">huge</p>
175  
-    <h1 class="large">large</p>
  175
+    <h1 class="huge">huge</h1>
  176
+    <h1 class="large">large</h1>
176 177
     <h1>headline 1</h1>
177 178
     <h2>headline 2</h2>
178 179
     <h3>headline 3</h3>
@@ -227,9 +228,6 @@ <h4 class="mozilla-red">Gumdrop Style</h4>
227 228
 </div>
228 229
 </section>
229 230
 
230  
-</div>
231  
-
232  
-
233 231
 {% endblock %}
234 232
 
235 233
 {% block js %}

0 notes on commit 820fd80

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