Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updating to fix dependabot #162

Merged
merged 2 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions anms-ui/public/app/components/management/agents/Agents.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@
@change="handleSearchStringChange($event)"
v-on:keyup.enter="handlePageChange(1)" />
<div class="input-group-append">
<div class="d-grid gap-2 col-6 mx-auto">
<button class="btn btn-outline-secondary"
type="button"
@click="handlePageChange(1)">
Search
</button>
</div>
</div>
</div>
<b-row>
<b-col>
Expand Down Expand Up @@ -236,9 +238,6 @@ export default {
</script>

<style>
.table-hover tbody tr:hover {
cursor: pointer;
}

.footer {
position: fixed;
Expand Down
4 changes: 2 additions & 2 deletions anms-ui/public/app/components/user/User.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
.user-tabs {
// No gutters from the main container since we're don't want a row/column grid gutters
// For Grids with gutters, re-initialize a new container on the sub-element
margin-right: -$grid-gutter-width / 2;
margin-left: -$grid-gutter-width / 2;
margin-right: calc(-1 * $grid-gutter-width / 2);
margin-left: calc(-1 * $grid-gutter-width / 2);
}

</style>
11 changes: 3 additions & 8 deletions anms-ui/public/app/components/user/UserAdmin.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
4 changes: 3 additions & 1 deletion anms-ui/public/app/core/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -66,7 +67,7 @@
showStubbedTabs: false,
statusWorkerId: "",
ariWorkerId: "",
// alerts:[]
alerts:[]
};
},
computed: {
Expand Down Expand Up @@ -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';
Expand Down
28 changes: 1 addition & 27 deletions anms-ui/public/assets/styles/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
}
}

}
}
6 changes: 3 additions & 3 deletions anms-ui/public/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions anms-ui/public/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down