diff options
author | Jonathan Duran | 2012-06-26 13:52:22 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-26 13:52:22 -0700 |
commit | 5f07a68a6b97bf7e3549112dedf5676744846971 (patch) | |
tree | b59c08287c65db86ee9f6ab47eec89c58636f28e /scss | |
parent | df6e43cea10a0c976390017ba41c33f74c4b7692 (diff) | |
parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
download | ninja-5f07a68a6b97bf7e3549112dedf5676744846971.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'scss')
-rwxr-xr-x | scss/imports/scss/_PanelUI.scss | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss index 543901ad..a03991f9 100755 --- a/scss/imports/scss/_PanelUI.scss +++ b/scss/imports/scss/_PanelUI.scss | |||
@@ -1118,10 +1118,8 @@ button.panel-button { | |||
1118 | -webkit-box-orient: vertical; | 1118 | -webkit-box-orient: vertical; |
1119 | -webkit-box-align: stretch; | 1119 | -webkit-box-align: stretch; |
1120 | position:relative; | 1120 | position:relative; |
1121 | overflow: auto; | ||
1122 | height:200px; | ||
1123 | |||
1124 | } | 1121 | } |
1122 | |||
1125 | .panel .panelBodyContent { | 1123 | .panel .panelBodyContent { |
1126 | -webkit-box-sizing: border-box; | 1124 | -webkit-box-sizing: border-box; |
1127 | -webkit-box-align:stretch; | 1125 | -webkit-box-align:stretch; |