From 6eaf4ded80f4deabd6639bdab1ac14c641151435 Mon Sep 17 00:00:00 2001 From: Susanna Carey Date: Mon, 2 Feb 2026 11:30:29 -0500 Subject: [PATCH 01/22] Begin template upgrade work --- .../admin-ui/app/styles/_forms.scss | 6 +- .../admin-ui/app/styles/_icons.scss | 6 +- .../admin-ui/app/styles/_query-builder.scss | 8 +-- .../admin-ui/app/templates/application.hbs | 2 +- src/api-umbrella/admin-ui/package.json | 4 +- src/api-umbrella/admin-ui/pnpm-lock.yaml | 62 +++++++++---------- 6 files changed, 43 insertions(+), 45 deletions(-) diff --git a/src/api-umbrella/admin-ui/app/styles/_forms.scss b/src/api-umbrella/admin-ui/app/styles/_forms.scss index 6da2ef368..a575a93ff 100644 --- a/src/api-umbrella/admin-ui/app/styles/_forms.scss +++ b/src/api-umbrella/admin-ui/app/styles/_forms.scss @@ -140,9 +140,9 @@ fieldset .table { .btn-loading-label { display: none; - .svg-inline--fa:first-child { - @extend .mr-2; - } + // .svg-inline--fa:first-child { + // @extend .mr-2; + // } } &.btn-loading { diff --git a/src/api-umbrella/admin-ui/app/styles/_icons.scss b/src/api-umbrella/admin-ui/app/styles/_icons.scss index b7ca43351..1f77adb40 100644 --- a/src/api-umbrella/admin-ui/app/styles/_icons.scss +++ b/src/api-umbrella/admin-ui/app/styles/_icons.scss @@ -1,6 +1,6 @@ -a .svg-inline--fa:first-child { - @extend .mr-1; -} +// a .svg-inline--fa:first-child { +// @extend .mr-1; +// } [data-toggle='collapse'].collapsed .fa-caret-down { transform: rotate(270deg); diff --git a/src/api-umbrella/admin-ui/app/styles/_query-builder.scss b/src/api-umbrella/admin-ui/app/styles/_query-builder.scss index 54db47e2f..548c7dbc9 100644 --- a/src/api-umbrella/admin-ui/app/styles/_query-builder.scss +++ b/src/api-umbrella/admin-ui/app/styles/_query-builder.scss @@ -43,10 +43,10 @@ } } - select.form-control { - @extend .custom-select; - @extend .custom-select-sm; - } + // select.form-control { + // @extend .custom-select; + // @extend .custom-select-sm; + // } input[type='number'].form-control, input[type='text'].form-control { diff --git a/src/api-umbrella/admin-ui/app/templates/application.hbs b/src/api-umbrella/admin-ui/app/templates/application.hbs index 12941ba8e..44fc449a4 100644 --- a/src/api-umbrella/admin-ui/app/templates/application.hbs +++ b/src/api-umbrella/admin-ui/app/templates/application.hbs @@ -8,7 +8,7 @@