diff options
author | Valerio Virgillito | 2012-06-27 10:58:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-27 10:58:44 -0700 |
commit | 913f5cdce07072e7ba6ba8063a3bd19e7eb00a46 (patch) | |
tree | 57e0d06f786d57946c11ab881faeef4d9b9a6f78 /scss | |
parent | d8bb1bf1537166753a53000e31ece8f99c7daaaa (diff) | |
parent | 2ebf3e3ea24d0d580575dfa13d31588dac1de445 (diff) | |
download | ninja-913f5cdce07072e7ba6ba8063a3bd19e7eb00a46.tar.gz |
Merge branch 'refs/heads/master' into google-components-fixes
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; |