styling + a unicode livesettings bugfix

3 files changed, 27 insertions, 19 deletions

diff --git a/askbot/deps/livesettings/values.py b/askbot/deps/livesettings/values.py
index 92b5d24e..0f30808a 100644
--- a/askbot/deps/livesettings/values.py
+++ b/askbot/deps/livesettings/values.py
@@ -9,7 +9,7 @@ from django.core.exceptions import ImproperlyConfigured
 from django.core.cache import cache
 from django.utils import simplejson
 from django.utils.datastructures import SortedDict
-from django.utils.encoding import smart_str
+from django.utils.encoding import force_unicode
 from django.utils.translation import ugettext as _
 from django.utils.translation import ugettext_lazy
 from django.core.files import storage
@@ -246,11 +246,11 @@ class Value(object):
                 work = []
                 for x in self.choices:
                     if x[0] in self.default:
-                        work.append(smart_str(x[1]))
-                note = _('Default value: ') + ", ".join(work)
+                        work.append(force_unicode(x[1]))
+                note = _('Default value: ') + unicode(u", ".join(work))
 
             else:
-                note = _("Default value: %s") % unicode(self.default)
+                note = _("Default value: %s") % force_unicode(self.default)
 
         return note
 
diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css
index fc2373db..8b6451a6 100644
--- a/askbot/media/style/style.css
+++ b/askbot/media/style/style.css
@@ -159,6 +159,8 @@ a:hover {
 }
 .avatar-box {
   text-decoration: none;
+  width: 32px;
+  height: 32px;
 }
 .badge-context-toggle.active {
   cursor: pointer;
@@ -838,8 +840,11 @@ body.anon.ask-page .search-drop-menu {
 .box {
   background: #fff;
   padding: 4px 0px 10px 1px;
-  width: 200px;
+  width: 100%;
   overflow: hidden;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
   /* widgets for question template */
 
   /* notify by email box */
@@ -2032,11 +2037,11 @@ ul#related-tags li {
 .question-page p.rss {
   float: none;
   clear: both;
-  padding: 3px 0 3px 18px;
+  display: inline-block;
+  padding: 3px 0 3px 20px;
   font-size: 15px;
-  width: 130px;
+  width: auto;
   background-position: center left;
-  margin-left: 0px !important;
 }
 .question-page p.rss a {
   font-family: 'Open Sans Condensed', Arial, sans-serif;
@@ -2565,8 +2570,7 @@ ul#related-tags li {
 }
 .question-page .vote-buttons .notify-sidebar {
   text-align: center;
-  width: 130px;
-  margin: 7px auto 0;
+  margin: 6px auto 0;
 }
 .question-page .vote-buttons .notify-sidebar label {
   vertical-align: top;
diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less
index 28b2ee67..9190a726 100644
--- a/askbot/media/style/style.less
+++ b/askbot/media/style/style.less
@@ -164,6 +164,8 @@ a:hover {
 
 .avatar-box {
     text-decoration: none;
+    width: 32px;
+    height: 32px;
 }
 
 .badge-context-toggle.active {
@@ -869,8 +871,11 @@ body.anon.ask-page .search-drop-menu {
 .box {
     background: #fff;
     padding: 4px 0px 10px 1px;
-    width:200px;
+    width: 100%;
     overflow: hidden;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
 
     p {
         margin-bottom: 4px;
@@ -2149,13 +2154,13 @@ ul#related-tags li {
     }
 
     p.rss {
-        float:none;
-        clear:both;
-        padding: 3px 0 3px 18px;
+        float: none;
+        clear: both;
+        display: inline-block;
+        padding: 3px 0 3px 20px;
         font-size: 15px;
-        width:130px;
-        background-position:center left;
-        margin-left:0px !important;
+        width: auto;
+        background-position: center left;
     }
 
     p.rss a {
@@ -2693,8 +2698,7 @@ ul#related-tags li {
 
     .vote-buttons .notify-sidebar {
         text-align: center;
-        width:130px;
-        margin: 7px auto 0;
+        margin: 6px auto 0;
         label {
             vertical-align: top;
         }