diff --git a/apps/mozorg/templates/mozorg/about-base.html b/apps/mozorg/templates/mozorg/about-base.html new file mode 100644 index 0000000000..193163f51c --- /dev/null +++ b/apps/mozorg/templates/mozorg/about-base.html @@ -0,0 +1,41 @@ +{% extends "sand.html" %} + +{% block content %} + +
+
+ +
+{% block article %}{% endblock %} +
+ + + +
+
+ +{% endblock %} diff --git a/apps/mozorg/templates/mozorg/mission.html b/apps/mozorg/templates/mozorg/mission.html new file mode 100644 index 0000000000..8d31725e49 --- /dev/null +++ b/apps/mozorg/templates/mozorg/mission.html @@ -0,0 +1,53 @@ +{% extends "mozorg/about-base.html" %} + +{% block page_title %}The Mozilla Difference{% endblock %} +{% block body_id %}mission{% endblock %} + +{% block extrahead %} + {{ css('mission') }} +{% endblock %} + +{% block js %} + {{ js('video') }} +{% endblock %} + +{% block breadcrumbs %} + +{% endblock %} + +{% block article %} + +

The Mozilla Difference

+ +
+ +
+ +

Mozilla is a proudly non-profit organization dedicated to keeping the power of the Web in people's hands. We're a global community of users, contributors and developers working to innovate on your behalf. When you use Firefox, you become a part of that community, helping us build a brighter future for the Web.

+ +

To find out more about who we are, where we came from and where we want to take the Web, please watch the video above.

+ + +{% endblock %} diff --git a/apps/mozorg/urls.py b/apps/mozorg/urls.py index 06ab4ae4a5..f7c8f8ca63 100644 --- a/apps/mozorg/urls.py +++ b/apps/mozorg/urls.py @@ -1,5 +1,5 @@ from django.conf.urls.defaults import * -from views import home, contribute, channel, firefox_performance, firefox_features, firefox_customize, firefox_happy, firefox_organizations, firefox_organizations_faq, firefox_security, firefox_speed, firefox_technology, button, new, sandstone, firefox_geolocation +from views import home, contribute, channel, firefox_performance, firefox_features, firefox_customize, firefox_happy, firefox_organizations, firefox_organizations_faq, firefox_security, firefox_speed, firefox_technology, button, new, sandstone, firefox_geolocation, mission urlpatterns = patterns('', @@ -10,6 +10,7 @@ urlpatterns = patterns('', (r'^new/', new), (r'^sandstone/', sandstone), url(r'^contribute/', contribute, name='mozorg.contribute'), + url(r'^mission/', mission, name='mozorg.mission'), url(r'^firefox/customize/', firefox_customize, name='mozorg.firefox_customize'), url(r'^firefox/features/', firefox_features, name='mozorg.firefox_features'), diff --git a/apps/mozorg/views.py b/apps/mozorg/views.py index 44aed65f78..2ab5cf5fe3 100644 --- a/apps/mozorg/views.py +++ b/apps/mozorg/views.py @@ -71,6 +71,9 @@ def channel(request): def button(request): return l10n_utils.render(request, "mozorg/button.html") +def mission(request): + return l10n_utils.render(request, "mozorg/mission.html") + def new(request): return l10n_utils.render(request, "mozorg/new.html") diff --git a/media/css/mission.less b/media/css/mission.less new file mode 100644 index 0000000000..5eacaa5d43 --- /dev/null +++ b/media/css/mission.less @@ -0,0 +1,20 @@ +@import "sandstone/variables.less"; +@import "sandstone/mixins.less"; + +#welcome { + .span(8); + margin-left: 0; + padding: @baseLine 0; +} + +#welcome-video { + width: 640px; + margin: @baseLine auto; + video { + max-width: 640px; + width: 100%; + height: auto; + background: #fff; + } +} + diff --git a/media/css/sandstone/sandstone.less b/media/css/sandstone/sandstone.less index 5200f6b2ab..bd3a0b91e0 100644 --- a/media/css/sandstone/sandstone.less +++ b/media/css/sandstone/sandstone.less @@ -331,8 +331,9 @@ px 68 160 252 344 436 528 620 712 804 896 */ #masthead { nav.breadcrumbs { + padding: @baseLine / 2 0; float: none; - padding: 24px 0 12px 0; + padding: 12px 0; a, span { @@ -427,6 +428,20 @@ nav.menu-bar { } + .reference { + margin: @baseLine * 2 auto; + + .more { + display: block; + padding: (@baseLine / 2) 0; + border-bottom: 1px dotted @borderColor; + .open-sans-light; + } + + p { + margin: 0; + } + } } /* }}} */ @@ -561,7 +576,6 @@ px 68 160 252 */ } nav.breadcrumbs { - padding: @baseLine / 2 0; a, span { margin-right: .3em; diff --git a/media/img/mission/poster-mission.jpg b/media/img/mission/poster-mission.jpg new file mode 100644 index 0000000000..1439d0f38a Binary files /dev/null and b/media/img/mission/poster-mission.jpg differ diff --git a/settings/base.py b/settings/base.py index ecd576c867..79a080a88a 100644 --- a/settings/base.py +++ b/settings/base.py @@ -99,6 +99,10 @@ MINIFY_BUNDLES = { 'marketplace': ( 'css/marketplace.less', ), + 'mission': ( + 'css/sandstone/video.less', + 'css/mission.less', + ), 'persona': ( 'css/persona.less', ),