mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-10-19 17:55:05 +02:00
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss
This commit is contained in:
commit
54148b9a4a
|
@ -5,6 +5,7 @@ class AuthorizeFollowsController < ApplicationController
|
|||
|
||||
before_action :authenticate_user!
|
||||
before_action :set_pack
|
||||
before_action :set_body_classes
|
||||
|
||||
def show
|
||||
@account = located_account || render(:error)
|
||||
|
@ -63,4 +64,8 @@ class AuthorizeFollowsController < ApplicationController
|
|||
def acct_params
|
||||
params.fetch(:acct, '')
|
||||
end
|
||||
|
||||
def set_body_classes
|
||||
@body_classes = 'modal-layout'
|
||||
end
|
||||
end
|
||||
|
|
|
@ -43,4 +43,8 @@ class RemoteFollowController < ApplicationController
|
|||
def suspended_account?
|
||||
@account.suspended?
|
||||
end
|
||||
|
||||
def set_body_classes
|
||||
@body_classes = 'modal-layout'
|
||||
end
|
||||
end
|
||||
|
|
|
@ -30,6 +30,6 @@ class SharesController < ApplicationController
|
|||
end
|
||||
|
||||
def set_body_classes
|
||||
@body_classes = 'compose-standalone'
|
||||
@body_classes = 'modal-layout compose-standalone'
|
||||
end
|
||||
end
|
||||
|
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
BIN
app/javascript/images/wave-compose-standalone.png
Normal file
BIN
app/javascript/images/wave-compose-standalone.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.8 KiB |
BIN
app/javascript/images/wave-modal.png
Normal file
BIN
app/javascript/images/wave-modal.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.1 KiB |
|
@ -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' />);
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
@import 'mastodon/reset';
|
||||
@import 'mastodon/basics';
|
||||
@import 'mastodon/modal';
|
||||
@import 'mastodon/containers';
|
||||
@import 'mastodon/lists';
|
||||
@import 'mastodon/footer';
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
20
app/javascript/styles/mastodon/modal.scss
Normal file
20
app/javascript/styles/mastodon/modal.scss
Normal file
|
@ -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;
|
||||
}
|
||||
}
|
|
@ -9,5 +9,7 @@
|
|||
= fa_icon 'sign-out'
|
||||
|
||||
.container= yield
|
||||
.modal-layout__mastodon
|
||||
%div
|
||||
|
||||
= render template: 'layouts/application'
|
||||
|
|
Loading…
Reference in a new issue