From 65f30f65a2816d5b25c096be0f237bbca17608e5 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Wed, 27 Dec 2017 11:31:30 +0900 Subject: Move the mastodon on Getting Started column to drawer column (#6109) Getting Started column obtained many links, and it became much taller. Because of its height, Getting Started column required long scrolling on devices with small screen, such as 4 inch phones and 10 inch laptops. This change moves the mastodon which took large space on the column to drawer column. The drawer column has only the compose form and has more space. --- app/javascript/images/mastodon-drawer.png | Bin 0 -> 32449 bytes app/javascript/images/mastodon-getting-started.png | Bin 34539 -> 0 bytes app/javascript/images/wave-drawer.png | Bin 0 -> 3269 bytes app/javascript/mastodon/features/compose/index.js | 1 + .../mastodon/features/getting_started/index.js | 24 ++++++++++----------- app/javascript/styles/mastodon/components.scss | 16 ++++++-------- 6 files changed, 19 insertions(+), 22 deletions(-) create mode 100644 app/javascript/images/mastodon-drawer.png delete mode 100644 app/javascript/images/mastodon-getting-started.png create mode 100644 app/javascript/images/wave-drawer.png (limited to 'app/javascript') diff --git a/app/javascript/images/mastodon-drawer.png b/app/javascript/images/mastodon-drawer.png new file mode 100644 index 000000000..a1fb642a0 Binary files /dev/null and b/app/javascript/images/mastodon-drawer.png differ diff --git a/app/javascript/images/mastodon-getting-started.png b/app/javascript/images/mastodon-getting-started.png deleted file mode 100644 index e05dd493f..000000000 Binary files a/app/javascript/images/mastodon-getting-started.png and /dev/null differ diff --git a/app/javascript/images/wave-drawer.png b/app/javascript/images/wave-drawer.png new file mode 100644 index 000000000..ca9f9e1d8 Binary files /dev/null and b/app/javascript/images/wave-drawer.png differ diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js index 0c66585c9..c3e936ab9 100644 --- a/app/javascript/mastodon/features/compose/index.js +++ b/app/javascript/mastodon/features/compose/index.js @@ -94,6 +94,7 @@ export default class Compose extends React.PureComponent {
+
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 11fb6d365..2f02f245f 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -98,19 +98,17 @@ export default class GettingStarted extends ImmutablePureComponent {
-
-
-

- • • -

-

- tootsuite/mastodon }} - /> -

-
+
+

+ • • +

+

