From 3730315388f7483f20fb0c4c37af5918b65e55d4 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 9 Dec 2015 10:11:44 -0800 Subject: [PATCH] [Frontend] Fixed hidden Create menu regression error open #199 open #278 --- .../res/sass/user-environ/_layout.scss | 5 +- .../espresso/res/css/theme-espresso.css | 73 +++++++++---------- .../themes/snow/res/css/theme-snow.css | 73 +++++++++---------- 3 files changed, 69 insertions(+), 82 deletions(-) diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 8c22204943..ace697e47a 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -198,11 +198,8 @@ bottom: $bodyMargin; left: $bodyMargin; .create-btn-holder { - height: auto; - overflow: hidden; &.s-status-editing { - height: 0; - margin:0; + display: none; & + .search-holder .search-bar { // .search-holder is adjacent sibling to .create-btn-holder // Add right margin when create button is hidden, to make room for the collapse pane 'x' button diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 50976a96a5..3b7d6d71e5 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -4844,41 +4844,36 @@ span.req { right: 0; bottom: 10px; left: 10px; } - /* line 200, ../../../../general/res/sass/user-environ/_layout.scss */ - .split-layout .holder.holder-treeview-elements .create-btn-holder { - height: auto; - overflow: hidden; } + /* line 201, ../../../../general/res/sass/user-environ/_layout.scss */ + .split-layout .holder.holder-treeview-elements .create-btn-holder.s-status-editing { + display: none; } /* line 203, ../../../../general/res/sass/user-environ/_layout.scss */ - .split-layout .holder.holder-treeview-elements .create-btn-holder.s-status-editing { - height: 0; - margin: 0; } - /* line 206, ../../../../general/res/sass/user-environ/_layout.scss */ - .split-layout .holder.holder-treeview-elements .create-btn-holder.s-status-editing + .search-holder .search-bar { - margin-right: 20px; } -/* line 215, ../../../../general/res/sass/user-environ/_layout.scss */ + .split-layout .holder.holder-treeview-elements .create-btn-holder.s-status-editing + .search-holder .search-bar { + margin-right: 20px; } +/* line 212, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector { top: 0; right: 0; bottom: 0; left: 0; } - /* line 220, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 217, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector .holder-object { top: 10px; bottom: 10px; } - /* line 224, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 221, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector .holder-inspector { top: 10px; bottom: 10px; left: 10px; right: 10px; } - /* line 230, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 227, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector .holder-elements { top: 0; bottom: 10px; left: 10px; right: 10px; } -/* line 239, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 236, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: auto; position: absolute; @@ -4890,7 +4885,7 @@ span.req { height: auto; top: 34px; } -/* line 251, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 248, ../../../../general/res/sass/user-environ/_layout.scss */ .l-object-wrapper.active { -moz-animation-name: pulseBorder; -webkit-animation-name: pulseBorder; @@ -4932,7 +4927,7 @@ span.req { border-color: rgba(88, 122, 181, 0.3); } 100% { border-color: #587ab5; } } - /* line 258, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 255, ../../../../general/res/sass/user-environ/_layout.scss */ .l-object-wrapper.active .l-object-wrapper-inner { overflow: hidden; position: absolute; @@ -4943,7 +4938,7 @@ span.req { width: auto; height: auto; } -/* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 261, ../../../../general/res/sass/user-environ/_layout.scss */ .l-object-wrapper-inner { -moz-transition-property: height, width, top, right, bottom, left, opacity; -o-transition-property: height, width, top, right, bottom, left, opacity; @@ -4958,7 +4953,7 @@ span.req { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; } -/* line 268, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 265, ../../../../general/res/sass/user-environ/_layout.scss */ .l-edit-controls { -moz-transition-property: opacity, height; -o-transition-property: opacity, height; @@ -4980,16 +4975,16 @@ span.req { line-height: 25px; height: 0px; opacity: 0; } - /* line 274, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 271, ../../../../general/res/sass/user-environ/_layout.scss */ .l-edit-controls.active { height: 30px; margin-bottom: 5px; opacity: 1; } - /* line 279, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 276, ../../../../general/res/sass/user-environ/_layout.scss */ .l-edit-controls .tool-bar { right: 5px; } -/* line 284, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 281, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .s-btn, .object-browse-bar .s-menu-btn, .top-bar .buttons-main .s-btn, .top-bar .buttons-main .s-menu-btn, @@ -5001,13 +4996,13 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 297, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 294, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } /***************************************************** OBJECT BROWSE BAR */ -/* line 303, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 300, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -5015,20 +5010,20 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 310, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 307, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 10px; } - /* line 312, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 309, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back:not(.s-status-editing) { margin-right: 10px; } -/* line 321, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 318, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .tree-holder, .pane-tree-hidden .splitter-treeview, .pane-tree-hidden .holder-treeview-elements { opacity: 0; } -/* line 330, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 327, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-showing .tree-holder, .pane-tree-showing .splitter-treeview { -moz-transition-property: opacity; @@ -5048,7 +5043,7 @@ span.req { -webkit-transition-delay: 250ms; transition-delay: 250ms; opacity: 1; } -/* line 336, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 333, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-showing .holder-treeview-elements { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -5067,7 +5062,7 @@ span.req { -webkit-transition-delay: 200ms; transition-delay: 200ms; } -/* line 343, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 340, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-showing .l-object-and-inspector .l-inspect, .pane-inspect-showing .l-object-and-inspector .splitter-inspect { -moz-transition-property: opacity; @@ -5088,41 +5083,41 @@ span.req { transition-delay: 250ms; opacity: 1; } -/* line 353, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 350, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-hidden .l-object-and-inspector .l-inspect, .pane-inspect-hidden .l-object-and-inspector .splitter-inspect { opacity: 0; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 361, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 358, ../../../../general/res/sass/user-environ/_layout.scss */ .holder-all { min-width: 600px; } - /* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 363, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .split-pane-component.pane.treeview.left { min-width: 150px; max-width: 35%; width: 25%; } - /* line 371, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 368, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .split-pane-component.pane.t-inspect.right { min-width: 200px; max-width: 35%; width: 20%; z-index: 3; } - /* line 379, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 376, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .tree-holder { padding-right: 5px; } - /* line 383, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 380, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .pane.right.primary-pane { left: 22px !important; } - /* line 386, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 383, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-hidden .l-object-and-inspector .pane.left { right: 22px !important; } - /* line 388, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 385, ../../../../general/res/sass/user-environ/_layout.scss */ .pane:not(.resizing) { -moz-transition-property: width, left, right; -o-transition-property: width, left, right; @@ -5141,7 +5136,7 @@ span.req { -webkit-transition-delay: 0; transition-delay: 0; } - /* line 391, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 388, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.primary-pane .object-browse-bar { min-width: 200px; } } /***************************************************************************** diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 005a8684fe..65635223a6 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -4766,41 +4766,36 @@ span.req { right: 0; bottom: 10px; left: 10px; } - /* line 200, ../../../../general/res/sass/user-environ/_layout.scss */ - .split-layout .holder.holder-treeview-elements .create-btn-holder { - height: auto; - overflow: hidden; } + /* line 201, ../../../../general/res/sass/user-environ/_layout.scss */ + .split-layout .holder.holder-treeview-elements .create-btn-holder.s-status-editing { + display: none; } /* line 203, ../../../../general/res/sass/user-environ/_layout.scss */ - .split-layout .holder.holder-treeview-elements .create-btn-holder.s-status-editing { - height: 0; - margin: 0; } - /* line 206, ../../../../general/res/sass/user-environ/_layout.scss */ - .split-layout .holder.holder-treeview-elements .create-btn-holder.s-status-editing + .search-holder .search-bar { - margin-right: 20px; } -/* line 215, ../../../../general/res/sass/user-environ/_layout.scss */ + .split-layout .holder.holder-treeview-elements .create-btn-holder.s-status-editing + .search-holder .search-bar { + margin-right: 20px; } +/* line 212, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector { top: 0; right: 0; bottom: 0; left: 0; } - /* line 220, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 217, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector .holder-object { top: 10px; bottom: 10px; } - /* line 224, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 221, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector .holder-inspector { top: 10px; bottom: 10px; left: 10px; right: 10px; } - /* line 230, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 227, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .holder.holder-object-and-inspector .holder-elements { top: 0; bottom: 10px; left: 10px; right: 10px; } -/* line 239, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 236, ../../../../general/res/sass/user-environ/_layout.scss */ .object-holder { overflow: auto; position: absolute; @@ -4812,7 +4807,7 @@ span.req { height: auto; top: 34px; } -/* line 251, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 248, ../../../../general/res/sass/user-environ/_layout.scss */ .l-object-wrapper.active { -moz-animation-name: pulseBorder; -webkit-animation-name: pulseBorder; @@ -4854,7 +4849,7 @@ span.req { border-color: rgba(75, 177, 199, 0.3); } 100% { border-color: #4bb1c7; } } - /* line 258, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 255, ../../../../general/res/sass/user-environ/_layout.scss */ .l-object-wrapper.active .l-object-wrapper-inner { overflow: hidden; position: absolute; @@ -4865,7 +4860,7 @@ span.req { width: auto; height: auto; } -/* line 264, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 261, ../../../../general/res/sass/user-environ/_layout.scss */ .l-object-wrapper-inner { -moz-transition-property: height, width, top, right, bottom, left, opacity; -o-transition-property: height, width, top, right, bottom, left, opacity; @@ -4880,7 +4875,7 @@ span.req { -webkit-transition-timing-function: ease-in-out; transition-timing-function: ease-in-out; } -/* line 268, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 265, ../../../../general/res/sass/user-environ/_layout.scss */ .l-edit-controls { -moz-transition-property: opacity, height; -o-transition-property: opacity, height; @@ -4902,16 +4897,16 @@ span.req { line-height: 25px; height: 0px; opacity: 0; } - /* line 274, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 271, ../../../../general/res/sass/user-environ/_layout.scss */ .l-edit-controls.active { height: 30px; margin-bottom: 5px; opacity: 1; } - /* line 279, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 276, ../../../../general/res/sass/user-environ/_layout.scss */ .l-edit-controls .tool-bar { right: 5px; } -/* line 284, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 281, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .s-btn, .object-browse-bar .s-menu-btn, .top-bar .buttons-main .s-btn, .top-bar .buttons-main .s-menu-btn, @@ -4923,13 +4918,13 @@ span.req { line-height: 25px; vertical-align: top; } -/* line 297, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 294, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } /***************************************************** OBJECT BROWSE BAR */ -/* line 303, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 300, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -4937,20 +4932,20 @@ span.req { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 310, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 307, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 10px; } - /* line 312, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 309, ../../../../general/res/sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back:not(.s-status-editing) { margin-right: 10px; } -/* line 321, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 318, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .tree-holder, .pane-tree-hidden .splitter-treeview, .pane-tree-hidden .holder-treeview-elements { opacity: 0; } -/* line 330, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 327, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-showing .tree-holder, .pane-tree-showing .splitter-treeview { -moz-transition-property: opacity; @@ -4970,7 +4965,7 @@ span.req { -webkit-transition-delay: 250ms; transition-delay: 250ms; opacity: 1; } -/* line 336, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 333, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-showing .holder-treeview-elements { -moz-transition-property: opacity; -o-transition-property: opacity; @@ -4989,7 +4984,7 @@ span.req { -webkit-transition-delay: 200ms; transition-delay: 200ms; } -/* line 343, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 340, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-showing .l-object-and-inspector .l-inspect, .pane-inspect-showing .l-object-and-inspector .splitter-inspect { -moz-transition-property: opacity; @@ -5010,41 +5005,41 @@ span.req { transition-delay: 250ms; opacity: 1; } -/* line 353, ../../../../general/res/sass/user-environ/_layout.scss */ +/* line 350, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-hidden .l-object-and-inspector .l-inspect, .pane-inspect-hidden .l-object-and-inspector .splitter-inspect { opacity: 0; } @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { - /* line 361, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 358, ../../../../general/res/sass/user-environ/_layout.scss */ .holder-all { min-width: 600px; } - /* line 366, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 363, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .split-pane-component.pane.treeview.left { min-width: 150px; max-width: 35%; width: 25%; } - /* line 371, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 368, ../../../../general/res/sass/user-environ/_layout.scss */ .split-layout .split-pane-component.pane.t-inspect.right { min-width: 200px; max-width: 35%; width: 20%; z-index: 3; } - /* line 379, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 376, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.treeview.left .tree-holder { padding-right: 5px; } - /* line 383, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 380, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-tree-hidden .pane.right.primary-pane { left: 22px !important; } - /* line 386, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 383, ../../../../general/res/sass/user-environ/_layout.scss */ .pane-inspect-hidden .l-object-and-inspector .pane.left { right: 22px !important; } - /* line 388, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 385, ../../../../general/res/sass/user-environ/_layout.scss */ .pane:not(.resizing) { -moz-transition-property: width, left, right; -o-transition-property: width, left, right; @@ -5063,7 +5058,7 @@ span.req { -webkit-transition-delay: 0; transition-delay: 0; } - /* line 391, ../../../../general/res/sass/user-environ/_layout.scss */ + /* line 388, ../../../../general/res/sass/user-environ/_layout.scss */ .pane.primary-pane .object-browse-bar { min-width: 200px; } } /*****************************************************************************