diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-02 00:11:41 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-01-02 00:11:41 -0600 |
commit | 54148b9a4a044e2c3ac9bb5eed71edcc0d598907 (patch) | |
tree | 09cc3cd0558f0152ff17b0c48acbf346b8006098 /app/javascript | |
parent | fa9b7ece2e521fb4d6b91a95028614ae9b2a58a3 (diff) | |
parent | 764f87695358c06a823a9c9541f2e8fb092de299 (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/images/mastodon-ui.png (renamed from app/javascript/images/mastodon-drawer.png) | bin | 32449 -> 32449 bytes | |||
-rw-r--r-- | app/javascript/images/wave-compose-standalone.png | bin | 0 -> 5921 bytes | |||
-rw-r--r-- | app/javascript/images/wave-modal.png | bin | 0 -> 5200 bytes | |||
-rw-r--r-- | app/javascript/mastodon/features/getting_started/index.js | 14 | ||||
-rw-r--r-- | app/javascript/styles/application.scss | 1 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/components.scss | 2 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/modal.scss | 20 |
7 files changed, 29 insertions, 8 deletions
diff --git a/app/javascript/images/mastodon-drawer.png b/app/javascript/images/mastodon-ui.png index a1fb642a0..a1fb642a0 100644 --- a/app/javascript/images/mastodon-drawer.png +++ b/app/javascript/images/mastodon-ui.png Binary files differdiff --git a/app/javascript/images/wave-compose-standalone.png b/app/javascript/images/wave-compose-standalone.png new file mode 100644 index 000000000..287ee639b --- /dev/null +++ b/app/javascript/images/wave-compose-standalone.png Binary files differdiff --git a/app/javascript/images/wave-modal.png b/app/javascript/images/wave-modal.png new file mode 100644 index 000000000..88818a6d7 --- /dev/null +++ b/app/javascript/images/wave-modal.png Binary files differdiff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 2f02f245f..3c1619c24 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -48,7 +48,7 @@ export default class GettingStarted extends ImmutablePureComponent { render () { const { intl, myAccount, columns, multiColumn } = this.props; - let navItems = []; + const navItems = []; if (multiColumn) { if (!columns.find(item => item.get('id') === 'HOME')) { @@ -68,20 +68,20 @@ export default class GettingStarted extends ImmutablePureComponent { } } - navItems = navItems.concat([ + navItems.push( <ColumnLink key='4' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />, <ColumnLink key='5' icon='thumb-tack' text={intl.formatMessage(messages.pins)} to='/pinned' />, - <ColumnLink key='6' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />, - ]); + <ColumnLink key='6' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' /> + ); if (myAccount.get('locked')) { navItems.push(<ColumnLink key='7' icon='users' text={intl.formatMessage(messages.follow_requests)} to='/follow_requests' />); } - navItems = navItems.concat([ + navItems.push( <ColumnLink key='8' icon='volume-off' text={intl.formatMessage(messages.mutes)} to='/mutes' />, - <ColumnLink key='9' icon='ban' text={intl.formatMessage(messages.blocks)} to='/blocks' />, - ]); + <ColumnLink key='9' icon='ban' text={intl.formatMessage(messages.blocks)} to='/blocks' /> + ); if (multiColumn) { navItems.push(<ColumnLink key='10' icon='question' text={intl.formatMessage(messages.keyboard_shortcuts)} to='/keyboard-shortcuts' />); diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss index 44aa10564..fd6665f65 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -6,6 +6,7 @@ @import 'mastodon/reset'; @import 'mastodon/basics'; +@import 'mastodon/modal'; @import 'mastodon/containers'; @import 'mastodon/lists'; @import 'mastodon/footer'; diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 0366d7cba..a03165690 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1773,7 +1773,7 @@ } > .mastodon { - background: url('~images/mastodon-drawer.png') no-repeat left bottom / contain; + background: url('~images/mastodon-ui.png') no-repeat left bottom / contain; flex: 1; } } diff --git a/app/javascript/styles/mastodon/modal.scss b/app/javascript/styles/mastodon/modal.scss new file mode 100644 index 000000000..310dcb924 --- /dev/null +++ b/app/javascript/styles/mastodon/modal.scss @@ -0,0 +1,20 @@ +.modal-layout { + background: $ui-base-color url('../images/wave-modal.png') repeat-x bottom fixed; + display: flex; + flex-direction: column; + height: 100vh; + padding: 0; +} + +.modal-layout__mastodon { + display: flex; + flex: 1; + flex-direction: column; + justify-content: flex-end; + + > * { + flex: 1; + max-height: 235px; + background: url('../images/mastodon-ui.png') no-repeat left bottom / contain; + } +} |