tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source 
Conflicts:
	app/javascript/images/mastodon-drawer.png
	app/javascript/styles/mastodon/components.scss
This commit is contained in:
David Yip
2017-12-26 22:24:19 -06:00
parent 7347bc7334 65f30f65a2
commit 7174d1c955
8 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/javascript/styles/mastodon/components.scss
View File

@ -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 {