Show mastodon on modal (#6129)

This commit is contained in:
Akihiko Odaki 2018-01-02 13:07:56 +09:00 committed by Eugen Rochko
parent 7d376e41be
commit 2c1ed5f872
10 changed files with 34 additions and 2 deletions

View File

@ -4,6 +4,7 @@ class AuthorizeFollowsController < ApplicationController
layout 'modal' layout 'modal'
before_action :authenticate_user! before_action :authenticate_user!
before_action :set_body_classes
def show def show
@account = located_account || render(:error) @account = located_account || render(:error)
@ -58,4 +59,8 @@ class AuthorizeFollowsController < ApplicationController
def acct_params def acct_params
params.fetch(:acct, '') params.fetch(:acct, '')
end end
def set_body_classes
@body_classes = 'modal-layout'
end
end end

View File

@ -38,4 +38,8 @@ class RemoteFollowController < ApplicationController
def suspended_account? def suspended_account?
@account.suspended? @account.suspended?
end end
def set_body_classes
@body_classes = 'modal-layout'
end
end end

View File

@ -25,6 +25,6 @@ class SharesController < ApplicationController
end end
def set_body_classes def set_body_classes
@body_classes = 'compose-standalone' @body_classes = 'modal-layout compose-standalone'
end end
end end

View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

View File

@ -6,6 +6,7 @@
@import 'mastodon/reset'; @import 'mastodon/reset';
@import 'mastodon/basics'; @import 'mastodon/basics';
@import 'mastodon/modal';
@import 'mastodon/containers'; @import 'mastodon/containers';
@import 'mastodon/lists'; @import 'mastodon/lists';
@import 'mastodon/footer'; @import 'mastodon/footer';

View File

@ -1773,7 +1773,7 @@
} }
> .mastodon { > .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; flex: 1;
} }
} }

View 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;
}
}

View File

@ -12,5 +12,7 @@
= fa_icon 'sign-out' = fa_icon 'sign-out'
.container= yield .container= yield
.modal-layout__mastodon
%div
= render template: 'layouts/application' = render template: 'layouts/application'