From a5c012cd4d57bd6f7928d83790f189ef7831d80c Mon Sep 17 00:00:00 2001 From: David Linko Date: Wed, 27 Nov 2024 11:18:02 -0500 Subject: [PATCH 1/2] updated bootstrap --- .../components/management/agents/Agents.vue | 5 ++--- anms-ui/public/app/components/user/User.vue | 4 ++-- .../public/app/components/user/UserAdmin.vue | 11 +++------- anms-ui/public/app/core/App.vue | 4 +++- anms-ui/public/assets/styles/base.scss | 20 +++++++++---------- anms-ui/public/package.json | 6 +++--- anms-ui/public/yarn.lock | 6 +++--- 7 files changed, 26 insertions(+), 30 deletions(-) diff --git a/anms-ui/public/app/components/management/agents/Agents.vue b/anms-ui/public/app/components/management/agents/Agents.vue index fd9a242..8ca021a 100644 --- a/anms-ui/public/app/components/management/agents/Agents.vue +++ b/anms-ui/public/app/components/management/agents/Agents.vue @@ -11,12 +11,14 @@ @change="handleSearchStringChange($event)" v-on:keyup.enter="handlePageChange(1)" />
+
+
@@ -236,9 +238,6 @@ export default { diff --git a/anms-ui/public/app/components/user/UserAdmin.vue b/anms-ui/public/app/components/user/UserAdmin.vue index cc892d1..7e2a38a 100644 --- a/anms-ui/public/app/components/user/UserAdmin.vue +++ b/anms-ui/public/app/components/user/UserAdmin.vue @@ -519,13 +519,13 @@ import _, {size} from 'lodash'; &::v-deep .table-outline-#{$theme-color} { $color: $theme-color-value; - $color-hover: color-yiq($color); + $color-hover: color-contrast($color); $active-background: $color; $active-border: $color; color: $color; border: $table-border-width solid $color; - border-width: 2 * $table-border-width; + border-width: calc($table-border-width * 2); > td { border-top: $table-border-width solid $color; @@ -535,14 +535,9 @@ import _, {size} from 'lodash'; &:first-child td { // https://www.w3.org/TR/CSS2/tables.html#border-conflict-resolution border-top: $table-border-width double $color; - border-top-width: 2 * $table-border-width; // re-declare due to conflict resolution algorithm + border-top-width: calc($table-border-width * 2); // re-declare due to conflict resolution algorithm } - @include hover { - // color: $color-hover; - // background-color: $active-background; - border-color: $active-border; - } &:focus, &.focus { diff --git a/anms-ui/public/app/core/App.vue b/anms-ui/public/app/core/App.vue index d1fdf93..d166851 100644 --- a/anms-ui/public/app/core/App.vue +++ b/anms-ui/public/app/core/App.vue @@ -53,6 +53,7 @@ import _ from "lodash"; import { mapGetters, mapActions } from "vuex"; import {status_refresh_rate} from '@app/shared/constants'; + export default { mixins: [api], data() { @@ -66,7 +67,7 @@ showStubbedTabs: false, statusWorkerId: "", ariWorkerId: "", - // alerts:[] + alerts:[] }; }, computed: { @@ -167,6 +168,7 @@ @import '~bootswatch/dist/darkly/bootswatch'; // Bootstrap Vue Lib @import '~bootstrap-vue/src/index.scss'; + // Font Awesome Lib $fa-font-path: '~@fortawesome/fontawesome-free/webfonts'; diff --git a/anms-ui/public/assets/styles/base.scss b/anms-ui/public/assets/styles/base.scss index b039953..9b7b2ee 100644 --- a/anms-ui/public/assets/styles/base.scss +++ b/anms-ui/public/assets/styles/base.scss @@ -45,17 +45,17 @@ html, body { // Copied from scss/_buttons.scss in bootstrap 4.3 // Since cannot extend inside a media-breakpoint... // https://github.com/sass/sass/issues/1050 -@include media-breakpoint-only(xs) { +// @include media-breakpoint-only(xs) { - .btn-block-xs { - display: block; - width: 100%; + // .btn-block-xs { + // display: block; + // width: 100%; - // Vertically space out multiple block buttons - + .btn-block { - margin-top: $btn-block-spacing-y; - } - } + // // Vertically space out multiple block buttons + // + .btn-block { + // margin-top: $btn-block-spacing-y; + // } + // } // Specificity overrides input[type="submit"], @@ -66,4 +66,4 @@ html, body { } } -} +// } diff --git a/anms-ui/public/package.json b/anms-ui/public/package.json index c420237..8884245 100644 --- a/anms-ui/public/package.json +++ b/anms-ui/public/package.json @@ -9,9 +9,9 @@ "@fortawesome/vue-fontawesome": "^2.0.9", "axios": "^1.7.4", "body-parser": "^1.20.3", - "bootstrap": "^4.5.0", - "bootstrap-vue": "^2.15.0", - "bootswatch": "^4.5.0", + "bootstrap": "^4.6.2", + "bootstrap-vue": "^2.23.1", + "bootswatch": "^4.6.2", "braces": "^3.0.3", "browserify-sign": "^4.2.2", "collect": "^0.3.5", diff --git a/anms-ui/public/yarn.lock b/anms-ui/public/yarn.lock index 63a268e..382fe0d 100644 --- a/anms-ui/public/yarn.lock +++ b/anms-ui/public/yarn.lock @@ -2597,7 +2597,7 @@ "resolved" "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz" "version" "1.0.0" -"bootstrap-vue@^2.15.0": +"bootstrap-vue@^2.23.1": "integrity" "sha512-SEWkG4LzmMuWjQdSYmAQk1G/oOKm37dtNfjB5kxq0YafnL2W6qUAmeDTcIZVbPiQd2OQlIkWOMPBRGySk/zGsg==" "resolved" "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.23.1.tgz" "version" "2.23.1" @@ -2608,12 +2608,12 @@ "portal-vue" "^2.1.7" "vue-functional-data-merge" "^3.1.0" -"bootstrap@^4.5.0", "bootstrap@^4.6.1": +"bootstrap@^4.6.1", "bootstrap@^4.6.2": "integrity" "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==" "resolved" "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz" "version" "4.6.2" -"bootswatch@^4.5.0": +"bootswatch@^4.6.2": "integrity" "sha512-pHOS3d2yM/x9Y7/zwVzfGhGIIBdIa/rPwipghh756PaSNJS3ott/29d9uehakgze3pDvbH4FoQVjbho8wsLm6A==" "resolved" "https://registry.npmjs.org/bootswatch/-/bootswatch-4.6.2.tgz" "version" "4.6.2" From dcca403f32c6e00839cef618f6a61fd6d25405d0 Mon Sep 17 00:00:00 2001 From: David Linko Date: Wed, 27 Nov 2024 12:04:27 -0500 Subject: [PATCH 2/2] removed old code --- anms-ui/public/assets/styles/base.scss | 28 +------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/anms-ui/public/assets/styles/base.scss b/anms-ui/public/assets/styles/base.scss index 9b7b2ee..857c556 100644 --- a/anms-ui/public/assets/styles/base.scss +++ b/anms-ui/public/assets/styles/base.scss @@ -40,30 +40,4 @@ html, body { flex: 1 1 100%; // https://drafts.csswg.org/css-flexbox/#min-size-auto min-height: 0; -} - -// Copied from scss/_buttons.scss in bootstrap 4.3 -// Since cannot extend inside a media-breakpoint... -// https://github.com/sass/sass/issues/1050 -// @include media-breakpoint-only(xs) { - - // .btn-block-xs { - // display: block; - // width: 100%; - - // // Vertically space out multiple block buttons - // + .btn-block { - // margin-top: $btn-block-spacing-y; - // } - // } - - // Specificity overrides - input[type="submit"], - input[type="reset"], - input[type="button"] { - &.btn-block-xs { - width: 100%; - } - } - -// } +} \ No newline at end of file