diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-13 11:41:06 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-13 21:27:39 -0600 |
| commit | 1e0b7070185b748e27a301acfc325bfb38be7b31 (patch) | |
| tree | 3b1fab7e9afab41beea7202112a18fe280a75dcc | |
| parent | 835eec8a4cbf8fa340241fc0bd83e07e8c19ef5d (diff) | |
Add the shrinking glitchy elefriend. #294.
| -rw-r--r-- | app/javascript/flavours/glitch/features/drawer/index.js | 7 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/drawer.scss | 24 |
2 files changed, 26 insertions, 5 deletions
diff --git a/app/javascript/flavours/glitch/features/drawer/index.js b/app/javascript/flavours/glitch/features/drawer/index.js index c8eabb4f3..ba56f1a30 100644 --- a/app/javascript/flavours/glitch/features/drawer/index.js +++ b/app/javascript/flavours/glitch/features/drawer/index.js @@ -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} diff --git a/app/javascript/flavours/glitch/styles/components/drawer.scss b/app/javascript/flavours/glitch/styles/components/drawer.scss index 423141aec..75b5d6b04 100644 --- a/app/javascript/flavours/glitch/styles/components/drawer.scss +++ b/app/javascript/flavours/glitch/styles/components/drawer.scss @@ -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; + } + } } } } |