Merge branch 'github'

2 files changed, 38 insertions, 21 deletions

diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css
index 32f813b7..fb23aee6 100644
--- a/askbot/media/style/style.css
+++ b/askbot/media/style/style.css
@@ -4000,15 +4000,6 @@ li.L9 {
 #leading-sidebar {
   float: left;
 }
-/* language-specific fixes */
-body.lang-es #searchBar {
-  /* need special left padding */
-
-}
-body.anon.lang-es #searchBar {
-  /* need special left padding */
-
-}
 /* user groups */
 #user-groups input[type="text"] {
   height: 21px;
@@ -4556,3 +4547,18 @@ td.setting-input textarea {
     display: none;
   }
 }
+/* language-specific fixes */
+body.lang-es #searchBar {
+  /* need special left padding */
+
+}
+body.anon.lang-es #searchBar {
+  /* need special left padding */
+
+}
+body.lang-zh .box .inputs #interestingTagInput,
+body.lang-zh .box .inputs #ignoredTagInput,
+body.lang-zh .box .inputs #subscribedTagInput,
+body.lang-zh .box .inputs #ab-tag-search {
+  width: 125px;
+}
diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less
index 8fad8803..b73da0b2 100644
--- a/askbot/media/style/style.less
+++ b/askbot/media/style/style.less
@@ -4141,18 +4141,6 @@ a.edit {
     float: left;
 }
 
-/* language-specific fixes */
-body.lang-es {
-    #searchBar {
-        /* need special left padding */
-    }
-}
-body.anon.lang-es {
-    #searchBar {
-        /* need special left padding */
-    }
-}
-
 /* user groups */
 #user-groups {
     input[type="text"] {
@@ -4751,3 +4739,26 @@ td.setting-input {
         display: none;
     }
 }
+
+/* language-specific fixes */
+body.lang-es {
+    #searchBar {
+        /* need special left padding */
+    }
+}
+body.anon.lang-es {
+    #searchBar {
+        /* need special left padding */
+    }
+}
+
+body.lang-zh {
+    .box .inputs {
+         #interestingTagInput,
+         #ignoredTagInput,
+         #subscribedTagInput,
+         #ab-tag-search {
+            width: 125px;
+         }
+    }
+}