From b04bdf48ccb440c9cd464fbaae8f63996a179167 Mon Sep 17 00:00:00 2001 From: Mavis Ou Date: Tue, 30 Jan 2018 11:55:35 -0800 Subject: [PATCH] Related to #954 - fellowships application closed page & CSS cleanup for 'join-us' component --- .../fellows/templates/fellows_apply.html | 21 +++++++++++++++++ network-api/networkapi/fellows/urls.py | 1 + network-api/networkapi/fellows/views.py | 4 ++++ .../templates/fellowships-base.html | 4 ++-- source/js/components/join/join.jsx | 4 ++-- source/js/components/join/join.scss | 23 +++---------------- source/pug/views/sign-up.pug | 4 +++- source/pug/views/style-guide.pug | 13 +++++++++-- 8 files changed, 47 insertions(+), 27 deletions(-) create mode 100644 network-api/networkapi/fellows/templates/fellows_apply.html diff --git a/network-api/networkapi/fellows/templates/fellows_apply.html b/network-api/networkapi/fellows/templates/fellows_apply.html new file mode 100644 index 00000000000..6764287e89a --- /dev/null +++ b/network-api/networkapi/fellows/templates/fellows_apply.html @@ -0,0 +1,21 @@ +{% extends "fellowships-base.html" %} + +{% block template_id %}fellows-apply{% endblock %} + +{% block body %} + +
+ +
+
+

Application cycle dates

+

{% lorem 1 p %}

+
+
+

More info regarding application

+

{% lorem 1 p %}

+
+
+ + +{% endblock %} diff --git a/network-api/networkapi/fellows/urls.py b/network-api/networkapi/fellows/urls.py index 56e261e45c4..7fe26c96f3e 100644 --- a/network-api/networkapi/fellows/urls.py +++ b/network-api/networkapi/fellows/urls.py @@ -9,4 +9,5 @@ url(r'^support/$', views.fellows_support, name='fellowships-support'), url(r'^science/$', views.fellows_science, name='fellowships-science'), url(r'^open-web/$', views.fellows_openweb, name='fellowships-open-web'), + url(r'^apply/$', views.fellows_apply, name='fellowships-apply'), ] diff --git a/network-api/networkapi/fellows/views.py b/network-api/networkapi/fellows/views.py index e0457f73b87..b1c2521f89c 100644 --- a/network-api/networkapi/fellows/views.py +++ b/network-api/networkapi/fellows/views.py @@ -20,3 +20,7 @@ def fellows_science(request): def fellows_openweb(request): return render(request, 'fellows_openweb.html') + + +def fellows_apply(request): + return render(request, 'fellows_apply.html') diff --git a/network-api/networkapi/templates/fellowships-base.html b/network-api/networkapi/templates/fellowships-base.html index 7d1af642c55..85cd83ec1e6 100644 --- a/network-api/networkapi/templates/fellowships-base.html +++ b/network-api/networkapi/templates/fellowships-base.html @@ -23,7 +23,7 @@ Mozilla Foundation – {{ page.meta_title }} - +
@@ -82,7 +82,7 @@ Fellowships Directory Support the Program - Apply to be a Fellow + Apply to be a Fellow
diff --git a/source/js/components/join/join.jsx b/source/js/components/join/join.jsx index f15abec4821..272b1db1bbf 100644 --- a/source/js/components/join/join.jsx +++ b/source/js/components/join/join.jsx @@ -67,7 +67,7 @@ export default class JoinUs extends React.Component { }); let signupState = classNames({ - 'row py-5 px-md-2': true, + 'row py-5': true, 'signup-success': this.state.signupSuccess && this.state.userSubmitted, 'signup-fail': !this.state.signupSuccess && this.state.userSubmitted }); @@ -77,7 +77,7 @@ export default class JoinUs extends React.Component {
-
+
diff --git a/source/js/components/join/join.scss b/source/js/components/join/join.scss index 38a1b3e73ff..d1c0852d2e3 100644 --- a/source/js/components/join/join.scss +++ b/source/js/components/join/join.scss @@ -61,8 +61,7 @@ } @media (min-width: $bp-md) { - padding-top: 1em; - padding-bottom: 1em; + padding: 1em 2rem; .join-btn { width: auto; @@ -94,9 +93,6 @@ } &.full-page { - margin-top: 2rem; - margin-bottom: 3rem; - .join-graphic { display: block; @@ -130,21 +126,8 @@ } } - .join-content, - .join-form { - @include make-col-pull(6); - } - } - - @media (min-width: $bp-lg) { - .join-content, - .join-form { - @include make-col-pull(5); - @include make-col(10); - } - - .join-graphic { - @include make-col-push(7); + .join-main-content { + @include make-col-pull(4); } } } diff --git a/source/pug/views/sign-up.pug b/source/pug/views/sign-up.pug index 116d3a88986..99f0c4d6a59 100644 --- a/source/pug/views/sign-up.pug +++ b/source/pug/views/sign-up.pug @@ -6,4 +6,6 @@ block masterParams block content .container - .join-us.full-page + .row.justify-content-center.my-5 + .col-10 + .join-us.full-page diff --git a/source/pug/views/style-guide.pug b/source/pug/views/style-guide.pug index 846b2a39197..90ae1c5eded 100644 --- a/source/pug/views/style-guide.pug +++ b/source/pug/views/style-guide.pug @@ -51,7 +51,7 @@ block content h3.my-5 Components - h4 jump-bar + h4 .jump-bar ul.jump-bar.mb-3 li.no-link Featured @@ -62,6 +62,15 @@ block content li a(href=`https://www.mozillapulse.org/issues/open-innovation`) Open Innovation - h4 hr-gradient + h4 .hr-gradient hr.hr-gradient + + h4 .join-us + .join-us + + h4 .join-us.full-width + .join-us.full-width + + h4 .join-us.full-page + .join-us.full-page