From abe16a7026d5d2087c08138f0fe7d0c6776d896e Mon Sep 17 00:00:00 2001
From: fsubal <fsubal@users.noreply.github.com>
Date: Thu, 20 Apr 2017 02:20:51 +0900
Subject: [PATCH 1/3] fix broken style when follower has long description
 (#2159)

---
 app/assets/stylesheets/accounts.scss | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/accounts.scss b/app/assets/stylesheets/accounts.scss
index f9a698824b..11d155d54b 100644
--- a/app/assets/stylesheets/accounts.scss
+++ b/app/assets/stylesheets/accounts.scss
@@ -237,13 +237,14 @@
 }
 
 .accounts-grid {
-  clear: both;
   box-shadow: 0 0 15px rgba($color8, 0.2);
   background: $color5;
   border-radius: 0 0 4px 4px;
   padding: 20px 10px;
   padding-bottom: 10px;
   overflow: hidden;
+  display: flex;
+  flex-wrap: wrap;
 
   @media screen and (max-width: 700px) {
     border-radius: 0;
@@ -253,11 +254,9 @@
   .account-grid-card {
     box-sizing: border-box;
     width: 335px;
-    float: left;
     border: 1px solid $color2;
     border-radius: 4px;
     color: $color1;
-    height: 160px;
     margin-bottom: 10px;
 
     &:nth-child(odd) {

From 7832425fdd71cb637cc138b88ddb506ac27665b7 Mon Sep 17 00:00:00 2001
From: Tomohiro Suwa <neoen.gsn@gmail.com>
Date: Thu, 20 Apr 2017 02:21:23 +0900
Subject: [PATCH 2/3] Fix css for toot button when uploading images (#2161)

---
 app/assets/javascripts/components/components/button.jsx      | 5 ++++-
 .../components/features/compose/components/compose_form.jsx  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/components/components/button.jsx b/app/assets/javascripts/components/components/button.jsx
index c3e1840246..6c3da10fe1 100644
--- a/app/assets/javascripts/components/components/button.jsx
+++ b/app/assets/javascripts/components/components/button.jsx
@@ -44,7 +44,10 @@ const Button = React.createClass({
       cursor: 'pointer',
       lineHeight: `${this.props.size}px`,
       borderRadius: '4px',
-      textDecoration: 'none'
+      textDecoration: 'none',
+      whiteSpace: 'nowrap',
+      textOverflow: 'ellipsis',
+      overflow: 'hidden'
     };
 
     return (
diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
index fad77c8e9d..805aad3d52 100644
--- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@ -197,9 +197,9 @@ const ComposeForm = React.createClass({
             <SpoilerButtonContainer />
           </div>
 
-          <div style={{ display: 'flex' }}>
+          <div style={{ display: 'flex', minWidth: 0 }}>
             <div style={{ paddingTop: '10px', marginRight: '16px', lineHeight: '36px' }}><CharacterCounter max={500} text={text} /></div>
-            <div style={{ paddingTop: '10px' }}><Button text={publishText} onClick={this.handleSubmit} disabled={disabled || text.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "_").length > 500} /></div>
+            <div style={{ paddingTop: '10px', overflow: 'hidden' }}><Button text={publishText} onClick={this.handleSubmit} disabled={disabled || text.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "_").length > 500} block /></div>
           </div>
         </div>
       </div>

From 09dad88853966ca1f2de96881393da65f55340d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gy=C3=B6rgy=20N=C3=A1dudvari?=
 <reedcourty@users.noreply.github.com>
Date: Wed, 19 Apr 2017 19:21:44 +0200
Subject: [PATCH 3/3] Fixed hungarian translation (#2158)

---
 app/assets/javascripts/components/locales/hu.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/components/locales/hu.jsx b/app/assets/javascripts/components/locales/hu.jsx
index 9a2d14d87a..b68df66fd6 100644
--- a/app/assets/javascripts/components/locales/hu.jsx
+++ b/app/assets/javascripts/components/locales/hu.jsx
@@ -18,7 +18,7 @@ const hu = {
   "account.block": "Blokkolás",
   "account.follow": "Követés",
   "account.posts": "Posts",
-  "account.follows": "Követők",
+  "account.follows": "Követve",
   "account.followers": "Követők",
   "account.follows_you": "Követnek téged",
   "getting_started.heading": "Első lépések",