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/styles/mastodon/modal.scss | |
| 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/styles/mastodon/modal.scss')
| -rw-r--r-- | app/javascript/styles/mastodon/modal.scss | 20 |
1 files changed, 20 insertions, 0 deletions
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; + } +} |