diff options
| author | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
| commit | 63307c9abf120985d979a40a53a0598d3f0d5c5a (patch) | |
| tree | 57d9cffd7aa0959ea31fe0fa2d89a9080198bcb3 /scss/imports | |
| parent | e1a65d0c2a13e12ee53be98c731616e35aa07a41 (diff) | |
| parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
| download | ninja-63307c9abf120985d979a40a53a0598d3f0d5c5a.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
manifest.json
Diffstat (limited to 'scss/imports')
| -rwxr-xr-x | scss/imports/scss/_MainWindow.scss | 2 |
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 | } |