Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Show mastodon on modal (#6129)

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

0
app/javascript/images/mastodon-drawer.png → app/javascript/images/mastodon-ui.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Before After
Before After

BIN
app/javascript/images/wave-compose-standalone.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
app/javascript/images/wave-modal.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.1 KiB

1
app/javascript/styles/application.scss
View file

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

2
app/javascript/styles/mastodon/components.scss
View file

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