luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-27 15:46:55 +00:00
Code Issues Projects Releases Wiki Activity

Add the shrinking glitchy elefriend. #294.

Browse source
This commit is contained in:
David Yip 2018-01-13 11:41:06 -06:00
parent 835eec8a4c
commit 1e0b707018
No known key found for this signature in database
GPG key ID: 7DA0036508FCC0CC
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/flavours/glitch/features/drawer/index.js
View file

@ -94,9 +94,12 @@ class Drawer extends React.Component {
submitted={submitted} submitted={submitted}
value={searchValue} value={searchValue}
/> />
<div {...drawerAttrs}> <div className='contents'>
<DrawerAccount account={account} /> <DrawerAccount account={account} />
<Composer /> <div className='drawer__inner'>
<Composer />
{multiColumn && <div className="mastodon mbstobon-bg-1" />}
</div>
<DrawerResults <DrawerResults
results={results} results={results}
visible={submitted && !searchHidden} visible={submitted && !searchHidden}

24
app/javascript/flavours/glitch/styles/components/drawer.scss
View file

@ -50,9 +50,27 @@
contain: strict; contain: strict;
} }
@for $i from 1 through 3 { .drawer__inner {
.mbstobon-bg-#{$i} { position: absolute;
background: url("~flavours/glitch/images/mbstobon-ui-#{$i}.png") no-repeat left bottom / contain; top: 0;
left: 0;
box-sizing: border-box;
padding: 0;
display: flex;
flex-direction: column;
overflow: hidden;
overflow-y: auto;
width: 100%;
height: 100%;
.mastodon {
flex: 1;
@for $i from 1 through 3 {
&.mbstobon-bg-#{$i} {
background: url("~flavours/glitch/images/mbstobon-ui-#{$i}.png") no-repeat left bottom / contain;
}
}
} }
} }
} }