diff --git a/index.html b/index.html index e47efe91b5a..fcd37cfb0b3 100644 --- a/index.html +++ b/index.html @@ -19,16 +19,15 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - - - - + + + + - - - - - - + + + +
diff --git a/package.json b/package.json index 491904fe4dc..5563f65c82a 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "mkdirp": "^0.5.1", "moment": "^2.11.1", "node-bourbon": "^4.2.3", - "phantomjs-prebuilt": "^2.1.0", + "phantomjs-prebuilt": "2.1.11 || >2.1.12 <3.0.0", "requirejs": "2.1.x", "split": "^1.0.0" }, diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js index 2c5a79bda3a..33d92f913ca 100644 --- a/platform/commonUI/edit/bundle.js +++ b/platform/commonUI/edit/bundle.js @@ -387,7 +387,7 @@ define([ "constants": [ { "key": "editModeBlacklist", - "value": ["copy", "follow", "window", "link", "locate"] + "value": ["copy", "follow", "link", "locate"] }, { "key": "nonEditContextBlacklist", diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 603179d5e99..aa4a8ba7096 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -126,6 +126,7 @@ $menuLineH: 1.5rem; $menuLineHPx: 24px; $btnStdH: 25px; $btnToolbarH: $btnStdH; +$controlBarH: $btnStdH; $btnFrameH: 16px; /************************** PATHS */ diff --git a/platform/commonUI/general/res/sass/_views.scss b/platform/commonUI/general/res/sass/_views.scss index 96c78f1dd28..357f9f3c7c4 100644 --- a/platform/commonUI/general/res/sass/_views.scss +++ b/platform/commonUI/general/res/sass/_views.scss @@ -1,8 +1,11 @@ /* Styles for sub-dividing views generically */ +.l-control-bar { + // Element that can be placed above l-view-section, holds controls, buttons, etc. + height: $controlBarH; +} .l-view-section { @include absPosDefault(0); - font-size: 0.8rem; h2 { color: #fff; margin-bottom: $interiorMargin; @@ -15,4 +18,36 @@ .inline-block { display: inline-block; } +} + +.has-control-bar { + .l-view-section { + top: $controlBarH + $interiorMargin; + } +} + + +.child-frame { + .has-control-bar { + $btnExportH: $btnFrameH; + .l-control-bar { + @include trans-prop-nice(opacity, $dur: 50ms); + opacity: 0; + } + .l-view-section { + @include trans-prop-nice(top, $dur: 150ms, $delay: 50ms); + top: 0; + } + &:hover { + .l-control-bar { + @include trans-prop-nice(opacity, 150ms, 100ms); + opacity: 1; + } + .l-view-section { + @include trans-prop-nice(top, $dur: 150ms); + top: $btnExportH + $interiorMargin; + } + } + } + } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/lists/_tabular.scss b/platform/commonUI/general/res/sass/lists/_tabular.scss index 5671fe178d0..d68486547ea 100644 --- a/platform/commonUI/general/res/sass/lists/_tabular.scss +++ b/platform/commonUI/general/res/sass/lists/_tabular.scss @@ -160,39 +160,3 @@ table { } } } - -/********************************************************** SPECIFIC TABULAR VIEWS */ -.tabular-holder { - &.t-exportable { - $btnExportH: 25px; - .l-view-section { - top: $btnExportH + $interiorMargin; - } - } -} - -.child-frame { - .tabular-holder { - &.t-exportable { - $btnExportH: $btnFrameH; - .s-button.t-export { - @include trans-prop-nice(opacity, $dur: 50ms); - opacity: 0; - } - .l-view-section { - @include trans-prop-nice(top, $dur: 150ms, $delay: 50ms); - top: 0; - } - &:hover { - .s-button.t-export { - @include trans-prop-nice(opacity, 150ms, 100ms); - opacity: 1; - } - .l-view-section { - @include trans-prop-nice(top, $dur: 150ms); - top: $btnExportH + $interiorMargin; - } - } - } - } -} \ No newline at end of file diff --git a/platform/features/table/res/templates/historical-table.html b/platform/features/table/res/templates/historical-table.html index e2cd91b0dbf..d306601dafb 100644 --- a/platform/features/table/res/templates/historical-table.html +++ b/platform/features/table/res/templates/historical-table.html @@ -4,6 +4,6 @@ rows="rows" enableFilter="true" enableSort="true" - class="tabular-holder t-exportable"> + class="tabular-holder has-control-bar">
\ No newline at end of file diff --git a/platform/features/table/res/templates/mct-table.html b/platform/features/table/res/templates/mct-table.html index 6d96b17afd3..ac06f53e28a 100644 --- a/platform/features/table/res/templates/mct-table.html +++ b/platform/features/table/res/templates/mct-table.html @@ -1,8 +1,10 @@ - - Export - +
+ + Export + +
diff --git a/platform/features/table/res/templates/rt-table.html b/platform/features/table/res/templates/rt-table.html index c6fb0d24229..573eeb89f69 100644 --- a/platform/features/table/res/templates/rt-table.html +++ b/platform/features/table/res/templates/rt-table.html @@ -4,7 +4,7 @@ rows="rows" enableFilter="true" enableSort="true" - class="tabular-holder t-exportable" + class="tabular-holder has-control-bar" auto-scroll="true"> \ No newline at end of file diff --git a/platform/forms/res/templates/controls/color.html b/platform/forms/res/templates/controls/color.html index e7e4913341f..c9a4bbdd4ae 100644 --- a/platform/forms/res/templates/controls/color.html +++ b/platform/forms/res/templates/controls/color.html @@ -36,18 +36,18 @@ ng-controller="ColorController as colors" ng-show="toggle.isActive()">
+ class="l-palette-row l-option-row" + ng-if="!structure.mandatory">
None
diff --git a/platform/forms/res/templates/controls/composite.html b/platform/forms/res/templates/controls/composite.html index 1c3559e2fcf..e036617c3c4 100644 --- a/platform/forms/res/templates/controls/composite.html +++ b/platform/forms/res/templates/controls/composite.html @@ -21,18 +21,18 @@ --> -
- - - - {{item.name}} - -
+
+ + + + {{item.name}} + +
diff --git a/platform/forms/res/templates/toolbar.html b/platform/forms/res/templates/toolbar.html index 58923e0314e..f109b670e73 100644 --- a/platform/forms/res/templates/toolbar.html +++ b/platform/forms/res/templates/toolbar.html @@ -20,31 +20,31 @@ at runtime from the About dialog for additional information. -->
-
- - +
+ + - - - - - -
+ + + + + +
\ No newline at end of file