Merge pull request mastodon#228 from pixiv/hotfix_v1_3_1

若干のデザイン修正
pixiv · Apr 29, 2017 · 2363d48 · 2363d48
2 parents ad8f955 + f338b25
commit 2363d48
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
@@ -1904,7 +1904,6 @@ button.icon-button.active i.fa-retweet {
   flex-direction: column;
   height: 100%;
   justify-content: center;
-  margin-top: 8px;
   position: relative;
   text-align: center;
   z-index: 100;

diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml
@@ -1,5 +1,9 @@
 en:
   activerecord:
+    attributes:
+      oauth_authentication:
+        provider: Provider
+        uid: User ID
     errors:
       models:
         account:

diff --git a/config/locales/activerecord.ja.yml b/config/locales/activerecord.ja.yml
@@ -1,5 +1,9 @@
 ja:
   activerecord:
+    attributes:
+      oauth_authentication:
+        provider: プロバイダー
+        uid: ユーザーID
     errors:
       models:
         account:
@@ -9,4 +13,4 @@ ja:
         status:
           attributes:
             reblog:
-              taken: はすでに存在します
+              taken: はすでに他のアカウントと連携済みです