diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-26 22:24:19 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-26 22:24:19 -0600 |
| commit | 7174d1c955116e142754189e6169d9b31b599070 (patch) | |
| tree | 49139e81fc3cff355950401207968dca0944acd0 /app/javascript/styles | |
| parent | 7347bc733418651216f22f224caf656471499a08 (diff) | |
| parent | 65f30f65a2816d5b25c096be0f237bbca17608e5 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/javascript/images/mastodon-drawer.png app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 71d0b91e9..207406cc0 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1758,7 +1758,7 @@ position: absolute; top: 0; left: 0; - background: lighten($ui-base-color, 13%); + background: lighten($ui-base-color, 13%) url('../images/wave-drawer.png') no-repeat bottom / 100% auto; box-sizing: border-box; padding: 0; display: flex; @@ -1771,6 +1771,11 @@ &.darker { background: $ui-base-color; } + + > .mastodon { + background: url('../images/mastodon-drawer.png') no-repeat left bottom / contain; + flex: 1; + } } .pseudo-drawer { @@ -2072,15 +2077,8 @@ overflow-y: auto; } -.getting-started__footer { - display: flex; - flex-direction: column; -} - .getting-started { - box-sizing: border-box; - padding-bottom: 235px; - background: url('~images/mastodon-getting-started.png') no-repeat 0 100%; + background: $ui-base-color; flex: 1 0 auto; p { |