small changes in the login screen and a minor change in other template

5 files changed, 20 insertions, 12 deletions

diff --git a/askbot/media/jquery-openid/openid.css b/askbot/media/jquery-openid/openid.css
index 9a1db85f..b46522bd 100644
--- a/askbot/media/jquery-openid/openid.css
+++ b/askbot/media/jquery-openid/openid.css
@@ -15,7 +15,12 @@ ul.large input {height: 40px; width: 90px;border:1px solid #ccc;margin:0 5px 5px
 /*#signin-form #account-recovery-form input {cursor:pointer;}
 #signin-form #account-recovery-form input.text {cursor:default;}*/
 
-table.login { text-align: right;}
+table.login { 
+    text-align: right;
+}
+table.login td {
+    padding: 0 10px 8px 0;
+}
 
 .openid-signin .submit-b {
     cursor: pointer; /*letter-spacing:1px;*/
diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css
index 55769a17..ae63fa36 100644
--- a/askbot/media/style/style.css
+++ b/askbot/media/style/style.css
@@ -627,6 +627,9 @@ input[type="submit"].searchBtn {
 .users-page input[type="submit"].searchBtn {
   margin-top: 1px;
 }
+table.openid td {
+  padding: 0 10px 5px 0;
+}
 .ask-page input[type="submit"].searchBtn {
   display: none;
 }
@@ -2887,11 +2890,12 @@ ul#related-tags li {
 #local_login_buttons #id_password,
 #password-fs #id_password,
 #openid-fs #id_password {
+  color: #525252;
   font-size: 12px;
-  line-height: 20px;
-  height: 20px;
+  line-height: 25px;
+  height: 25px;
   margin: 0px;
-  padding: 0px 0 0 5px;
+  padding: 0 5px;
   width: 200px;
 }
 .openid-input {
diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less
index 83be895f..54753952 100644
--- a/askbot/media/style/style.less
+++ b/askbot/media/style/style.less
@@ -2982,12 +2982,13 @@ ul#related-tags li {
 #email-input-fs,#local_login_buttons,#password-fs,#openid-fs{
     margin-top:10px;
     #id_email,#id_username,#id_password{
+        color: #525252;
         font-size: 12px;
-        line-height: 20px;
-        height: 20px;
+        line-height: 25px;
+        height: 25px;
         margin: 0px;
-        padding: 0px 0 0 5px;
-        width:200px;
+        padding: 0 5px;
+        width: 200px;
     }
 }
 
diff --git a/askbot/templates/authopenid/signin.html b/askbot/templates/authopenid/signin.html
index ff7d47a4..2ec05558 100644
--- a/askbot/templates/authopenid/signin.html
+++ b/askbot/templates/authopenid/signin.html
@@ -87,16 +87,13 @@
             {% if user.is_anonymous() %}

                 {% if have_buttons %}

                     <h2 id="password-heading">

-                        {% trans %}or enter your <span>user name and password</span>, then sign in{% endtrans %}

+                        {% trans %}or enter your <span>user name and password</span>{% endtrans %}

                     </h2>

                 {% else %}

                     <h1 class="section-title">

                         {% trans %}Please, sign in{% endtrans %}

                     </h1>

                 {% endif %}

-                {% if have_buttons %}

-                    <p class="hint">{% trans %}(or select another login method above){% endtrans %}</p>

-                {% endif %}

                 <table class="login">

                     {% if login_form.password_login_failed %}

                     <tr>

diff --git a/askbot/templates/question/answer_vote_buttons.html b/askbot/templates/question/answer_vote_buttons.html
index cd6f62f0..68503310 100644
--- a/askbot/templates/question/answer_vote_buttons.html
+++ b/askbot/templates/question/answer_vote_buttons.html
@@ -1,3 +1,4 @@
+{% import "macros.html" as macros %}
 {{ macros.post_vote_buttons(post = answer) }}
 {% if settings.ACCEPTING_ANSWERS_ENABLED %}
 <div