Canonical SSO provider

Merge lp:~canonical-isd-hackers/canonical-identity-provider/fix_error_msg_606457 into lp:canonical-identity-provider/release

  1. fix_error_msg_606457
  2. Merge into trunk
Proposed by Danny Tamez
Status: Merged
Approved by: Łukasz Czyżykowski
Approved revision: no longer in the source branch.
Merged at revision: 177
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/fix_error_msg_606457
Merge into: lp:canonical-identity-provider/release
Diff against target: 23 lines (+4/-1)
2 files modified
identityprovider/media/ubuntu/styles.css (+3/-0)
identityprovider/templates/enter_token.html (+1/-1)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/fix_error_msg_606457
Reviewer Review Type Date Requested Status
Łukasz Czyżykowski Pending
Review via email: mp+67263@code.launchpad.net

Commit message

Small css fix to align the confirmation code error message with the confirmation code field.

Description of the change

Small css fix to align the confirmation code error message with the confirmation code field.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'identityprovider/media/ubuntu/styles.css'
2--- identityprovider/media/ubuntu/styles.css 2011-07-01 19:47:04 +0000
3+++ identityprovider/media/ubuntu/styles.css 2011-07-07 22:32:36 +0000
4@@ -769,3 +769,6 @@
5 margin-bottom: 20px;
6 }
7 }
8+#confirmation_code_error {
9+ top: 47px;
10+}
11
12=== modified file 'identityprovider/templates/enter_token.html'
13--- identityprovider/templates/enter_token.html 2011-05-12 08:08:35 +0000
14+++ identityprovider/templates/enter_token.html 2011-07-07 22:32:36 +0000
15@@ -19,7 +19,7 @@
16 {% csrf_token %}
17
18 {% if form.non_field_errors %}
19- <p><span class="error">{{ form.non_field_errors.0 }}</span></p>
20+ <p><span class="error" id='confirmation_code_error'>{{ form.non_field_errors.0 }}</span></p>
21 {% endif %}
22
23 <p>