Add the shrinking glitchy elefriend. #294.

master
David Yip 7 years ago
parent 835eec8a4c
commit 1e0b707018
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC
  1. 5
      app/javascript/flavours/glitch/features/drawer/index.js
  2. 20
      app/javascript/flavours/glitch/styles/components/drawer.scss

@ -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} />
<div className='drawer__inner'>
<Composer /> <Composer />
{multiColumn && <div className="mastodon mbstobon-bg-1" />}
</div>
<DrawerResults <DrawerResults
results={results} results={results}
visible={submitted && !searchHidden} visible={submitted && !searchHidden}

@ -50,12 +50,30 @@
contain: strict; contain: strict;
} }
.drawer__inner {
position: absolute;
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 { @for $i from 1 through 3 {
.mbstobon-bg-#{$i} { &.mbstobon-bg-#{$i} {
background: url("~flavours/glitch/images/mbstobon-ui-#{$i}.png") no-repeat left bottom / contain; background: url("~flavours/glitch/images/mbstobon-ui-#{$i}.png") no-repeat left bottom / contain;
} }
} }
} }
}
}
.drawer--header { .drawer--header {
display: flex; display: flex;

Loading…
Cancel
Save