diff --git a/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars b/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars
index 148223e6a..2de1dd25e 100644
--- a/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars
@@ -5,7 +5,7 @@
{{#if view.topic.title}}
{{view Discourse.TopicStatusView topicBinding="view.topic"}}
- {{view Discourse.AutoSizedTextView tagName="span" class="auto-sizer" contentBinding="view.topic.title"}}
+ {{view.topic.title}}
{{else}}
{{#if view.topic.missing}}
{{i18n topic.not_found.title}}
diff --git a/app/assets/javascripts/discourse/views/list/list_topics_view.js.coffee b/app/assets/javascripts/discourse/views/list/list_topics_view.js.coffee
index 3a571df2a..22fbb930e 100644
--- a/app/assets/javascripts/discourse/views/list/list_topics_view.js.coffee
+++ b/app/assets/javascripts/discourse/views/list/list_topics_view.js.coffee
@@ -58,10 +58,11 @@ window.Discourse.ListTopicsView = Ember.View.extend Discourse.Scrolling, Discour
return unless @get('allLoaded')
content = @get('controller.content')
+ split = content.get('filter').split('/')
if content.get('topics.length') == 0
- Em.String.i18n("topics.none.#{content.get('filter')}")
+ Em.String.i18n("topics.none.#{split[0]}", category: split[1])
else
- Em.String.i18n("topics.bottom.#{content.get('filter')}")
+ Em.String.i18n("topics.bottom.#{split[0]}", category: split[1])
).property('allLoaded', 'controller.content.topics.length')
diff --git a/app/assets/stylesheets/application/mobile.scss b/app/assets/stylesheets/application/mobile.scss
index cc32d09e5..8012a6b2e 100644
--- a/app/assets/stylesheets/application/mobile.scss
+++ b/app/assets/stylesheets/application/mobile.scss
@@ -1,8 +1,6 @@
@media only screen
-and (min-width : 320px)
-and (max-width : 480px) {
-// and (min-device-width : 320px)
-// and (max-device-width : 480px) {
+and (min-device-width : 320px)
+and (max-device-width : 480px) {
#reply-control {
.toggle-preview { display:none; }
#reply-title { width: 250px; }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 175703ac2..811a7b64f 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -317,6 +317,7 @@ en:
read: "You haven't read any topics yet."
posted: "You haven't posted in any topics yet."
popular: "There are no popular topics. That's sad."
+ category: "There are no {{category}} topics."
bottom:
popular: "There are no more popular topics to read."
posted: "There are no more posted topics to read."
@@ -324,7 +325,7 @@ en:
new: "There are no more new topics to read."
unread: "There are no more unread topics to read."
favorited: "There are no more favorited topics to read."
-
+ category: "There are no more {{category}} topics."
topic: