diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html
index 54ccbae8a7..60b51ccfac 100644
--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@@ -1,6 +1,6 @@
-
+
-
.contents,
+.user-environ .edit-area > .contents {
+ left: 0;
+ right: 0; }
+/* line 93, ../sass/user-environ/_layout.scss */
+.user-environ .edit-area .tool-bar {
+ bottom: auto;
+ height: 35px;
+ line-height: 28px; }
+/* line 98, ../sass/user-environ/_layout.scss */
+.user-environ .edit-area .work-area {
+ top: 45px; }
+/* line 103, ../sass/user-environ/_layout.scss */
+.user-environ .bottom-bar {
+ top: auto;
+ right: 5px;
+ bottom: 5px;
+ left: 5px;
+ height: 20px; }
+ /* line 109, ../sass/user-environ/_layout.scss */
+ .user-environ .bottom-bar .status-holder {
+ right: 110px; }
+ /* line 112, ../sass/user-environ/_layout.scss */
+ .user-environ .bottom-bar .app-logo {
+ left: auto;
+ width: 105px; }
+
+/* line 119, ../sass/user-environ/_layout.scss */
.cols {
overflow: hidden;
*zoom: 1; }
- /* line 106, ../sass/user-environ/_layout.scss */
+ /* line 121, ../sass/user-environ/_layout.scss */
.cols .col {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
@@ -301,89 +316,89 @@ span {
margin-left: 1.5%;
padding-left: 5px;
position: relative; }
- /* line 114, ../sass/user-environ/_layout.scss */
+ /* line 129, ../sass/user-environ/_layout.scss */
.cols .col:first-child {
margin-left: 0;
padding-left: 0; }
- /* line 121, ../sass/user-environ/_layout.scss */
+ /* line 136, ../sass/user-environ/_layout.scss */
.cols.cols-2 .col-1 {
min-width: 250px;
width: 48.5%; }
- /* line 127, ../sass/user-environ/_layout.scss */
+ /* line 142, ../sass/user-environ/_layout.scss */
.cols.cols-2-ff .col-100px {
width: 100px; }
- /* line 134, ../sass/user-environ/_layout.scss */
+ /* line 149, ../sass/user-environ/_layout.scss */
.cols.cols-6 .col-1 {
min-width: 83.33333px;
width: 15.16667%; }
- /* line 140, ../sass/user-environ/_layout.scss */
+ /* line 155, ../sass/user-environ/_layout.scss */
.cols.cols-16 .col-1 {
min-width: 31.25px;
width: 4.75%; }
- /* line 143, ../sass/user-environ/_layout.scss */
+ /* line 158, ../sass/user-environ/_layout.scss */
.cols.cols-16 .col-2 {
min-width: 62.5px;
width: 11%; }
- /* line 146, ../sass/user-environ/_layout.scss */
+ /* line 161, ../sass/user-environ/_layout.scss */
.cols.cols-16 .col-7 {
min-width: 218.75px;
width: 42.25%; }
- /* line 152, ../sass/user-environ/_layout.scss */
+ /* line 167, ../sass/user-environ/_layout.scss */
.cols.cols-32 .col-2 {
min-width: 31.25px;
width: 4.75%; }
- /* line 155, ../sass/user-environ/_layout.scss */
+ /* line 170, ../sass/user-environ/_layout.scss */
.cols.cols-32 .col-15 {
min-width: 234.375px;
width: 45.375%; }
- /* line 159, ../sass/user-environ/_layout.scss */
+ /* line 174, ../sass/user-environ/_layout.scss */
.cols .l-row {
overflow: hidden;
*zoom: 1;
padding: 5px 0; }
-/* line 165, ../sass/user-environ/_layout.scss */
+/* line 180, ../sass/user-environ/_layout.scss */
.pane {
position: absolute; }
- /* line 168, ../sass/user-environ/_layout.scss */
+ /* line 183, ../sass/user-environ/_layout.scss */
.pane.treeview .create-btn-holder {
bottom: auto;
height: 35px; }
- /* line 171, ../sass/user-environ/_layout.scss */
+ /* line 186, ../sass/user-environ/_layout.scss */
.pane.treeview .tree-holder {
overflow: auto;
top: 40px; }
- /* line 180, ../sass/user-environ/_layout.scss */
+ /* line 195, ../sass/user-environ/_layout.scss */
.pane.items .object-holder {
top: 40px; }
- /* line 185, ../sass/user-environ/_layout.scss */
+ /* line 200, ../sass/user-environ/_layout.scss */
.pane.edit-main .object-holder {
top: 0; }
- /* line 191, ../sass/user-environ/_layout.scss */
+ /* line 206, ../sass/user-environ/_layout.scss */
.pane .object-holder {
overflow: auto; }
-/* line 199, ../sass/user-environ/_layout.scss */
+/* line 214, ../sass/user-environ/_layout.scss */
.split-layout.horizontal > .pane {
margin-top: 5px; }
- /* line 202, ../sass/user-environ/_layout.scss */
+ /* line 217, ../sass/user-environ/_layout.scss */
.split-layout.horizontal > .pane:first-child {
margin-top: 0; }
-/* line 209, ../sass/user-environ/_layout.scss */
+/* line 224, ../sass/user-environ/_layout.scss */
.split-layout.vertical > .pane {
margin-left: 5px; }
- /* line 211, ../sass/user-environ/_layout.scss */
+ /* line 226, ../sass/user-environ/_layout.scss */
.split-layout.vertical > .pane > .holder {
left: 0;
right: 0; }
- /* line 215, ../sass/user-environ/_layout.scss */
+ /* line 230, ../sass/user-environ/_layout.scss */
.split-layout.vertical > .pane:first-child {
margin-left: 0; }
- /* line 217, ../sass/user-environ/_layout.scss */
+ /* line 232, ../sass/user-environ/_layout.scss */
.split-layout.vertical > .pane:first-child .holder {
right: 5px; }
-/* line 226, ../sass/user-environ/_layout.scss */
+/* line 241, ../sass/user-environ/_layout.scss */
.vscroll {
overflow-y: auto; }
@@ -2573,6 +2588,10 @@ input[type="text"] {
margin-left: 10px; }
/* line 53, ../sass/overlay/_overlay.scss */
.overlay .contents.l-dialog {
+ top: 5px;
+ right: 5px;
+ bottom: 5px;
+ left: 5px;
overflow: auto; }
/* line 4, ../sass/user-environ/_frame.scss */
@@ -2589,8 +2608,14 @@ input[type="text"] {
/* line 18, ../sass/user-environ/_frame.scss */
.frame > .object-holder.abs, .btn-menu .frame > span.object-holder.l-click-area {
top: 23px; }
+/* line 21, ../sass/user-environ/_frame.scss */
+.frame .contents {
+ top: 5px;
+ right: 5px;
+ bottom: 5px;
+ left: 5px; }
-/* line 24, ../sass/user-environ/_frame.scss */
+/* line 31, ../sass/user-environ/_frame.scss */
.edit-main .frame.child-frame.panel:hover {
border-color: #0099cc;
-webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
@@ -2602,27 +2627,28 @@ input[type="text"] {
line-height: 35px; }
/* line 7, ../sass/user-environ/_top-bar.scss */
.top-bar.browse, .top-bar.edit {
+ border-bottom: 1px solid #4d4d4d;
top: 5px;
right: 5px;
bottom: auto;
left: 5px;
height: 35px; }
- /* line 15, ../sass/user-environ/_top-bar.scss */
+ /* line 16, ../sass/user-environ/_top-bar.scss */
.top-bar .title {
color: #fff; }
- /* line 20, ../sass/user-environ/_top-bar.scss */
+ /* line 21, ../sass/user-environ/_top-bar.scss */
.top-bar .buttons-main {
font-size: 0.8em;
left: auto;
text-align: right; }
- /* line 25, ../sass/user-environ/_top-bar.scss */
+ /* line 26, ../sass/user-environ/_top-bar.scss */
.top-bar .buttons-main .btn {
margin-left: 5px; }
-/* line 33, ../sass/user-environ/_top-bar.scss */
+/* line 34, ../sass/user-environ/_top-bar.scss */
.edit-mode .top-bar .buttons-main {
white-space: nowrap; }
- /* line 37, ../sass/user-environ/_top-bar.scss */
+ /* line 38, ../sass/user-environ/_top-bar.scss */
.edit-mode .top-bar .buttons-main.abs, .edit-mode .top-bar .btn-menu span.buttons-main.l-click-area, .btn-menu .edit-mode .top-bar span.buttons-main.l-click-area {
bottom: auto;
left: auto; }
@@ -2882,10 +2908,10 @@ input[type="text"] {
.wait-spinner {
display: block;
position: absolute;
- -webkit-animation: rotation .6s infinite linear;
- -moz-animation: rotation .6s infinite linear;
- -o-animation: rotation .6s infinite linear;
- animation: rotation .6s infinite linear;
+ -webkit-animation: rotation 0.6s infinite linear;
+ -moz-animation: rotation 0.6s infinite linear;
+ -o-animation: rotation 0.6s infinite linear;
+ animation: rotation 0.6s infinite linear;
border-color: rgba(0, 153, 204, 0.25);
border-top-color: #0099cc;
border-style: solid;
@@ -2924,10 +2950,10 @@ input[type="text"] {
.treeview .wait-spinner {
display: block;
position: absolute;
- -webkit-animation: rotation .6s infinite linear;
- -moz-animation: rotation .6s infinite linear;
- -o-animation: rotation .6s infinite linear;
- animation: rotation .6s infinite linear;
+ -webkit-animation: rotation 0.6s infinite linear;
+ -moz-animation: rotation 0.6s infinite linear;
+ -o-animation: rotation 0.6s infinite linear;
+ animation: rotation 0.6s infinite linear;
border-color: rgba(0, 153, 204, 0.25);
border-top-color: #0099cc;
border-style: solid;
@@ -3041,8 +3067,19 @@ input[type="text"] {
padding-left: 0; }
/* Styles for the iframe EmbeddedPageController element */
-/* line 4, ../sass/iframe.scss */
+/* line 4, ../sass/_iframe.scss */
.l-iframe iframe {
display: block;
height: 100%;
width: 100%; }
+
+/******************************** BROWSE */
+/* line 6, ../sass/_hide-non-functional.scss */
+.browse-mode .browse.top-bar {
+ display: none; }
+/* line 11, ../sass/_hide-non-functional.scss */
+.browse-mode .browse-area.holder {
+ top: 5px; }
+ /* line 18, ../sass/_hide-non-functional.scss */
+ .browse-mode .browse-area.holder > .contents.split-layout .object-browse-bar .t-btn.key-window {
+ display: none; }
diff --git a/platform/commonUI/general/res/sass/_hide-non-functional.scss b/platform/commonUI/general/res/sass/_hide-non-functional.scss
new file mode 100644
index 0000000000..2361480712
--- /dev/null
+++ b/platform/commonUI/general/res/sass/_hide-non-functional.scss
@@ -0,0 +1,25 @@
+// Styles to temporarily hide non-functional elements
+
+/******************************** BROWSE */
+.browse-mode {
+ .browse {
+ &.top-bar {
+ display: none;
+ }
+ }
+
+ .browse-area.holder {
+ // When .browse.top-bar is hidden, set the top of the browse-area holder
+ top: $interiorMargin;
+ > .contents.split-layout {
+ // Don't pad in from top and bottom
+ //top: 0; bottom: 0;
+ .object-browse-bar {
+ .t-btn.key-window {
+ // Hide the Open in New Window button
+ display: none;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss
index 99bf5b6322..f4dac4f816 100755
--- a/platform/commonUI/general/res/sass/_main.scss
+++ b/platform/commonUI/general/res/sass/_main.scss
@@ -41,3 +41,4 @@
@import "properties";
@import "autoflow";
@import "iframe";
+@import "hide-non-functional";
diff --git a/platform/commonUI/general/res/sass/items/_item.scss b/platform/commonUI/general/res/sass/items/_item.scss
index e585450e39..162e7fe496 100644
--- a/platform/commonUI/general/res/sass/items/_item.scss
+++ b/platform/commonUI/general/res/sass/items/_item.scss
@@ -1,7 +1,9 @@
.items-holder {
@include clearfix;
overflow-y: auto;
- .contents { top: 0; }
+ .contents {
+ top: 0;
+ }
.item {
&.grid-item {
$d: $ueBrowseGridItemLg;
@@ -23,6 +25,9 @@
display: block;
}
}
+ .contents {
+ top: $interiorMargin; right: $interiorMargin; bottom: $interiorMargin; left: $interiorMargin;
+ }
.bar {
&.top-bar.abs {
bottom: auto;
diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss
index 1ea122d838..731923a8f0 100644
--- a/platform/commonUI/general/res/sass/overlay/_overlay.scss
+++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss
@@ -51,6 +51,11 @@
}
}
.contents.l-dialog {
+ $myM: $interiorMargin;
+ top: $myM;
+ right: $myM;
+ bottom: $myM;
+ left: $myM;
overflow: auto;
}
}
\ No newline at end of file
diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss
index 9f9a6409f4..eb370535eb 100644
--- a/platform/commonUI/general/res/sass/user-environ/_frame.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss
@@ -18,6 +18,13 @@
>.object-holder.abs {
top: $ohH + $interiorMarginSm;
}
+ .contents {
+ $myM: $interiorMargin;
+ top: $myM;
+ right: $myM;
+ bottom: $myM;
+ left: $myM;
+ }
}
.edit-main .frame.child-frame.panel {
diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss
index 810a0c412e..e689e0e522 100644
--- a/platform/commonUI/general/res/sass/user-environ/_layout.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss
@@ -8,57 +8,26 @@
}
}
+.holder-all {
+ $myM: $interiorMargin;
+ top: $myM;
+ right: $myM;
+ bottom: $myM;
+ left: $myM;
+}
+
.browse-area,
.edit-area,
.editor {
- @include border-radius($basicCr * 1.5);
position: absolute;
- .contents {
-// overflow-y: auto;
- }
}
-.user-environ {
- .browse-area,
- .edit-area,
- .editor {
- top: $bodyMargin + $ueTopBarH + ($interiorMargin);
- right: $bodyMargin;
- bottom: $bodyMargin + $ueFooterH + $interiorMargin;
- left: $bodyMargin;
- }
-
- .edit-area {
- $tbH: $ueEditToolBarH;
- .tool-bar {
- bottom: auto;
- height: $tbH;
- line-height: $ueEditToolBarButtonH;
- }
- .work-area {
- top: $tbH + $interiorMargin * 2;
- }
- }
-
- .bottom-bar {
- top: auto;
- right: $bodyMargin;
- bottom: $bodyMargin;
- left: $bodyMargin;
- height: $ueFooterH;
- .status-holder {
- right: $ueAppLogoW + $bodyMargin;
- }
- .app-logo {
- left: auto;
- width: $ueAppLogoW;
- }
- }
+.editor {
+ @include border-radius($basicCr * 1.5);
}
-
.contents {
- $myM: $interiorMargin;
+ $myM: 0; //$interiorMargin;
box-sizing: border-box;
position: absolute;
top: $myM;
@@ -101,6 +70,52 @@
}
}
+.user-environ {
+ .browse-area,
+ .edit-area,
+ .editor {
+ top: $bodyMargin + $ueTopBarH + ($interiorMargin);
+ right: $bodyMargin;
+ bottom: $bodyMargin + $ueFooterH + $interiorMargin;
+ left: $bodyMargin;
+ }
+
+ .browse-area,
+ .edit-area {
+ > .contents {
+ left: 0;
+ right: 0;
+ }
+ }
+
+ .edit-area {
+ $tbH: $ueEditToolBarH;
+ .tool-bar {
+ bottom: auto;
+ height: $tbH;
+ line-height: $ueEditToolBarButtonH;
+ }
+ .work-area {
+ top: $tbH + $interiorMargin * 2;
+ }
+ }
+
+ .bottom-bar {
+ top: auto;
+ right: $bodyMargin;
+ bottom: $bodyMargin;
+ left: $bodyMargin;
+ height: $ueFooterH;
+ .status-holder {
+ right: $ueAppLogoW + $bodyMargin;
+ }
+ .app-logo {
+ left: auto;
+ width: $ueAppLogoW;
+ }
+ }
+}
+
.cols {
@include clearfix;
.col {
diff --git a/platform/commonUI/general/res/sass/user-environ/_top-bar.scss b/platform/commonUI/general/res/sass/user-environ/_top-bar.scss
index 17292e34e6..d70fbf0533 100644
--- a/platform/commonUI/general/res/sass/user-environ/_top-bar.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_top-bar.scss
@@ -5,6 +5,7 @@
&.browse,
&.edit {
+ border-bottom: 1px solid $colorInteriorBorder;
top: $bodyMargin; right: $bodyMargin; bottom: auto; left: $bodyMargin;
height: $ueTopBarH;
}
diff --git a/platform/commonUI/general/res/templates/controls/action-button.html b/platform/commonUI/general/res/templates/controls/action-button.html
index 169e015470..79c639eeed 100644
--- a/platform/commonUI/general/res/templates/controls/action-button.html
+++ b/platform/commonUI/general/res/templates/controls/action-button.html
@@ -1,4 +1,4 @@
-