Merge pull request #712 from steemit/develop

Merge branch 'develop'

Author: roadscape

app/components/modules/Header.jsx

@@ -153,7 +153,7 @@ class Header extends React.Component {
             ['hot', 'hot'],
             ['trending', 'trending (24 hour)'],
             ['trending30', 'trending (30 day)'],
-            ['promoted', 'promoted'],
+            //['promoted', 'promoted'], //TODO: reenable after shared-db upgrade
             ['active', 'active']
         ];
         if (current_account_name) sort_orders.unshift(['home', 'home']);
@@ -164,7 +164,7 @@ class Header extends React.Component {
             ['created', 'new'],
             ['hot', 'hot'],
             ['trending', 'trending'],
-            ['promoted', 'promoted'],
+            //['promoted', 'promoted'], //TODO: reenable after shared-db upgrade
             ['active', 'active']
         ];
         if (current_account_name) sort_orders_horizontal.unshift(['home', 'home']);

app/components/pages/PostsIndex.jsx

@@ -85,7 +85,7 @@ class PostsIndex extends React.Component {
         } else {
             posts = this.getPosts(order, category);
             if (posts !== null && posts.size === 0) {
-                emptyText = `No ` + topics_order + ` #` + category +  ` posts found`;
+                emptyText = `No ` + topics_order + (category ? ` #` + category : '') +  ` posts found`;
             }
         }
 

app/components/pages/UserProfile.scss

@@ -70,7 +70,8 @@
     h2 {
         padding-top: 20px;
         .Userpic {
-            padding-right: 1rem;
+            margin-right: 1rem;
+            vertical-align: middle;
         }
     }
 
@@ -128,6 +129,11 @@
         padding-right: 0;
     }
 
+    .UserProfile__banner h2 .Userpic {
+        width: 36px !important;
+        height: 36px !important;
+    }
+
     .UserProfile__banner .UserProfile__buttons {
         text-align: right;
 

app/locales/en.js

@@ -499,7 +499,7 @@ const en = 	{
 	// next 3 strings are used conditionally together
 	show_more: 'Show more',
 	show_less: 'Show less',
-	value_posts: 'value posts',
+	value_posts: 'low value posts',
 	// PormotePost.jsx
 	promote_post: 'Promote Post',
 	spend_your_DEBT_TOKEN_to_advertise_this_post: 'Spend your ' + DEBT_TOKEN + 's to advertise this post in the promoted content section',