Browse Source

Add the shrinking glitchy elefriend. #294.

closed-social-glitch-2
David Yip 6 years ago
parent
commit
1e0b707018
No known key found for this signature in database GPG Key ID: 7DA0036508FCC0CC
2 changed files with 26 additions and 5 deletions
  1. +5
    -2
      app/javascript/flavours/glitch/features/drawer/index.js
  2. +21
    -3
      app/javascript/flavours/glitch/styles/components/drawer.scss

+ 5
- 2
app/javascript/flavours/glitch/features/drawer/index.js View File

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

+ 21
- 3
app/javascript/flavours/glitch/styles/components/drawer.scss View File

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

Loading…
Cancel
Save