diff options
author | Valerio Virgillito | 2012-03-01 15:00:48 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-03-01 15:00:48 -0800 |
commit | 42d78d11764dca5df6c7d01f3221f398bee17152 (patch) | |
tree | e5c4ed2529de34ee1fae5da622563c78aa8b0ff7 /scss | |
parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
download | ninja-42d78d11764dca5df6c7d01f3221f398bee17152.tar.gz |
Squashed commit of the workspace-bugs
- Panels fixes.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'scss')
-rwxr-xr-x | scss/imports/scss/_PanelUI.scss | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss index bccea6fc..b25871b0 100755 --- a/scss/imports/scss/_PanelUI.scss +++ b/scss/imports/scss/_PanelUI.scss | |||
@@ -10,15 +10,7 @@ | |||
10 | // Note that colors and font definitions go in | 10 | // Note that colors and font definitions go in |
11 | // _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss | 11 | // _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss |
12 | 12 | ||
13 | // layout for the container of all panels within a dock area | 13 | // layout for the container of all panels within a dock area |
14 | .panelContainer { | ||
15 | margin: 0px; | ||
16 | padding: 0px 0px; | ||
17 | position:relative; | ||
18 | // this is here to hopefully show vertical scroll bars when the panels exceed the height of the panel | ||
19 | // unfortunately it doesn't seem to work properly. this is probably due to some of our box styling or positioning | ||
20 | overflow: auto; | ||
21 | } | ||
22 | 14 | ||
23 | // base layout style for all panels | 15 | // base layout style for all panels |
24 | .panelDisclosureIcon | 16 | .panelDisclosureIcon |
@@ -1114,6 +1106,7 @@ button.panel-button { | |||
1114 | -webkit-box-align: stretch; | 1106 | -webkit-box-align: stretch; |
1115 | height:100%; | 1107 | height:100%; |
1116 | width:100%; | 1108 | width:100%; |
1109 | overflow: hidden; | ||
1117 | } | 1110 | } |
1118 | .panel .resizeBar { | 1111 | .panel .resizeBar { |
1119 | height:4px; | 1112 | height:4px; |
@@ -1125,7 +1118,7 @@ button.panel-button { | |||
1125 | -webkit-box-flex:0; | 1118 | -webkit-box-flex:0; |
1126 | display: -webkit-box; | 1119 | display: -webkit-box; |
1127 | -webkit-box-orient: vertical; | 1120 | -webkit-box-orient: vertical; |
1128 | //taking out transitions due to glitching ui -webkit-transition: 0.2s all linear; | 1121 | //-webkit-transition: all 100ms ease-out; |
1129 | background:#282828; | 1122 | background:#282828; |
1130 | height:200px; | 1123 | height:200px; |
1131 | padding:0px 2px; | 1124 | padding:0px 2px; |
@@ -1138,7 +1131,6 @@ button.panel-button { | |||
1138 | -webkit-box-orient: vertical; | 1131 | -webkit-box-orient: vertical; |
1139 | -webkit-box-align: stretch; | 1132 | -webkit-box-align: stretch; |
1140 | position:relative; | 1133 | position:relative; |
1141 | resize: vertical; | ||
1142 | overflow: auto; | 1134 | overflow: auto; |
1143 | height:200px; | 1135 | height:200px; |
1144 | 1136 | ||
@@ -1191,6 +1183,7 @@ button.panel-button { | |||
1191 | width:25px; | 1183 | width:25px; |
1192 | opacity: 0.4; | 1184 | opacity: 0.4; |
1193 | cursor: pointer; | 1185 | cursor: pointer; |
1186 | display:none; | ||
1194 | } | 1187 | } |
1195 | 1188 | ||
1196 | .panel .head .closeBtn:hover { | 1189 | .panel .head .closeBtn:hover { |
@@ -1200,7 +1193,6 @@ button.panel-button { | |||
1200 | .panel .panelBody { | 1193 | .panel .panelBody { |
1201 | border-right: 1px solid #3a3a3a; | 1194 | border-right: 1px solid #3a3a3a; |
1202 | border-bottom: 1px solid #3a3a3a; | 1195 | border-bottom: 1px solid #3a3a3a; |
1203 | -webkit-transition: all 0.1s linear; | ||
1204 | overflow: hidden; | 1196 | overflow: hidden; |
1205 | } | 1197 | } |
1206 | .panel .panelBodyContent { | 1198 | .panel .panelBodyContent { |
@@ -1229,6 +1221,11 @@ button.panel-button { | |||
1229 | height:0px; | 1221 | height:0px; |
1230 | } | 1222 | } |
1231 | 1223 | ||
1224 | .rightPanelContainer { | ||
1225 | -webkit-box-orient: vertical; | ||
1226 | display: -webkit-box; | ||
1227 | } | ||
1228 | |||
1232 | #rightPanelContainer .panel.collapsed { | 1229 | #rightPanelContainer .panel.collapsed { |
1233 | height:26px !important; | 1230 | height:26px !important; |
1234 | min-height:26px !important; | 1231 | min-height:26px !important; |
@@ -1241,7 +1238,7 @@ button.panel-button { | |||
1241 | -webkit-transform:rotate(-90deg); | 1238 | -webkit-transform:rotate(-90deg); |
1242 | } | 1239 | } |
1243 | 1240 | ||
1244 | #rightPanelContent { | 1241 | .rightPanelContent { |
1245 | position:absolute; | 1242 | position:absolute; |
1246 | height:100%; | 1243 | height:100%; |
1247 | width:100%; | 1244 | width:100%; |
@@ -1251,6 +1248,11 @@ button.panel-button { | |||
1251 | } | 1248 | } |
1252 | 1249 | ||
1253 | 1250 | ||
1254 | .over { | 1251 | /* Drag & Drop Code TODO: Most likely need to be somewhere else */ |
1255 | border-top:1px solid #0000FF; | 1252 | body section .dragging { |
1253 | opacity: 0.4; | ||
1256 | } | 1254 | } |
1255 | body .main .dragOver:not(.dragging) { | ||
1256 | background-color: #917B56; | ||
1257 | } | ||
1258 | |||