aboutsummaryrefslogtreecommitdiff
path: root/scss/imports
diff options
context:
space:
mode:
authorEric Guzman2012-02-29 16:13:19 -0800
committerEric Guzman2012-02-29 16:13:19 -0800
commit53bdb1e7773069c4cca59e88d6da91cd0f58c94a (patch)
tree44a2147fcbb43ea483f78a1e2e082919f9c81970 /scss/imports
parentb2c60efb9c6f5dfa7b0fc5c2b9feebebc805ed97 (diff)
parentb09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff)
downloadninja-53bdb1e7773069c4cca59e88d6da91cd0f58c94a.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'scss/imports')
-rwxr-xr-xscss/imports/scss/_MainWindow.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index 97344b1e..4c1ed592 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -93,7 +93,7 @@
93} 93}
94 94
95.panelContainer { 95.panelContainer {
96 display:block; 96 display: -webkit-box;
97 -webkit-box-orient: vertical; 97 -webkit-box-orient: vertical;
98 position:relative; 98 position:relative;
99} 99}