Skip to content

Commit

Permalink
stop forcing the use of View
Browse files Browse the repository at this point in the history
Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
  • Loading branch information
xaiki committed Jun 11, 2018
1 parent 4683c13 commit d7efdce
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
18 changes: 8 additions & 10 deletions src/components/window/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,15 @@ class Window extends React.Component {
}

return (
<div className={style.windowOuter}>
<TitleBar title={title} actions={actions} fullscreen={fullscreen} {...titlebar} />
{bars}
<div className={style.windowInner} style={{
height: fullscreen ? '100%' : 'calc(100% - var(--Window-handler-height))'
}}>
<View>
{props.children}
</View>
<div className={style.windowOuter}>
<TitleBar title={title} actions={actions} fullscreen={fullscreen} {...titlebar} />
{bars}
<div className={style.windowInner} style={{
height: fullscreen ? '100%' : 'calc(100% - var(--Window-handler-height))'
}}>
{props.children}
</div>
</div>
</div>
)
}
}
Expand Down
6 changes: 2 additions & 4 deletions src/components/window/style.styl
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@
border-radius: 5px
box-shadow: 0 6px 6px rgba(0,0,0,0.25);
display: block
position: relative
position: absolute
padding: 0
overflow-x: hidden
overflow-y: auto
scrollable()
overflow: hidden

.demoWindow
margin: 75px auto
Expand Down

0 comments on commit d7efdce

Please sign in to comment.