From 30816d2c35e66e5ad96690233608fd1b66393815 Mon Sep 17 00:00:00 2001 From: Moses Narrow <36607567+0pcom@users.noreply.github.com> Date: Sun, 29 Jan 2023 09:29:22 -0600 Subject: [PATCH] rebuild ui after updates --- pkg/visor/static/3rdpartylicenses.txt | 25 +++++++++++ pkg/visor/static/assets/scss/_dialogs.scss | 25 +++++++---- pkg/visor/static/assets/scss/_forms.scss | 14 +++---- pkg/visor/static/assets/scss/_menu.scss | 8 +++- .../assets/scss/_responsive_tables.scss | 42 ++++++++++--------- pkg/visor/static/index.html | 4 +- pkg/visor/static/main.6b16c47d0ee8c161.js | 1 + pkg/visor/static/main.b05821a698c05cae.js | 1 - pkg/visor/static/styles.2f44a52de9b96255.css | 6 +++ pkg/visor/static/styles.ccb244968dfc5ad6.css | 6 --- static/skywire-manager-src/dist/index.html | 4 +- 11 files changed, 89 insertions(+), 47 deletions(-) create mode 100644 pkg/visor/static/main.6b16c47d0ee8c161.js delete mode 100644 pkg/visor/static/main.b05821a698c05cae.js create mode 100644 pkg/visor/static/styles.2f44a52de9b96255.css delete mode 100644 pkg/visor/static/styles.ccb244968dfc5ad6.css diff --git a/pkg/visor/static/3rdpartylicenses.txt b/pkg/visor/static/3rdpartylicenses.txt index df858e0490..f89f175d54 100644 --- a/pkg/visor/static/3rdpartylicenses.txt +++ b/pkg/visor/static/3rdpartylicenses.txt @@ -66,6 +66,31 @@ MIT @angular/router MIT +@material/dialog +MIT +The MIT License + +Copyright (c) 2014-2020 Google, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + + @ngx-translate/core MIT diff --git a/pkg/visor/static/assets/scss/_dialogs.scss b/pkg/visor/static/assets/scss/_dialogs.scss index 5044092b5c..3594e11bbc 100644 --- a/pkg/visor/static/assets/scss/_dialogs.scss +++ b/pkg/visor/static/assets/scss/_dialogs.scss @@ -1,15 +1,19 @@ // Modal windows. -mat-dialog-container.mat-dialog-container { +.mat-mdc-dialog-surface { border-radius: $mat-dialog-radius !important; + background-image: url('/assets/img/modal-background-pattern.png') !important; + box-shadow: inset 0 0 100px 0 rgba(255, 255, 255, 0.5), 5px 5px 15px 0 rgba(0, 0, 0, 1) !important; + background-color: $modal-background !important; + overflow: hidden; padding: $mat-dialog-padding !important; - - background-image: url('/assets/img/modal-background-pattern.png'); - box-shadow: inset 0 0 100px 0 rgba(255, 255, 255, 0.5), 5px 5px 15px 0 rgba(0, 0, 0, 1); - background-color: $modal-background; } -.mat-dialog-content { - margin-bottom: -$mat-dialog-padding !important; +.mat-mdc-dialog-content { + font-family: $skywire-font-family !important; + margin: (0px) (-$mat-dialog-padding) (-$mat-dialog-padding) (-$mat-dialog-padding) !important; + padding: $mat-dialog-padding !important; + color: $black !important; + line-height: 1.5 !important; } app-dialog { @@ -41,6 +45,12 @@ app-dialog { } } } +.options-list-button-container:first-of-type { + margin-top: -$mat-dialog-padding !important; +} +.options-list-button-container:last-of-type { + margin-bottom: -$mat-dialog-padding !important; +} // Global styles for the modal windows that display the details of something. .info-dialog { @@ -53,6 +63,7 @@ app-dialog { font-size: $font-size-base; margin-top: 25px; color: $blue-medium; + display: flex; mat-icon { margin-right: 5px; diff --git a/pkg/visor/static/assets/scss/_forms.scss b/pkg/visor/static/assets/scss/_forms.scss index 58194b6e65..a3466753e7 100644 --- a/pkg/visor/static/assets/scss/_forms.scss +++ b/pkg/visor/static/assets/scss/_forms.scss @@ -5,20 +5,20 @@ mat-form-field { // White form fields, to be shown with the dark background. .white-form-field { color: $white; - - .mat-select-value-text, .mat-form-field-label, .mat-select-value, .mat-select-arrow { + + .mat-mdc-select-value, .mat-mdc-select-arrow { color: $white !important; } - .mat-form-field-underline { - background-color: scale-color($white, $alpha: -50%) !important; + .mdc-line-ripple::before { + border-bottom-color: scale-color($white, $alpha: -50%) !important; } - .mat-form-field-ripple { - background-color: $white !important; + input { + color: $white !important; } - .mat-input-element { + .mat-mdc-input-element { caret-color: $white; } } diff --git a/pkg/visor/static/assets/scss/_menu.scss b/pkg/visor/static/assets/scss/_menu.scss index 361703f043..6fc6da2b7b 100644 --- a/pkg/visor/static/assets/scss/_menu.scss +++ b/pkg/visor/static/assets/scss/_menu.scss @@ -1,9 +1,13 @@ // Dropdown menus. -.mat-menu-panel { +.mat-mdc-menu-panel { border-radius: $mat-dialog-radius !important; max-width: none !important; } -.mat-menu-item { +.mat-mdc-menu-item { width: auto !important; + + mat-icon { + opacity: 0.5; + } } diff --git a/pkg/visor/static/assets/scss/_responsive_tables.scss b/pkg/visor/static/assets/scss/_responsive_tables.scss index aecb3c16ad..16a527d3b2 100644 --- a/pkg/visor/static/assets/scss/_responsive_tables.scss +++ b/pkg/visor/static/assets/scss/_responsive_tables.scss @@ -57,22 +57,31 @@ $responsive-table-colors: ( // Column used for the check boxes. .selection-col { width: 30px; + padding-top: 0; + padding-bottom: 0; - .mat-checkbox { + .mat-mdc-checkbox { vertical-align: super; } } .action-button { - width: 28px; - height: 28px; + width: 28px !important; + height: 28px !important; line-height: 16px; font-size: 16px; margin-right: 5px; + padding: 0 !important; + color: white !important; + min-width: 0 !important; &:last-child { margin-right: 0; } + + .mat-icon { + margin-right: 0px !important; + } } .big-action-button { @@ -100,8 +109,8 @@ $responsive-table-colors: ( >label { margin-bottom: 0; } - - .mat-checkbox-background, .mat-checkbox-frame { + + .mdc-checkbox__background { box-sizing: border-box; width: 18px; height: 18px; @@ -110,9 +119,14 @@ $responsive-table-colors: ( border-width: 2px; border-color: rgba(0, 0, 0, 0.5); } - - .mat-ripple-element { - background-color: rgba(255, 255, 255, 0.10) !important; + + .mdc-checkbox__native-control:enabled:checked~.mdc-checkbox__background { + background-color: rgba(0, 0, 0, 0.3) !important; + border-color: rgba(0, 0, 0, 0.5) !important; + } + + svg { + color: white !important; } } @@ -127,18 +141,6 @@ $responsive-table-colors: ( width: 50px; flex-shrink: 0; margin-left: -20px; - - mat-checkbox { - >label { - width: 50px; - height: 50px; - padding-left: 20px; - - .mat-checkbox-inner-container { - margin: 0 !important; - } - } - } } // Content area. diff --git a/pkg/visor/static/index.html b/pkg/visor/static/index.html index ecbfa6ef52..878736ecd8 100644 --- a/pkg/visor/static/index.html +++ b/pkg/visor/static/index.html @@ -5,10 +5,10 @@ - +