+ tootsuite/mastodon }} + /> +

); diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 63664d607..3240b38a4 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1758,7 +1758,7 @@ position: absolute; top: 0; left: 0; - background: lighten($ui-base-color, 13%); + background: lighten($ui-base-color, 13%) url('../images/wave-drawer.png') no-repeat bottom / 100% auto; box-sizing: border-box; padding: 0; display: flex; @@ -1771,6 +1771,11 @@ &.darker { background: $ui-base-color; } + + > .mastodon { + background: url('../images/mastodon-drawer.png') no-repeat left bottom / contain; + flex: 1; + } } .pseudo-drawer { @@ -2072,15 +2077,8 @@ overflow-y: auto; } -.getting-started__footer { - display: flex; - flex-direction: column; -} - .getting-started { - box-sizing: border-box; - padding-bottom: 235px; - background: url('../images/mastodon-getting-started.png') no-repeat 0 100%; + background: $ui-base-color; flex: 1 0 auto; p { -- cgit From 511c6f96251a4492f7c5bea1f13018d61cfb9ce0 Mon Sep 17 00:00:00 2001 From: MitarashiDango Date: Fri, 29 Dec 2017 00:20:34 +0900 Subject: bug fix (WebPush does not work) (#6120) --- app/javascript/mastodon/actions/push_notifications/registerer.js | 2 +- app/javascript/mastodon/main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/javascript') diff --git a/app/javascript/mastodon/actions/push_notifications/registerer.js b/app/javascript/mastodon/actions/push_notifications/registerer.js index f851c311c..1d040bc8c 100644 --- a/app/javascript/mastodon/actions/push_notifications/registerer.js +++ b/app/javascript/mastodon/actions/push_notifications/registerer.js @@ -51,7 +51,7 @@ const sendSubscriptionToBackend = (subscription, me) => { // Last one checks for payload support: https://web-push-book.gauntface.com/chapter-06/01-non-standards-browsers/#no-payload const supportsPushNotifications = ('serviceWorker' in navigator && 'PushManager' in window && 'getKey' in PushSubscription.prototype); -export default function register () { +export function register () { return (dispatch, getState) => { dispatch(setBrowserSupport(supportsPushNotifications)); const me = getState().getIn(['meta', 'me']); diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js index 9b18465f5..5d73caa10 100644 --- a/app/javascript/mastodon/main.js +++ b/app/javascript/mastodon/main.js @@ -1,4 +1,4 @@ -import { register as registerPushNotifications } from './actions/push_notifications'; +import * as registerPushNotifications from './actions/push_notifications'; import { default as Mastodon, store } from './containers/mastodon'; import React from 'react'; import ReactDOM from 'react-dom'; -- cgit From f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66 Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Sat, 30 Dec 2017 10:44:19 +0900 Subject: Translate Korean (#6131) Relates to #6125, #6099 --- app/javascript/mastodon/locales/ko.json | 2 ++ config/locales/ko.yml | 6 ++++++ 2 files changed, 8 insertions(+) (limited to 'app/javascript') diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 0798fa7cf..7e77b7824 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -213,6 +213,7 @@ "search_popout.tips.user": "유저", "search_results.total": "{count, number}건의 결과", "standalone.public_title": "A look inside...", + "status.block": "@{name} 차단", "status.cannot_reblog": "이 포스트는 부스트 할 수 없습니다", "status.delete": "삭제", "status.embed": "공유하기", @@ -221,6 +222,7 @@ "status.media_hidden": "미디어 숨겨짐", "status.mention": "답장", "status.more": "자세히", + "status.mute": "@{name} 뮤트", "status.mute_conversation": "이 대화를 뮤트", "status.open": "상세 정보 표시", "status.pin": "고정", diff --git a/config/locales/ko.yml b/config/locales/ko.yml index a60884b27..9e3505a72 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -265,12 +265,18 @@ ko: unresolved: 미해결 view: 표시 settings: + activity_api_enabled: + desc_html: 주별 로컬에 게시 된 글, 활성 사용자 및 새로운 가입자 수 + title: 유저 활동에 대한 통계 발행 bootstrap_timeline_accounts: desc_html: 콤마로 여러 유저명을 구분. 로컬의 잠기지 않은 계정만 가능합니다. 비워 둘 경우 모든 로컬 관리자가 기본으로 사용 됩니다. title: 새 유저가 팔로우 할 계정들 contact_information: email: 공개할 메일 주소를 입력 username: 아이디를 입력 + peers_api_enabled: + desc_html: 이 인스턴스가 페디버스에서 만났던 도메인 네임들 + title: 발견 된 인스턴스들의 리스트 발행 registrations: closed_message: desc_html: 신규 등록을 받지 않을 때 프론트 페이지에 표시됩니다.
HTML 태그를 사용할 수 있습니다. -- cgit From 513d982f29f4ce4df163c53e4891663ce6742a39 Mon Sep 17 00:00:00 2001 From: David Yip Date: Sat, 30 Dec 2017 17:15:20 -0600 Subject: Use ~ notation in components for image references This uses (more or less) absolute references to external assets, which allows imported stylesheets (like components.scss) to work from other locations that may not have the expected path structure (e.g. the win95 theme). --- app/javascript/styles/mastodon/components.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/javascript') diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 207406cc0..0366d7cba 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1758,7 +1758,7 @@ position: absolute; top: 0; left: 0; - background: lighten($ui-base-color, 13%) url('../images/wave-drawer.png') no-repeat bottom / 100% auto; + background: lighten($ui-base-color, 13%) url('~images/wave-drawer.png') no-repeat bottom / 100% auto; box-sizing: border-box; padding: 0; display: flex; @@ -1773,7 +1773,7 @@ } > .mastodon { - background: url('../images/mastodon-drawer.png') no-repeat left bottom / contain; + background: url('~images/mastodon-drawer.png') no-repeat left bottom / contain; flex: 1; } } -- cgit From e4944d065b6bd6c6718c27700971be832ed4861a Mon Sep 17 00:00:00 2001 From: David Yip Date: Sat, 30 Dec 2017 17:17:37 -0600 Subject: Switch to tootsuite's elephant friend for the drawer This version has a transparent background, which works better with the wave. --- app/javascript/images/mastodon-drawer.png | Bin 46174 -> 32449 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'app/javascript') diff --git a/app/javascript/images/mastodon-drawer.png b/app/javascript/images/mastodon-drawer.png index 8fe0df76a..a1fb642a0 100644 Binary files a/app/javascript/images/mastodon-drawer.png and b/app/javascript/images/mastodon-drawer.png differ -- cgit