diff --git a/platform/commonUI/dialog/res/templates/dialog.html b/platform/commonUI/dialog/res/templates/dialog.html index 9df10e0cd0..48036832c8 100644 --- a/platform/commonUI/dialog/res/templates/dialog.html +++ b/platform/commonUI/dialog/res/templates/dialog.html @@ -30,12 +30,12 @@
- OK - Cancel diff --git a/platform/commonUI/dialog/res/templates/message.html b/platform/commonUI/dialog/res/templates/message.html index 8568fe5fb1..6a2be98d99 100644 --- a/platform/commonUI/dialog/res/templates/message.html +++ b/platform/commonUI/dialog/res/templates/message.html @@ -16,11 +16,11 @@
{{dialogOption.label}} - {{ngModel.primaryOption.label}} diff --git a/platform/commonUI/dialog/res/templates/overlay-message-list.html b/platform/commonUI/dialog/res/templates/overlay-message-list.html index 9a795c115e..299d19639c 100644 --- a/platform/commonUI/dialog/res/templates/overlay-message-list.html +++ b/platform/commonUI/dialog/res/templates/overlay-message-list.html @@ -13,7 +13,7 @@
{{dialogAction.label}} diff --git a/platform/commonUI/dialog/res/templates/overlay-options.html b/platform/commonUI/dialog/res/templates/overlay-options.html index 4d73c59613..89b8be8242 100644 --- a/platform/commonUI/dialog/res/templates/overlay-options.html +++ b/platform/commonUI/dialog/res/templates/overlay-options.html @@ -33,7 +33,7 @@
diff --git a/platform/commonUI/edit/res/templates/edit-action-buttons.html b/platform/commonUI/edit/res/templates/edit-action-buttons.html index f85519e0fb..fc46b31f57 100644 --- a/platform/commonUI/edit/res/templates/edit-action-buttons.html +++ b/platform/commonUI/edit/res/templates/edit-action-buttons.html @@ -21,7 +21,7 @@ --> - diff --git a/platform/commonUI/general/res/sass/_about.scss b/platform/commonUI/general/res/sass/_about.scss index a676018961..a95ed0cd77 100644 --- a/platform/commonUI/general/res/sass/_about.scss +++ b/platform/commonUI/general/res/sass/_about.scss @@ -43,7 +43,7 @@ color: $colorAboutLink; } .s-description, - .s-btn { + .s-button { line-height: 2em; } .l-licenses-software { diff --git a/platform/commonUI/general/res/sass/_autoflow.scss b/platform/commonUI/general/res/sass/_autoflow.scss index 6ad315f61e..2dc3bcbed3 100644 --- a/platform/commonUI/general/res/sass/_autoflow.scss +++ b/platform/commonUI/general/res/sass/_autoflow.scss @@ -29,7 +29,7 @@ font-size: 0.75rem; &:hover { - .l-autoflow-header .s-btn.change-column-width { + .l-autoflow-header .s-button.change-column-width { @include trans-prop-nice-fade(50ms); opacity: 1; } @@ -43,7 +43,7 @@ .t-last-update { overflow: hidden; } - .s-btn.change-column-width { + .s-button.change-column-width { @include trans-prop-nice-fade(500ms); opacity: 0; } diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index 28203b08cf..1231d735f3 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -22,7 +22,7 @@ $baseRatio: 1.5; $pad: $interiorMargin * $baseRatio; -.s-btn { +.s-button { @include user-select(none); cursor: pointer; text-decoration: none; @@ -30,7 +30,7 @@ $pad: $interiorMargin * $baseRatio; line-height: $btnStdH; } -.s-btn { +.s-button { box-sizing: border-box; padding: 0 $pad; font-size: 0.7rem; @@ -107,32 +107,32 @@ body.desktop .mini-tab-icon { .l-btn-set { // Buttons that have a very tight conceptual grouping - no internal space between them. - // Structure: .btn-set > mct-representation class=first|last > .s-btn - font-size: 0; // Remove space between s-btn elements due to white space in markup + // Structure: .btn-set > mct-representation class=first|last > .s-button + font-size: 0; // Remove space between s-button elements due to white space in markup - .s-btn { + .s-button { border-radius: 0; margin-left: 1px; } .first { - .s-btn, - &.s-btn { + .s-button, + &.s-button { @include border-left-radius($controlCr); margin-left: 0; } } .last { - .s-btn, - &.s-btn { + .s-button, + &.s-button { @include border-right-radius($controlCr); } } } .paused { - &:not(.s-btn) { + &:not(.s-button) { border-color: $colorPausedBg !important; color: $colorPausedBg !important; } diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index aa3a0e70fb..709d06b40c 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -22,7 +22,7 @@ /******************************************************** MENU BUTTONS */ .s-menu-btn { // Formerly .btn-menu - @extend .s-btn; + @extend .s-button; span.l-click-area { // In markup, this element should not enclose anything. @extend .abs; diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index b816b42355..2604d498bd 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -128,7 +128,7 @@ font-weight: bold; opacity: 1; } - .s-btn { + .s-button { background: $colorStatusBtnBg; padding: 0 $interiorMargin; height: auto; diff --git a/platform/commonUI/general/res/sass/forms/_channel-selector.scss b/platform/commonUI/general/res/sass/forms/_channel-selector.scss index 00de4437b8..615315ee63 100644 --- a/platform/commonUI/general/res/sass/forms/_channel-selector.scss +++ b/platform/commonUI/general/res/sass/forms/_channel-selector.scss @@ -36,7 +36,7 @@ .btns-add-remove { // background: rgba(#ff0000, 0.3);; margin-top: 150px; - .s-btn { + .s-button { display: block; //font-size: 1.5em; margin-bottom: $interiorMargin; diff --git a/platform/commonUI/general/res/sass/lists/_tabular.scss b/platform/commonUI/general/res/sass/lists/_tabular.scss index 260c2c75f3..5671fe178d 100644 --- a/platform/commonUI/general/res/sass/lists/_tabular.scss +++ b/platform/commonUI/general/res/sass/lists/_tabular.scss @@ -175,7 +175,7 @@ table { .tabular-holder { &.t-exportable { $btnExportH: $btnFrameH; - .s-btn.t-export { + .s-button.t-export { @include trans-prop-nice(opacity, $dur: 50ms); opacity: 0; } @@ -184,7 +184,7 @@ table { top: 0; } &:hover { - .s-btn.t-export { + .s-button.t-export { @include trans-prop-nice(opacity, 150ms, 100ms); opacity: 1; } diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index 8221042005..018197dac0 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -87,7 +87,7 @@ .bottom-bar { text-align: right; - .s-btn { + .s-button { $bg: $colorOvrBtnBg; &:not(.major) { @include btnSubtle($bg, pullForward($bg, 10%), $colorOvrBtnFg, $colorOvrBtnFg); diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss index b4a9471649..e2a6ae7716 100644 --- a/platform/commonUI/general/res/sass/user-environ/_frame.scss +++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss @@ -49,7 +49,7 @@ left: $myM; } &.frame-template { - .s-btn, + .s-button, .s-menu-btn { height: $ohH; line-height: $ohH; diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 09aee0409c..d70e4e21e6 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -237,10 +237,10 @@ body.desktop .pane .mini-tab-icon.toggle-pane { @include trans-prop-nice-resize(0.25s); } -.object-browse-bar .s-btn, -.top-bar .buttons-main .s-btn, +.object-browse-bar .s-button, +.top-bar .buttons-main .s-button, .top-bar .s-menu-btn, -.tool-bar .s-btn, +.tool-bar .s-button, .tool-bar .s-menu-btn { $h: $btnToolbarH; height: $h; diff --git a/platform/commonUI/general/res/templates/controls/action-button.html b/platform/commonUI/general/res/templates/controls/action-button.html index 9820963649..eeaaa2613d 100644 --- a/platform/commonUI/general/res/templates/controls/action-button.html +++ b/platform/commonUI/general/res/templates/controls/action-button.html @@ -19,7 +19,7 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - diff --git a/platform/commonUI/general/res/templates/controls/selector.html b/platform/commonUI/general/res/templates/controls/selector.html index 3d522e2d6d..3a64cd3140 100644 --- a/platform/commonUI/general/res/templates/controls/selector.html +++ b/platform/commonUI/general/res/templates/controls/selector.html @@ -43,11 +43,11 @@
- > - < diff --git a/platform/commonUI/general/res/templates/indicator.html b/platform/commonUI/general/res/templates/indicator.html index 0a5a543358..234b5b3cd1 100644 --- a/platform/commonUI/general/res/templates/indicator.html +++ b/platform/commonUI/general/res/templates/indicator.html @@ -27,7 +27,7 @@ {{ngModel.getText()}} - +
\ No newline at end of file diff --git a/platform/commonUI/themes/snow/res/sass/_controls.scss b/platform/commonUI/themes/snow/res/sass/_controls.scss index 4ff28bbfaa..3b247d7670 100644 --- a/platform/commonUI/themes/snow/res/sass/_controls.scss +++ b/platform/commonUI/themes/snow/res/sass/_controls.scss @@ -1,4 +1,4 @@ -.s-btn { +.s-button { &.major { .title-label { text-transform: uppercase; diff --git a/platform/features/imagery/res/templates/imagery.html b/platform/features/imagery/res/templates/imagery.html index 7ab739456f..fbdf4535af 100644 --- a/platform/features/imagery/res/templates/imagery.html +++ b/platform/features/imagery/res/templates/imagery.html @@ -5,13 +5,13 @@
- - @@ -25,24 +25,24 @@
- {{imagery.getZone()}} {{imagery.getTime()}} {{imagery.getDate()}}
- + class="s-button icon-new-window"> diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index 75efda69ff..a35929324c 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -87,12 +87,12 @@
- - diff --git a/platform/features/table/res/templates/mct-table.html b/platform/features/table/res/templates/mct-table.html index 6e517799c6..7cb8a99111 100644 --- a/platform/features/table/res/templates/mct-table.html +++ b/platform/features/table/res/templates/mct-table.html @@ -1,4 +1,4 @@ - Export diff --git a/platform/features/timeline/res/sass/_timeline-thematic.scss b/platform/features/timeline/res/sass/_timeline-thematic.scss index 0cca3f8b27..badbffe0b6 100644 --- a/platform/features/timeline/res/sass/_timeline-thematic.scss +++ b/platform/features/timeline/res/sass/_timeline-thematic.scss @@ -112,7 +112,7 @@ $l: 5%; @include user-select(none); @include background-image(linear-gradient(-90deg, rgba($bg, $bga), rgba($bg, $bga) 70%, rgba($bg, 0) 100%)); - .s-btn { + .s-button { height: 16px; line-height: 16px; .icon { diff --git a/platform/features/timeline/res/templates/timeline.html b/platform/features/timeline/res/templates/timeline.html index 3ea7b28344..33458d4ebf 100644 --- a/platform/features/timeline/res/templates/timeline.html +++ b/platform/features/timeline/res/templates/timeline.html @@ -103,19 +103,19 @@
- - - diff --git a/platform/forms/res/templates/controls/button.html b/platform/forms/res/templates/controls/button.html index f2aadf26b4..c7ce5383ad 100644 --- a/platform/forms/res/templates/controls/button.html +++ b/platform/forms/res/templates/controls/button.html @@ -19,7 +19,7 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - diff --git a/platform/forms/res/templates/controls/color.html b/platform/forms/res/templates/controls/color.html index 410392862e..f99c7d158c 100644 --- a/platform/forms/res/templates/controls/color.html +++ b/platform/forms/res/templates/controls/color.html @@ -19,7 +19,7 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
diff --git a/platform/search/res/templates/search.html b/platform/search/res/templates/search.html index fe97406720..6329f75b1c 100644 --- a/platform/search/res/templates/search.html +++ b/platform/search/res/templates/search.html @@ -53,7 +53,7 @@ ng-model="ngModel" class="l-flex-row flex-elem grows"> - More Results + More Results