From 466ad3cfc11288f9ba27c043f785b1b3d2a7a220 Mon Sep 17 00:00:00 2001 From: Corey Johnson & Nathan Sobo Date: Fri, 27 Apr 2012 10:24:30 -0600 Subject: [PATCH] Add #horizontal flexbox container to RootView. TreeView places itself inside it. --- src/app/root-view.coffee | 3 ++- src/extensions/tree-view.coffee | 2 +- static/atom.css | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/app/root-view.coffee b/src/app/root-view.coffee index db11ee517..d3cac10f7 100644 --- a/src/app/root-view.coffee +++ b/src/app/root-view.coffee @@ -18,7 +18,8 @@ module.exports = class RootView extends View @content: -> @div id: 'root-view', tabindex: -1, => - @div id: 'panes', outlet: 'panes' + @div id: 'horizontal', outlet: 'horizontal', => + @div id: 'panes', outlet: 'panes' @deserialize: (viewState) -> new RootView(viewState) diff --git a/src/extensions/tree-view.coffee b/src/extensions/tree-view.coffee index f33abc1a4..aee491574 100644 --- a/src/extensions/tree-view.coffee +++ b/src/extensions/tree-view.coffee @@ -7,7 +7,7 @@ module.exports = class TreeView extends View @activate: (rootView) -> requireStylesheet 'tree-view.css' - rootView.prepend(new TreeView(rootView)) + rootView.horizontal.prepend(new TreeView(rootView)) @content: (rootView) -> @div class: 'tree-view', tabindex: -1, => diff --git a/static/atom.css b/static/atom.css index 75d9d2367..064fcd698 100644 --- a/static/atom.css +++ b/static/atom.css @@ -14,12 +14,15 @@ body { overflow-y: auto; position: relative; background-image: url(static/images/linen.png); +} + +#root-view #horizontal { display: -webkit-flexbox; } #root-view #panes { height: 100%; - width: 100%; + width: -webkit-flex(1 0); position: relative; }