From 5749ee6c3215edc6138517d04e73d21452ae4709 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Sun, 22 Jun 2014 01:21:09 +0200 Subject: [PATCH] WIP forms, tweaks on 2nd level navbar, and labels on listing --- .../application/static/assets/css/bfct.css | 47 +++++++++++ blender-bfct/application/static/assets_shared | 2 +- .../templates/applications/index.html | 8 +- blender-bfct/application/templates/apply.html | 84 +++++++++---------- .../application/templates/layout.html | 6 +- 5 files changed, 94 insertions(+), 53 deletions(-) diff --git a/blender-bfct/application/static/assets/css/bfct.css b/blender-bfct/application/static/assets/css/bfct.css index 89e9947..ac43608 100644 --- a/blender-bfct/application/static/assets/css/bfct.css +++ b/blender-bfct/application/static/assets/css/bfct.css @@ -9,3 +9,50 @@ position: absolute; } +.label.label-2x { + font-size: 100%; +} + +.input-group { + position: relative; +} + +.form-control { + top: 0; + position: absolute; + background-color: transparent; + border: none; + margin-top: 24px; + border-bottom: 1px solid #ccc; + box-shadow: none; + transition: all 0.1s ease-in-out ; +} + +.input-group-lg>.form-control, .input-group-lg>.input-group-addon, .input-group-lg>.input-group-btn>.btn { + padding: 0px 4px 0px 10px; + height: 40px; + font-size: 120%; +} + +.control-label { + font-size: 80%; +} + +.input-group .control-label { + position: absolute; + left: 0; + top: 6px; + opacity: 0; + transition: all ease-out 0.2s; + transition-delay: .4s; +} + +.form-control:hover, .form-control:focus { + background-color: white; +} + +.form-control:focus + .control-label, +.form-control:hover + .control-label{ + opacity: 0.8; + top: 1px; +} \ No newline at end of file diff --git a/blender-bfct/application/static/assets_shared b/blender-bfct/application/static/assets_shared index 03df3b9..1feae3b 160000 --- a/blender-bfct/application/static/assets_shared +++ b/blender-bfct/application/static/assets_shared @@ -1 +1 @@ -Subproject commit 03df3b93360546259dde9952e7cdd2f98db7f282 +Subproject commit 1feae3be6e341e3959a36c7679102fb6f19b88c5 diff --git a/blender-bfct/application/templates/applications/index.html b/blender-bfct/application/templates/applications/index.html index d69453b..403a88a 100755 --- a/blender-bfct/application/templates/applications/index.html +++ b/blender-bfct/application/templates/applications/index.html @@ -29,13 +29,13 @@ {{application.submission_date.strftime('%d %B, %Y')}} {% if application.status == 'under_review' %} - Under Review + Under Review {% elif application.status == 'submitted' %} - Pending + Pending {% elif application.status == 'approved' %} - Approved! + Approved! {% elif application.status == 'rejected' %} - Rejected + Rejected {% else %} {{application.status}} {% endif %} diff --git a/blender-bfct/application/templates/apply.html b/blender-bfct/application/templates/apply.html index c91bb4e..141c794 100755 --- a/blender-bfct/application/templates/apply.html +++ b/blender-bfct/application/templates/apply.html @@ -1,84 +1,78 @@ {% extends 'layout.html' %} {% block body %}
-
+
{{ form.hidden_tag() }} -
+
+ +

What happens when I apply?

+

+ Once we receive your application, the Blender Foundation Certification Board + will proceed to review it. This may take some days. +

You can come back to this page and check + the status of your application anytime. +

Once your application has been reviewed, you'll receive + an e-mail with the results, and instructions on how to proceed. +

+
{% endblock %} diff --git a/blender-bfct/application/templates/layout.html b/blender-bfct/application/templates/layout.html index 317f7aa..49cd1ba 100644 --- a/blender-bfct/application/templates/layout.html +++ b/blender-bfct/application/templates/layout.html @@ -77,7 +77,7 @@