From 42d78d11764dca5df6c7d01f3221f398bee17152 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 1 Mar 2012 15:00:48 -0800 Subject: Squashed commit of the workspace-bugs - Panels fixes. Signed-off-by: Valerio Virgillito --- scss/imports/scss/_PanelUI.scss | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'scss') 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 @@ // Note that colors and font definitions go in // _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss -// layout for the container of all panels within a dock area -.panelContainer { - margin: 0px; - padding: 0px 0px; - position:relative; - // this is here to hopefully show vertical scroll bars when the panels exceed the height of the panel - // unfortunately it doesn't seem to work properly. this is probably due to some of our box styling or positioning - overflow: auto; -} +// layout for the container of all panels within a dock area // base layout style for all panels .panelDisclosureIcon @@ -1114,6 +1106,7 @@ button.panel-button { -webkit-box-align: stretch; height:100%; width:100%; + overflow: hidden; } .panel .resizeBar { height:4px; @@ -1125,7 +1118,7 @@ button.panel-button { -webkit-box-flex:0; display: -webkit-box; -webkit-box-orient: vertical; - //taking out transitions due to glitching ui -webkit-transition: 0.2s all linear; + //-webkit-transition: all 100ms ease-out; background:#282828; height:200px; padding:0px 2px; @@ -1138,7 +1131,6 @@ button.panel-button { -webkit-box-orient: vertical; -webkit-box-align: stretch; position:relative; - resize: vertical; overflow: auto; height:200px; @@ -1191,6 +1183,7 @@ button.panel-button { width:25px; opacity: 0.4; cursor: pointer; + display:none; } .panel .head .closeBtn:hover { @@ -1200,7 +1193,6 @@ button.panel-button { .panel .panelBody { border-right: 1px solid #3a3a3a; border-bottom: 1px solid #3a3a3a; - -webkit-transition: all 0.1s linear; overflow: hidden; } .panel .panelBodyContent { @@ -1229,6 +1221,11 @@ button.panel-button { height:0px; } +.rightPanelContainer { +-webkit-box-orient: vertical; +display: -webkit-box; +} + #rightPanelContainer .panel.collapsed { height:26px !important; min-height:26px !important; @@ -1241,7 +1238,7 @@ button.panel-button { -webkit-transform:rotate(-90deg); } -#rightPanelContent { +.rightPanelContent { position:absolute; height:100%; width:100%; @@ -1251,6 +1248,11 @@ button.panel-button { } -.over { - border-top:1px solid #0000FF; +/* Drag & Drop Code TODO: Most likely need to be somewhere else */ +body section .dragging { + opacity: 0.4; } +body .main .dragOver:not(.dragging) { + background-color: #917B56; +} + -- cgit v1.2.3 From 84931583f1da8da29784074978f146b281b8efa3 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Wed, 7 Mar 2012 16:08:36 -0800 Subject: Disabled state for panels Signed-off-by: Armen Kesablyan --- scss/imports/scss/_PanelUI.scss | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'scss') diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss index b25871b0..2ac88b1d 100755 --- a/scss/imports/scss/_PanelUI.scss +++ b/scss/imports/scss/_PanelUI.scss @@ -1256,3 +1256,17 @@ body .main .dragOver:not(.dragging) { background-color: #917B56; } +.panelDisabled { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 9999; + color: white; + text-align: center; + line-height: 100px; + box-shadow: inset 0 0 14px #111111; + + background: rgba(30, 30, 30, 0.7); +} \ No newline at end of file -- cgit v1.2.3 From 21cb7af351e738f446458af5b896c84e03fa5c17 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Thu, 8 Mar 2012 12:05:43 -0800 Subject: Z-Index issue of disabled state with file open dialog Signed-off-by: Armen Kesablyan --- scss/imports/scss/_PanelUI.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss index 2ac88b1d..91a46c76 100755 --- a/scss/imports/scss/_PanelUI.scss +++ b/scss/imports/scss/_PanelUI.scss @@ -1262,7 +1262,7 @@ body .main .dragOver:not(.dragging) { left: 0; width: 100%; height: 100%; - z-index: 9999; + z-index: 6000; color: white; text-align: center; line-height: 100px; -- cgit v1.2.3 From caa08250663007bea76faf555f166b42cf4c76fb Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Thu, 8 Mar 2012 12:09:13 -0800 Subject: Disabled State is now darker Signed-off-by: Armen Kesablyan --- scss/imports/scss/_PanelUI.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss index 91a46c76..f76d3e20 100755 --- a/scss/imports/scss/_PanelUI.scss +++ b/scss/imports/scss/_PanelUI.scss @@ -1268,5 +1268,5 @@ body .main .dragOver:not(.dragging) { line-height: 100px; box-shadow: inset 0 0 14px #111111; - background: rgba(30, 30, 30, 0.7); + background: rgba(30, 30, 30, 0.8); } \ No newline at end of file -- cgit v1.2.3