Merge branch 'master' of git://github.com/byroncorrales/askbot-devel

4 files changed, 24 insertions, 6 deletions

diff --git a/askbot/skins/common/templates/authopenid/signup_with_password.html b/askbot/skins/common/templates/authopenid/signup_with_password.html
index 43571c20..9911facf 100644
--- a/askbot/skins/common/templates/authopenid/signup_with_password.html
+++ b/askbot/skins/common/templates/authopenid/signup_with_password.html
@@ -7,7 +7,7 @@
 {% endblock %}
 {% block content %}
 {% if settings.PASSWORD_REGISTER_SHOW_PROVIDER_BUTTONS == True %}
-    <h1>{% trans %}Please register by clicking on any of the icons below{% endtrans %}</h1>
+    <h1 class="section-title">{% trans %}Please register by clicking on any of the icons below{% endtrans %}</h1>
     <form id="signin-form" method="post" action="{{ settings.LOGIN_URL }}">{% csrf_token %}
         {# hide_local_login == True because it is password reg form #}
         {{ 
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index cacc8782..493acd6f 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -139,6 +139,10 @@ h1 {
   font-size: 24px;
   padding: 10px 0 5px 0px;
 }
+/* ----- Extra space above for messages ----- */
+body.user-messages {
+  margin-top: 2.4em;
+}
 /* ----- Custom positions ----- */
 .left {
   float: left;
@@ -449,6 +453,8 @@ h1 {
   width: 200px;
   /* widgets for question template */
 
+  /* notify by email box */
+
 }
 .box p {
   margin-bottom: 4px;
@@ -592,6 +598,9 @@ h1 {
   color: #777;
   text-align: center;
 }
+.box .notify-sidebar #question-subscribe-sidebar {
+  margin: 7px 0 0 3px;
+}
 .statsWidget p {
   color: #707070;
   font-size: 16px;
@@ -1871,7 +1880,16 @@ span.delete-icon:hover {
 .users-page #id_email,
 .openid-signin #id_name,
 .meta #id_name,
-.users-page #id_name {
+.users-page #id_name,
+.openid-signin #id_username,
+.meta #id_username,
+.users-page #id_username,
+.openid-signin #id_password1,
+.meta #id_password1,
+.users-page #id_password1,
+.openid-signin #id_password2,
+.meta #id_password2,
+.users-page #id_password2 {
   border: #cce6ec 3px solid;
   height: 25px;
   padding-left: 5px;
@@ -1890,7 +1908,7 @@ span.delete-icon:hover {
   border: 0;
   color: #4a757f;
   font-weight: bold;
-  font-size: 12px;
+  font-size: 16px;
   height: 24px;
   margin-top: -2px;
   cursor: pointer;
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index 3d436958..ca7a2336 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -2054,7 +2054,7 @@ span.delete-icon:hover {
         padding-left:0px;
         font-size:16px;
     }
-    #id_email,#id_name{
+    #id_email,#id_name,#id_username,#id_password1,#id_password2{
         border:#cce6ec 3px solid;
         height:25px;
         padding-left:5px;
@@ -2073,7 +2073,7 @@ span.delete-icon:hover {
         border:0;
         color:@button-label;
         font-weight:bold;
-        font-size:12px;
+        font-size:16px;
         height:24px;
         margin-top:-2px;
         cursor:pointer;
diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html
index 680b9d7b..49c697a0 100644
--- a/askbot/skins/default/templates/macros.html
+++ b/askbot/skins/default/templates/macros.html
@@ -221,7 +221,7 @@ poor design of the data or methods on data objects #}
             title="{% trans %}see questions tagged '{{ tag }}'{% endtrans %}"
             {% endif %}
             rel="tag"
-        >{{ tag|replace('*', '&#10045;') }}</{% if not is_link or tag[-1] == '*' %}span{% else %}a{% endif %}>
+        >{{ tag|replace('*', '&#10045;')|truncate(24,True)}}</{% if not is_link or tag[-1] == '*' %}span{% else %}a{% endif %}>
         {% if deletable %}
             <span class="delete-icon"
                 {% if delete_link_title %}