diff options
author | Jose Antonio Marquez | 2012-06-26 13:59:40 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-26 13:59:40 -0700 |
commit | 0a36060df9b25db22aa744582946069a92d62206 (patch) | |
tree | 7cd71754cf14e0a35ad6ff630483da5f47403fe5 /scss | |
parent | 39ce688e26d3c3607f926cfac7b1f3d35bdde882 (diff) | |
parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
download | ninja-0a36060df9b25db22aa744582946069a92d62206.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Color
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; |