diff options
author | Valerio Virgillito | 2012-06-26 13:49:41 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-26 13:49:41 -0700 |
commit | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (patch) | |
tree | 94d88ca1422064af0e336eba3c175efcffc2d1f1 | |
parent | 87a8b62f71bb72274c3dd1fa389e88c12d482ebb (diff) | |
parent | 30e2d18e2d0615153947c4118fa1f038c0bd2d4b (diff) | |
download | ninja-46174eb0ce93d660c8d2e9276fbdc4f9a03f056a.tar.gz |
Merge pull request #340 from mencio/panel-cleanup-scroll
Panel cleanup scroll
-rwxr-xr-x | css/ninja.css | 2 | ||||
-rwxr-xr-x | scss/imports/scss/_PanelUI.scss | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/css/ninja.css b/css/ninja.css index 212cf831..b71ab79c 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -600,7 +600,7 @@ button.panel-button { -webkit-appearance: none; font-size: 9px; color: white; ba | |||
600 | 600 | ||
601 | .panels .panel { min-height: 25px; -webkit-box-flex: 0; display: -webkit-box; -webkit-box-orient: vertical; background: #282828; height: 200px; padding: 0px 2px; -webkit-box-sizing: border-box; } | 601 | .panels .panel { min-height: 25px; -webkit-box-flex: 0; display: -webkit-box; -webkit-box-orient: vertical; background: #282828; height: 200px; padding: 0px 2px; -webkit-box-sizing: border-box; } |
602 | 602 | ||
603 | .panels .panel .panelBody { -webkit-box-flex: 1; -webkit-box-sizing: border-box; -webkit-box-orient: vertical; -webkit-box-align: stretch; position: relative; overflow: auto; height: 200px; } | 603 | .panels .panel .panelBody { -webkit-box-flex: 1; -webkit-box-sizing: border-box; -webkit-box-orient: vertical; -webkit-box-align: stretch; position: relative; } |
604 | 604 | ||
605 | .panel .panelBodyContent { -webkit-box-sizing: border-box; -webkit-box-align: stretch; position: absolute; height: 100%; width: 100%; } | 605 | .panel .panelBodyContent { -webkit-box-sizing: border-box; -webkit-box-align: stretch; position: absolute; height: 100%; width: 100%; } |
606 | 606 | ||
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; |