diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java index 66f2d8a2c382..f6577afeb23a 100644 --- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java +++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java @@ -52,68 +52,6 @@ public enum ViewHelper { private static final RenderUtils RENDER_UTILS = GlobalInstanceHolder.RENDER_UTILS; - /** - * List of pages that are updated to newer Bootstrap. - * @see ViewHelper#isBootstrapReady - * - * NB! This must be in sync with web/html/src/core/spa/view-helper.ts - */ - private static final List BOOTSTRAP_READY_PAGES = List.of( - "/rhn/YourRhn.do", - "/rhn/account/UserPreferences.do", - "/rhn/account/UserDetails.do", - "/rhn/account/ChangeEmail.do", - "/rhn/account/AccountDeactivation.do", - "/rhn/account/Addresses.do", - "/rhn/account/EditAddress.do", - "/rhn/multiorg/OrgConfigDetails.do", - "/rhn/manager/notification-messages", - "/rhn/channels/software/Search.do", - "/rhn/activationkeys/List.do", - "/rhn/manager/systems/list/all", - "/rhn/manager/contentmanagement/projects", - "/rhn/kickstart/cobbler/DefaultSnippetList.do", - "/rhn/systems/details/packages/PackageList.do", - "/rhn/software/channels/All.do", - "/rhn/manager/systems/ssm/coco/settings", - "/rhn/systems/ssm/audit/ScheduleXccdf.do", - "/rhn/systems/ssm/provisioning/PowerManagementConfiguration.do", - "/rhn/systems/details/kickstart/PowerManagement.do", - "/rhn/systems/ssm/provisioning/PowerManagementOperations.do", - "/rhn/channels/ChannelDetail.do", - "/rhn/software/packages/Details.do", - "/rhn/manager/systems/details/formulas", - "/rhn/manager/cm/imagestores", - "/rhn/manager/systems/details/highstate", - "/rhn/manager/systems/keys", - "/rhn/manager/audit/cve", - "/rhn/errata/Search.do", - "/rhn/audit/scap/Search.do", - "/rhn/manager/schedule/recurring-actions", - "/rhn/manager/schedule/maintenance/calendars", - "/rhn/manager/multiorg/recurring-actions", - "/rhn/manager/schedule/maintenance/schedules", - "/rhn/manager/admin/config/monitoring", - "/rhn/admin/config/GeneralConfig.do", - "/rhn/manager/admin/config/monitoring", - "/rhn/manager/admin/setup/products", - "/rhn/systems/details/SystemRemoteCommand.do", - "/rhn/manager/systems/details/highstate", - "/rhn/manager/systems/details/recurring-actions", - "/rhn/manager/cm/build", - "/rhn/admin/ScheduleDetail.do", - "/rhn/manager/systems/cmd", - "/rhn/kickstart/KickstartIpRanges.do", - "/rhn/channels/manage/repos/RepoCreate.do", - "/rhn/systems/details/Overview", - "/rhn/manager/formula-catalog", - "/rhn/errata/manage/CloneErrata.do", - "/rhn/admin/setup/ProxySettings.do", - "/rhn/admin/setup/MirrorCredentials.do", - "/rhn/manager/admin/setup/payg", - "/rhn/manager/storybook" - ); - ViewHelper() { } /** @@ -333,16 +271,4 @@ public boolean formulaValueEquals(Server server, String formulaName, String valu public boolean hasSshPushContactMethod(Server server) { return ContactMethodUtil.isSSHPushContactMethod(server.getContactMethod()); } - - /** - * Checks if the requested page is updated to newer Bootstrap. - * @param uri the page URI - * @return true if the URI is in the list of updated pages - * @deprecated this is a temporary hook that makes partial Bootstrap migration possible. Will be removed when the - * migration is finished. - */ - @Deprecated - public boolean isBootstrapReady(String uri) { - return true; - } } diff --git a/java/code/webapp/WEB-INF/decorators/layout_bare.jsp b/java/code/webapp/WEB-INF/decorators/layout_bare.jsp index 98046e3a75c9..3a760722e726 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_bare.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_bare.jsp @@ -13,18 +13,9 @@ - - - - - - - - - - "> + ">
diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp b/java/code/webapp/WEB-INF/decorators/layout_c.jsp index 573003e8c77d..9ef1b0be20fe 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp @@ -14,8 +14,7 @@ - - "> + ">
diff --git a/java/code/webapp/WEB-INF/decorators/layout_equals.jsp b/java/code/webapp/WEB-INF/decorators/layout_equals.jsp index 49044c9d12b0..f26f637cb886 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_equals.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_equals.jsp @@ -15,8 +15,7 @@ - - "> + "> diff --git a/java/code/webapp/WEB-INF/decorators/layout_error.jsp b/java/code/webapp/WEB-INF/decorators/layout_error.jsp index 9cf07169c115..f701df51d574 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_error.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_error.jsp @@ -54,8 +54,7 @@ - - "> + ">
diff --git a/java/spacewalk-java.changes.eth.remove-3 b/java/spacewalk-java.changes.eth.remove-3 new file mode 100644 index 000000000000..8745c9f67f07 --- /dev/null +++ b/java/spacewalk-java.changes.eth.remove-3 @@ -0,0 +1 @@ +- Reduced bundle size for the web UI diff --git a/web/html/src/branding/css/base/error.less b/web/html/src/branding/css/base/error.less deleted file mode 100644 index 9f77e96de68c..000000000000 --- a/web/html/src/branding/css/base/error.less +++ /dev/null @@ -1,16 +0,0 @@ -/* Error pages */ -.spacewalk-main-column-layout #error-page { - width: 100%; - .text-center; - .error-page-wrap { - margin-top: 7.5em; - width: 40%; - margin-right: auto; - margin-left: auto; - } -} -@media (max-width: @screen-tablet) { - .spacewalk-main-column-layout #error-page .error-page-wrap { - width: 100%; - } -} diff --git a/web/html/src/branding/css/base/fixes.less b/web/html/src/branding/css/base/fixes.less deleted file mode 100644 index da4eacb4f718..000000000000 --- a/web/html/src/branding/css/base/fixes.less +++ /dev/null @@ -1,26 +0,0 @@ -input[type="file"].form-control { - height: auto; -} - -/* fix for checkbox icon alignment */ -div.checkbox.icon-wrapper i.fa { - width: .6em; -} - -div.form-control { - &:extend(.old-theme .form-control[readonly]); -} - -/* fix for checkbox icon alignment */ -div.checkbox.icon-wrapper i.fa { - width: .6em; -} - -/* bsc#1009118 overlapping text when resizing */ -.auto-width { - width: auto; -} - -.auto-overflow { - overflow: auto; -} diff --git a/web/html/src/branding/css/base/forms.less b/web/html/src/branding/css/base/forms.less deleted file mode 100644 index 0d4992102d5b..000000000000 --- a/web/html/src/branding/css/base/forms.less +++ /dev/null @@ -1,50 +0,0 @@ -// These fixes make existing form layouts match between Bootstrap 3 and 5 -.form-group { - margin-bottom: 10px; -} - -label { - // TODO: Make this `inherit` after the Bootstrap upgrade is complete? - font-weight: 700; - margin-bottom: 0; - max-width: 100%; -} - -.radio label, -.checkbox label { - padding-left: 0; - font-weight: 400; -} - -input[type="radio"], -input[type="checkbox"] { - margin: 0; - vertical-align: -1px; - line-height: inherit; -} - -.radio input[type="radio"], -.radio-inline input[type="radio"], -.checkbox input[type="checkbox"], -.checkbox-inline input[type="checkbox"] { - position: relative; - margin: 0 5px 0 0; -} - -.form-horizontal { - .control-label { - padding-top: 8px; - margin-bottom: 0; - text-align: right; - - input[type="radio"] { - margin-right: 5px; - } - } - - .text { - padding-top: 8px; - margin-top: 0; - margin-bottom: 0; - } -} diff --git a/web/html/src/branding/css/base/hr.less b/web/html/src/branding/css/base/hr.less deleted file mode 100644 index 6f9bb2343a7a..000000000000 --- a/web/html/src/branding/css/base/hr.less +++ /dev/null @@ -1,7 +0,0 @@ -hr { - margin-top: 21px !important; - margin-bottom: 21px !important; - border: 0 !important; - border-top: 1px solid @eos-bc-gray-100 !important; - opacity: 1; -} diff --git a/web/html/src/branding/css/base/inputs.less b/web/html/src/branding/css/base/inputs.less deleted file mode 100644 index 9baa1f491994..000000000000 --- a/web/html/src/branding/css/base/inputs.less +++ /dev/null @@ -1,22 +0,0 @@ -// TODO: Move this into a scoped module, this doesn't really belong here - -/* Format of specific inputs */ -.input-ip-range { - .form-control; - width: 40px; - padding: 6px 6px; - display: inline-block; - margin-right: 5px -} -.dash-ip-range { - margin: 0 1em -} -.dot-ip-range { - vertical-align: bottom; - margin: 0 .2em; -} -.form-input-inline { - display: inline; - vertical-align: middle; - width: auto; -} diff --git a/web/html/src/branding/css/base/network.less b/web/html/src/branding/css/base/network.less deleted file mode 100644 index 3a4a61984d25..000000000000 --- a/web/html/src/branding/css/base/network.less +++ /dev/null @@ -1,45 +0,0 @@ -// TODO: Move this into a scoped module, this doesn't really belong here -// Represents network interfaces -.interface { - align-items: center; - display: flex; - .name { - font-weight: bold; - font-size: larger; - width: 20%; - } - .pciaddr { - width: 15%; - } - .mac { - padding-right: 2em; - } - .state-up, .state-down { - display: block; - margin-right: 8px; - height: 10px; - width: 10px; - } - - .state-down { - color: #c90813; - } - - .state-up { - color: #57a81c; - } -} - -.vlanEntry { - .form-group { - display: flex; - width: 50%; - } -} - -.network-address { - display: flex; - .network-prefix { - width: 30%; - } -} diff --git a/web/html/src/branding/css/base/notifications.less b/web/html/src/branding/css/base/notifications.less deleted file mode 100644 index e4eaf95111c6..000000000000 --- a/web/html/src/branding/css/base/notifications.less +++ /dev/null @@ -1,34 +0,0 @@ -#notifications { - > a:hover { - i { - color: @green; - } - } - - #notification-counter { - display: flex; - justify-content: center; - align-items: center; - background-color: @notification-badge; - position: absolute; - left: 19px; - top: -5px; - color: #333; - font-size: 0.9em; - min-width: 19px; - height: 19px; - padding: 0px 2px; - border-radius: 10px; - border: 1px solid #333; - } - #notification-counter.highlight-updated-value { - transform:scale(1.5,1.5); - } -} - -#notification-messages { - .btn-sm { - outline: none; - height: 33px; - } -} diff --git a/web/html/src/branding/css/base/responsive-rules.less b/web/html/src/branding/css/base/responsive-rules.less deleted file mode 100644 index 5897fb79f0cc..000000000000 --- a/web/html/src/branding/css/base/responsive-rules.less +++ /dev/null @@ -1,32 +0,0 @@ -@media (max-width: @screen-tablet) { - // TODO: Move this into the buttons module - form { - .btn, - .btn-success { - width: 100% - } - } - - .responsive-wizard { - .panel-body { - #mirror-credentials { - .panel, .panel:nth-of-type(2n) { - width: 100%; - margin-left: 0px; - margin-right: -15px; - } - margin-right: 0; - .panel-footer { - .row { - margin-right: 0; - margin-left: 0; - } - } - } - } - } - - .sideleg { - display: block !important; - } -} diff --git a/web/html/src/branding/css/base/setup-wizard.less b/web/html/src/branding/css/base/setup-wizard.less deleted file mode 100644 index a5d3c8a99703..000000000000 --- a/web/html/src/branding/css/base/setup-wizard.less +++ /dev/null @@ -1,320 +0,0 @@ -// responsive tabs -.responsive-wizard { - .panel-footer { - background-color: transparent; - } -} -body { - overflow-y: auto; -} - -// Setup Wizard -.responsive-wizard { - .panel { - box-shadow: 0px 2px 1px 0px @box-shadow; - -moz-box-shadow: 0px 2px 1px 0px @box-shadow; - -webkit-box-shadow: 0px 2px 1px 0px @box-shadow; - } - .panel-footer { - border-top: 0; - - .fa { - font-size: 1.5em; - } - } - form p { - padding-top: 7px; - margin: 0; - text-align: left; - } - a > i.fa { - color: @gray-dark; - } - a > i.fa.text-success { - color: @green; - } - a > i.fa.text-danger { - color: @red; - } - a > i.fa.text-warning { - color: @orange; - } - .text-starred, - a > i.fa.text-starred { - color: @orange; - } - //suse-products - #suse-products { - .btn-show-channel-list, - .btn-synchronize { - cursor: pointer; - } - .col-sm-9 table tbody.table-content tr.addons { - .addon-indented-icon { - border-left: 2px dotted @gray-dark; - border-bottom: 2px dotted @gray-dark; - width: 10px; - height: 10px; - display: inline-block; - margin-right: 10px; - margin-left: 5px; - } - } - .collapsible { - cursor: pointer; - } - table tr td.text-only { - padding-top: 14px; - } - table tr td [data-syncstatus="finished"], - table tr td [data-syncstatus="in_progress"], - table tr td [data-syncstatus="not_mirrored"] { - padding-top: 6px; - } - table tr td.add-button { - i { - margin-right: 0; - } - .label-container { - padding-top: 5px; - } - } - table td { - .product-channels-btn { - color: @gray-dark; - } - } - .spinner-container { - text-align: center; - padding: 30px 0; - } - } - //credentials - #mirror-credentials { - #listset-container { - display: flex; - flex-wrap: wrap; - gap: 1em; - } - - .panel { - flex-basis: calc(50% - 0.5em); - min-width: 300px; - height: 140px; - padding: 0; - vertical-align: top; - display: inline-flex; - flex-direction: column; - justify-content: space-between; - margin: 0; - - .panel-footer { - margin-top: auto; - } - - h3 { - margin-top: 0; - height: 41px; - overflow: x-scroll; - } - a:hover .fa, - a:hover { - text-decoration: none; - } - } - - .panel-inactive { - background: @white; - border: 1px solid @inactive; - text-align: center; - .fa-plus-circle { - font-size: 4em; - color: @gray; - text-shadow: -1px -1px 0px @gray-dark-1, 1px 1px 0px @white; - margin-top: 13px; - margin-right: 0; - } - a { - color: @gray; - } - } - } - - #wizard-faq { - display: flex; - flex-direction: column; - border-left: 1px solid @eos-bc-gray-100; - - img { - margin: 1em auto; - display: block; - } - } - - .panel[data-bs-target="#modal-edit-credentials"] { - cursor: pointer; - } -} - -ul.subscriptions-list { - list-style: none; - padding-left: 0; - margin-bottom: 0; -} - -#modal-list-subscriptions-body { - height: 300px; - overflow-y: auto; -} - -#modal-list-subscriptions-body + .modal-footer { - margin-top: 0; -} - -.btn-default.text-muted { - .text-muted !important; -} - -.list-header { - border-bottom: 2px solid @gray-light!important; - font-weight: 700; -} - -.row-odd { - background-color: @gray-light-1; -} -.row-even { - background-color: @white; -} - -ul.product-list { - list-style: none; - padding: 0; - margin: 0; - overflow: auto; - clear: both; - width: 100%; - li { - min-height: 3em; - line-height: 2em; - display: block; - overflow: auto; - border-bottom: 1px solid @gray-light; - .product-details-wrapper { - .recommended-tag { - .recommended-tag-base; - } - .text-muted { - .recommended-tag { - background-color: @gray-light; - } - } - .product-hover:hover { - color: @orange-light; - } - } - .product-details-wrapper:hover { - background-color: @gray-light; - } - .product-installed { - .product-description { - color: @green-dark; - } - .recommended-tag { - background-color: @gray-light; - color: @gray-dark; - } - } - .col { - display: inline-block; - vertical-align: middle; - padding: 0.7em 0.3em; - float: none; - * { - vertical-align: middle; - font-weight: normal; - margin: 0; - } - > * { - display: inline-block; - margin: 0.2em; - } - button, - i { - margin: 0 auto; - } - - &-description-width { - width: calc(100% - 29em); - } - } - } - li.list-row-odd { - .row-odd; - } - li.list-row-even { - .row-even; - } - ul { - border-top: 1px solid @gray-light; - padding: 0 0 1em 0; - li { - background-color: transparent !important; - border: 0; - margin-left: 3em; - > .product-details-wrapper { - border-top: 1px dashed @gray-light; - background-image: url("../../img/sub-list.png"); - background-repeat: no-repeat; - background-position: left center; - } - .col { - padding: 0.3em; - } - ul { - border-left: 1px solid @gray-light; - border-collapse: collapse; - } - } - li:first-of-type { - > .product-details-wrapper { - border-top: 0; - } - } - li:last-of-type { - > .product-details-wrapper { - background-image: url("../../img/sub-list-last.png"); - } - > ul { - border-left: 0; - } - } - } - ul.product-channel-list { - padding: 0; - margin: 0; - border: 0; - li { - list-style: disc; - border: none; - background: transparent; - padding: 0 1em; - margin: 0; - } - } -} - -.multiple-select-wrapper { - ul { - border: 0; - input { - width: 100%; - height: 30px !important; - .form-control; - } - } -} - -.spacewalk-section-toolbar { - margin-top: 0; -} diff --git a/web/html/src/branding/css/base/tables.less b/web/html/src/branding/css/base/tables.less deleted file mode 100644 index c9d27699224e..000000000000 --- a/web/html/src/branding/css/base/tables.less +++ /dev/null @@ -1,80 +0,0 @@ -.table > thead > tr.active > th { - background: @gray-lighter; -} - -td { - overflow: hidden; -} - -.table-framed td, -.table-framed th { - border: 2px solid @gray-lighter; - padding: 5px; -} -.table-framed hr { - margin: 0px; -} - -.table thead > tr > td{ - padding: 0 -} - -// colour to the head, except for when it is the last TR in the thead (it will be white) -thead tr{ - background: #e7e7e7; - &:last-of-type{ - background: #ffffff; - } -} -// Colour to the tfoot -tfoot{ - background: #f3f3f3 -} -.panel .table{ - margin-bottom: 0; -} - -tr.alphaResult td.sortedCol:before { - content: "\f054\a0"; - font-family: 'FontAwesome'; -} - -th.ascSort a:after, th.ascSort button:after { - content: " \f160"; - font-family: 'FontAwesome'; -} - -th.descSort a:after, th.descSort button:after { - content: " \f161"; - font-family: 'FontAwesome'; -} - -th button.btn-link{ - font-weight: bold; -} - -.compare-list { - border: 1px solid #DDDDDD; - width: 100%; -} - -.compare-list th { - padding: 10px 0px 10px 10px; -} - -.compare-list input[type="submit"] { - margin: 5px 0px 5px 15px; -} - -.compare-list td:first-child { - background-color: #e2e2e2 !important; - border-right: 1px solid #DDDDDD; -} - -.span-ssm-marg { - margin-left: 7px; -} - -.vertical-middle td { - vertical-align: middle !important; -} diff --git a/web/html/src/branding/css/base/theme.less b/web/html/src/branding/css/base/theme.less deleted file mode 100644 index 430065a8f2bc..000000000000 --- a/web/html/src/branding/css/base/theme.less +++ /dev/null @@ -1,1305 +0,0 @@ -/** - * This file is the old core theme file, over time we can hopefully clean this up and separate the logic accordingly - */ - -a { - color: @link-color; - cursor: pointer; - text-decoration: none; - - &:hover { - text-decoration: underline; - } -} - -header { - min-height: fit-content !important; - height: auto; - width: 100%; - border: none; - border-radius: 0; - border-width: 0 !important; - border-bottom: 2px solid @header-border !important; - margin-bottom: 0; - background: @header; - - a { - color: @header-text; - } - - a:hover { - color: @header-text; - } - - img { - float: left; - } -} - -.spacewalk-main-column-layout { - position: relative; - display: flex; - flex: 1 1 auto; - overflow: hidden; - max-width: 100vw; - - aside { - overflow: auto !important; - float: none !important; - position: relative !important; - - @media (max-width: @screen-tablet) { - position: absolute !important; - inset: 0; - z-index: 2000; - min-width: 100% !important; - max-width: none !important; - } - - footer { - position: -webkit-sticky; - position: sticky; - bottom: 0; - } - } - - section { - width: 100% !important; - float: none !important; - } - - #page-body { - flex: 1 1 auto; - overflow: auto; - } -} - -// TODO: Check if we need this? -// .row { -// margin-left: 0; -// margin-right: 0; -// } - -footer { - border-top: 1px solid @aside-footer-border; - background: inherit; - padding: 3px 12px; - color: @aside-footer-text; - font-weight: normal; - font-size: 0.9em; - height: auto; - min-height: auto; - clear: both; - position: absolute; - bottom: 0px; - width: 100%; - .make-row(0); - - a { - color: inherit; - text-decoration: underline; - } - - a:hover { - color: inherit; - } - - /* override spacewalk rules */ - div:nth-child(1), - div:nth-child(2) { - float: none; - width: 100%; - margin: 0; - min-height: auto; - text-align: left !important; - padding: 0; - } - - div.wrapper { - background: @aside-footer-logo-background; - min-height: 28px; - padding-right: 55px !important; - > div { - padding: 3px 0 2px 0; - } - } -} - -/* override spacewalk rules */ -section { - transition: none !important; - -webkit-transition: none !important; -} - -.spacewalk-main-column-layout { - .make-row(0); - /* override the grid row margin */ - margin-right: 0; - margin-left: 0; - aside { - flex: 0 0 17%; - min-width: 300px; - max-width: min(400px, 17%); - background: @aside-background; - border-right: none; - /* erasing the predefined paddings in the columns */ - padding: 0; - position: fixed; - #nav nav ul.level1 { - overflow-y: auto !important; - scrollbar-color: rgba(200, 200, 200, 0.5) transparent; - scrollbar-width: thin; - - &::-webkit-scrollbar { - width: 7px; - } - - &::-webkit-scrollbar-thumb { - border-radius: 10px; - -webkit-box-shadow: inset 0 0 6px rgba(200, 200, 200, 0.5); - background: rgba(200, 200, 200, 0.5); - } - } - } - - /* fixing margins in the 1st and last columns */ - section { - .make-xs-column(10); - padding: @content-area-padding; - float: right; - } -} - -#breadcrumb { - color: @header-text; - display: inline-block; - overflow: hidden; - text-overflow: ellipsis; - - span { - vertical-align: bottom; - } - span.level, - a { - padding: 0 3px; - } - i { - margin-right: 0; - } -} - -.navbar-right { - float: right; -} - -.navbar-collapse { - display: flex; - flex-direction: column; - - #nav { - display: flex; - flex-direction: column; - flex: 1 1 auto; - overflow: hidden; - - nav { - display: flex; - flex-direction: column; - overflow: hidden; - - > ul { - flex: 1 1 auto; - margin: 0 !important; - } - } - } - - &.in { - display: flex !important; - } - - &.collapse { - display: none !important; - } -} - -header, -nav.navbar-pf { - .navbar-toggle { - display: inline-block; - float: none; - margin: 0; - padding: 0; - border: none; - - i { - margin: 0; - font-size: 1.5em; - } - } - .navbar-toggle:hover { - color: @green; - } - .navbar-header { - float: none; - display: inline-block; - vertical-align: top; - margin-right: 5px; - } - .navbar-controls { - .navbar-right; - font-size: 1em; - display: inline-block; - position: relative; - vertical-align: middle; - margin-top: -2px; - - a, - .header-non-link { - display: inline-block; - padding: 4px 12px; - border-radius: 2px; - - i { - margin: 0 !important; - } - } - } - - a.toggle-box:hover, - a.toggle-box.open, - .manual-toggle-box:hover, - .manual-toggle-box.open { - color: @green; - } - .box-wrapper { - position: absolute; - top: 100%; - background-color: @header; - border-radius: 0px 2px 2px 2px; - z-index: 1000; - box-shadow: 0px 4px 4px 0px @gray; - margin-top: 5px; - } - - /* overwrite the padding the grid columns give */ - &#header { - padding-right: 0; - padding-left: 0; - } - /* Search header box */ - form#search-form { - .form-group { - width: 200px; - padding: 10px; - display: flex; - flex-direction: column; - gap: 4px; - margin: 0; - } - input[type="search"], - select.form-control { - width: 100%; - } - button { - text-align: center; - background: transparent; - - &, - &:hover { - color: @header-text; - } - } - } - - /* Header Logo bar */ - .navbar-brand { - margin: 0 !important; - float: none; - padding: 0; - height: auto; - line-height: 1.2em; - font-size: 1.6em; - display: inline-block; - vertical-align: baseline; - color: @header-text; - > i { - display: none; - } - > span > i { - font-size: 0.4em; - margin-right: 0.8em; - } - } - .navbar-brand:hover { - color: @header-text; - } -} - -#scroll-top { - display: none; - position: fixed; - bottom: 5px; - right: 3px; - cursor: pointer; - z-index: 1000; - border-radius: 20px; - width: 35px; - height: 35px; - font-size: 1.5em; - padding: 0; - text-align: center; - background-color: rgba(77, 211, 167, 0.2); - color: @gray-dark; - border: 1px solid rgba(0, 192, 129, 0.2); - i { - margin: 0 auto; - height: 26px; - } -} -#scroll-top:hover { - background-color: rgba(0, 192, 129, 0.9); - color: @gray-light; - border: 1px solid darken(@green, 10%); -} - -//Nav menu in left column -#nav { - font-size: 1.1em; - //Search box - .nav-tool-box { - text-align: center; - position: relative; - - input, - button { - margin: auto; - vertical-align: top; - } - - input { - background-color: @aside-background; - border-color: @aside-search-border !important; - border-style: solid; - border-radius: 0 !important; - border-width: 0 0 1px 0; - padding-right: 3em; - height: 3em; - color: @aside-search-text-color !important; - - &::placeholder { - color: rgba(@aside-search-text-color, 0.75); - } - } - - input:focus { - box-shadow: none; - } - .input-right-icon { - color: @aside-menu-search-clear; - position: absolute; - top: 6px; - right: 2px; - font-size: 1.2em; - cursor: pointer; - padding: 0; - } - .input-right-icon:hover { - color: @aside-menu-search-clear-hover; - } - } - //Menu - nav { - ul { - padding: 0; - list-style: none; - display: block; - li { - padding: 0; - list-style: none; - font-size: 1em; - display: block; - div { - a { - padding: 6px 10px; - } - } - } - li.node.open { - > ul { - display: block; - } - } - // active - li.active > .leafLink { - border-left-color: @aside-menu-active; - } - // nodeLink and leafLink - div.nodeLink, - div.leafLink { - color: @aside-menu-text; - border-left: 5px solid transparent; - a { - display: block; - color: inherit; - width: auto; - } - } - div.nodeLink:hover, - div.leafLink:hover { - border-left-color: @green; - } - // nodeLink only - div.nodeLink { - position: relative; - > i { - font-size: 1.2em; - vertical-align: text-bottom; - } - > i.submenuIcon { - font-size: 1.1em; - position: absolute; - right: 0.5em; - top: 0.3em; - } - > a { - display: inline-block; - } - > a:hover { - color: @aside-menu-text; - } - } - } - /* First Level */ - > ul { - > li { - > div { - > a { - padding: 10px 4px; - } - } - > div.nodeLink { - padding-left: 1em; - > i.submenuIcon { - top: 0.6em; - } - } - /* Second Level */ - > ul { - padding-bottom: 25px; - > li { - > div { - > a { - padding-left: 3em; - } - } - /* Third Level */ - > ul { - > li { - > div { - > a { - padding-left: 4.4em; - } - } - /* Fourth Level */ - > ul { - > li { - > div { - > a { - padding-left: 5.8em; - } - } - } - } - } - } - } - } - } - } - } - .collapsed { - ul ul { - display: none; - } - } -} - -.spacewalk-list .spacewalk-list-top-addons .spacewalk-list-pagination { - float: right; - width: auto; - margin-bottom: 18px; -} - -//PAGINATOR from 0 - 9 and A - Z -.spacewalk-list .spacewalk-list-head-addons .spacewalk-list-alphabar, -.spacewalk-list .spacewalk-list-top-addons .spacewalk-list-alphabar { - padding: 0; - padding-bottom: 0.5em; - float: left; - width: auto; - margin-top: 5px; - margin-left: 10px; - .dropdown-menu { - display: none; - width: auto; - right: 0; - min-width: 100px; - z-index: 10; - max-height: 250px; - overflow-y: auto; - text-align: right; - li { - display: block; - padding: 0 1px; - a { - display: block; - border: 0px; - color: @link-color; - padding: 2px 20px; - } - } - li.disabled { - a { - color: #aaa; - } - } - li:nth-child(11) { - border-top: 1px solid #dddddd; - } - } - .dropdown.dropdown-alphabar.open { - .dropdown-menu { - display: block; - } - } -} - -// Filter by system: button besides the input search -.spacewalk-button-filter { - border-left: 0; - color: #666666; - background-color: #ffffff; - border-color: #cccccc; - margin-left: 8px !important; -} - -.spacewalk-list { - .spacewalk-list-head-addons { - .spacewalk-list-head-addons-extra { - float: right; - width: auto; - } - } -} - -//Table's filters -.filter-input { - padding: 0.7em; - .col-md-3 { - padding-left: 0; - } - .col-md-9 { - padding-right: 0; - } -} -.view-systems-registered { - .input-sm; - width: 10em; - display: inline-block; - border: 1px solid #dddddd; -} - -/* Icons Legend */ -.sideleg { - background: @icon-legend; - color: @icon-legend-text; - padding: 0.5em 1em; - border-radius: 0px 0px 4px 4px; - .hidden-sm; - .hidden-xs; - li { - list-style: none; - margin: 0.5em 0; - padding: 0; - white-space: nowrap; - } - ul { - margin: 0; - padding: 0; - } -} - -/* question symbol for help pop up*/ -h1 .fa-stack .fa-question { - font-size: 0.6em; -} -h1 .fa-stack { - width: 1em; - height: 1em; - line-height: 0.7em; -} -.fa-stack .fa-circle { - font-size: 0.7em; -} - -// Panels: reseting default margins and paddings in H tags -.panel .panel-heading { - h1, - h2, - h3, - h4, - h5, - h6 { - padding: 0; - margin: 0; - } -} -//Panels: deleting border-top in the first row of a table contained within a Panel class -.panel-body tr:first-child { - td, - th { - border-top: 0; - } -} - -/* systems selected tool*/ -.spacewalk-toolbar > a, -#spacewalk-bar-off i { - cursor: pointer; -} -#show-systems-bar { - padding: 0.5em 1.2em; - background: #fff; - border: 1px solid #ccc; - border-radius: 0 0 4px 4px; -} - -/* spacewalk toolbar: contains the H1 of each page + the toolbar */ -.spacewalk-toolbar-h1 { - margin-bottom: 1.5em; - .spacewalk-toolbar { - .pull-right; - padding: 0.5em 1em; - a { - border-right: 1px solid @gray-light; - padding: 0 0.5em; - } - a:hover { - text-decoration: none; - } - a:last-child { - border-right: 0; - } - } -} - -/* Margins to elements */ -//margins bottom -.margin-bottom-xs { - margin-bottom: 0.5em; -} -.margin-bottom-sm { - margin-bottom: 1em; -} -.margin-bottom-md { - margin-bottom: 2em; -} -.margin-bottom-lg { - margin-bottom: 3em; -} -//margins top -.margin-top-xs { - margin-top: 0.5em; -} -.margin-top-sm { - margin-top: 1em; -} -.margin-top-md { - margin-top: 2em; -} -.margin-top-lg { - margin-top: 3em; -} - -/* adding margin to the icons in fontawesome */ -i[class~="fa"], -i[class^="icon-"], -i[class*=" icon-"], -i[class*="spacewalk-icon"], -i[class^="spacewalk-icon"] { - margin-right: 0.5em; -} -/* if the icon is inside a H tag the margin is a bit smaller*/ -h1, -h2, -h3, -h4, -h5, -h6 { - i[class~="fa"], - i[class^="icon-"], - i[class*=" icon-"], - i[class^="fa-"], - i[class*="spacewalk-icon"], - i[class^="spacewalk-icon"] { - margin-right: 0.3em; - } -} -/* use this class to add text to the left of an icon */ -i[class~="fa-right"] { - margin-left: 0.5em; - margin-right: 0em; -} - -// icon size smaller than the ones default by Font Awesome -.fa-1-5x { - font-size: 1.3em; -} -.fa-1-5x.icon-border { - border-width: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -// data lists - -.spacewalk-list { - .spacewalk-list-top-addons { - margin-bottom: 0; - padding-top: 0; - } - - .spacewalk-list-footer-addons { - .make-row(0); - .spacewalk-list-footer-addons-extra { - .pull-left; - .text-left; - } - } -} - -.spacewalk-csv-download { - .pull-right; -} - -/* btn with margin top and bottom */ -.btn.spacewalk-btn-margin-vertical { - margin: 1em 0; -} - -// Rewriting -// Jumbotron -// -------------------------------------------------- - -.jumbotron { - padding: @jumbotron-padding; - margin-bottom: @jumbotron-padding; - font-size: (@font-size-base * 1.3); - line-height: (@line-height-base * 1.5); - background-color: transparent; - border: 1px solid #ccc; - - h1 { - line-height: 1; - } - p { - line-height: 1.4; - } - - @media screen and (min-width: @screen-tablet) { - padding-top: (@jumbotron-padding * 1); - padding-bottom: (@jumbotron-padding * 1); - - .container & { - padding-left: (@jumbotron-padding * 2); - padding-right: (@jumbotron-padding * 2); - } - - h1 { - font-size: (@font-size-base * 3.5); - } - } -} - -/* Create new Admin User form. -This class will align the text inside the tables of each panel in the form with name="createSatelliteForm" -*/ -form[name="createSatelliteForm"] table { - text-align: left; -} -//giving top margin to the panels -form[name="createSatelliteForm"] .panel { - margin-top: 30px; -} - -/* Hack for when an Aside doesnt have any content to not brake the theme */ -#aside:after { - content: "."; - color: #232526; -} - -/* CVE audit */ -select[name="cveIdentifierYear"]#cveIdentifierYear { - -webkit-appearance: button; - -webkit-padding-end: 20px; - background: url("../../img/dropdown-arrow.jpg") #fff no-repeat right center; - cursor: pointer; - display: inline-block; - min-width: 80px; - -moz-appearance: none; - text-indent: 0.01px; - text-overflow: ""; -} -input[name="cveIdentifierId"]#cveIdentifierId { - min-width: 120px; -} -.popover-content { - font-weight: normal; -} -.popover-content ul { - padding: 0.3em; - list-style-position: inside; -} -.popover-content ul li { - margin-top: 0.5em; -} - -i.spacewalk-help-link { - font-size: 16px; -} - -/* after pattern fly - fixes (more like workarounds) */ -.navbar-pf { - margin: 0; - border-radius: 0 !important; - - ul.navbar-controls { - > li { - margin: 0; - clear: none; - color: @header-text; - vertical-align: top; - border-radius: 2px; - - a:hover, - a:focus { - background-color: transparent; - text-decoration: underline; - } - a[role="button"]:hover, - a[role="button"]:focus { - color: @green; - } - button.is-plain { - background-color: transparent; - color: @header-text; - } - button.is-plain:hover { - background-color: transparent; - color: @green; - } - } - } - .wrap nav.option li.active { - border-bottom: 4px solid transparent; - } -} - -/* Override rules from bootstrap for nav-tabs*/ -.nav-tabs { - li { - min-width: 60px; - a, - a:focus { - border: none; - padding: 6px 12px 1px; - display: inline-block; - color: @link-color; - font-size: 1.1em; - border-width: 0 0 5px 0; - border-style: solid; - border-color: transparent; - margin-right: 10px; - } - a:hover { - background: inherit; - border-width: 0 0 3px 0; - border-color: @eos-bc-gray-500; - padding-bottom: 3px; - } - } - li.active { - a, - a:hover, - a:focus { - border-width: 0 0 5px 0; - border-color: @green; - color: @gray; - background: inherit; - padding-bottom: 1px; - } - } -} - -/* Override rules from theme.less that uses -"PatternFly-webicon" icons for alert boxes decoration */ -.alert:before, -.alert:after { - font-family: "spacewalk-icon"; - top: 15px; -} - -// TODO: Clean this up and separate for Uyuni and Suma - -.alert-info, -.alert-success, -.alert-warning, -.alert-danger { - position: relative; -} - -.alert-info:before { - content: "\e63e"; - color: #306899; -} - -.alert-info:after { - content: ""; - color: transparent; -} - -.alert-success:before { - content: "\e63d"; - color: #57a81c; -} - -.alert-success:after { - content: ""; - color: transparent; -} - -.alert-warning:before { - content: "\e63f"; - color: #eb7720; -} - -.alert-warning:after { - content: ""; - color: transparent; -} - -.alert-danger:before { - content: "\e640"; - color: #c90813; -} - -.alert-danger:after { - content: ""; - color: transparent; -} - -.list-group-item-text.formula-description { - padding-left: 42px; - padding-top: 10px; - color: #777; -} - -.input-group.small-color-picker { - width: 130px; -} - -time:hover { - text-decoration: underline; - text-decoration-style: dashed; - cursor: default; -} - -a time:hover { - cursor: pointer !important; -} - -.spacewalk-section-toolbar-button { - margin-top: 10px; - margin-bottom: 10px; - width: auto; -} -.spacewalk-section-toolbar { - overflow: auto; - border: 1px solid #ddd; - padding: 0 5px; - margin-top: 15px; - margin-bottom: 5px; - background: @eos-bc-gray-50; - .action-button-wrapper { - float: right; - overflow: auto; - - button, - input, - .btn { - .spacewalk-section-toolbar-button; - } - } - .selector-button-wrapper { - display: inline-block; - margin-left: 5px; - button, - input, - .btn { - .spacewalk-section-toolbar-button; - } - } - .spacewalk-list-pagination { - display: inline-block; - margin: 1.2em 1em; - .spacewalk-list-pagination-btns { - padding-left: 0.5em; - } - } - > .btn-group { - margin: 10px; - } -} -.spacewalk-section-toolbar.fixed { - position: fixed; - z-index: 900; - padding-left: 1em; - padding-right: 1em; - margin-top: 0px; - - .form-group { - margin-bottom: 0; - } - .spacewalk-list-pagination { - margin-bottom: 1.2em; - } -} -.spacewalk-scheduler { - margin-top: 15px; -} - -.remaining-length-wrapper { - margin-right: 10px; - margin-top: 5px; - margin-bottom: -18px; - color: @gray-dark; -} - -// overrides errata icon styles -.errata-low { - color: @gray; -} -.errata-moderate { - color: @yellow; -} -.errata-important { - color: @orange; -} -.errata-critical { - color: @red; -} -.errata-retracted { - color: @red; -} - -/** -* Simulate bootstrap 4 rule behavior -* -* Note: keep this as a single style rule -*/ -.d-inline-block { - display: inline-block; -} -.d-block { - display: block; - overflow: auto; -} - -.pointer { - cursor: pointer; -} - -.cursor-default { - cursor: default; -} - -i.fa.pointer { - min-width: 1em; -} - -.v-middle { - vertical-align: middle; -} - -/** -* use these classes to fix progress bar -* to let the text overlaps the progress bar behind -*/ -.progress-bar-wrapper { - position: relative; - text-align: center; - margin-bottom: 0; - line-height: 1.3em; - .progress-bar-text { - position: absolute; - width: 100%; - height: 100%; - top: 0; - left: 0; - } - .progress-bar { - background-color: @green; - } -} - -/** -* behave as a table -*/ -.table-style { - display: table; - border-collapse: collapse; - .table-row { - display: table-row; - .table-col { - display: table-cell; - border: 1px solid @gray-light; - padding: 0.2em; - vertical-align: middle; - } - } -} - -.tag-base { - padding: 0 0.5em; - border-radius: 2px; - font-size: 85%; -} - -.recommended-tag-base { - .tag-base; - background-color: @yellow; -} - -.mandatory-tag-base { - .tag-base; - background-color: @red; - color: white; -} - -.line-separator { - height: 1px; - background-color: @gray-light; - width: 100%; - margin: 0.5em auto; - display: inline-block; -} - -input:disabled + label { - cursor: not-allowed; - color: @gray; -} - -select.small-select { - height: 1.8em; - line-height: 1.8em; - padding: 0 0.5em; - width: auto; - text-align: center; -} - -.react-hot-loader-error-overlay { - position: fixed; - z-index: 1000; -} - -/*Colapsed pannels*/ - -.panel-heading, -.collapsible-content { - .collapsed { - .hide-on-collapsed { - display: inline; - } - - .show-on-collapsed { - display: none; - } - } - - .hide-on-collapsed { - display: none; - } - - .show-on-collapsed { - display: inline; - } - - .accordion-toggle { - cursor: pointer; - } -} - -.text-truncate { - text-overflow: ellipsis; -} - -.no-padding { - padding: 0; -} - -.link-tag { - display: inline-block; - padding: 2px 4px; - border: 1px solid #ccc; - margin: 0 3px; - border-radius: 1px; - background-color: #eee; - color: inherit; -} - -// Represents bootstrap 4.0+ spacing / alignment -.pl-4 { - padding-left: 1.5rem; -} - -.pl-0 { - padding-left: 0; -} - -.align-middle { - align-items: center; - display: flex; -} - -// Make FullCalendar buttons use our buttons style -.fc button.fc-button, -.fc button.fc-button-primary { - .btn; - .btn-default; -} - -// Highlight FullCalendar month grid cells on hover -.fc-daygrid-day-frame:hover { - cursor: pointer; - background-color: fadeout(@gray, 70%); -} - -tr.changed > td { - background-color: @table-row-selected!important; -} - -// let a button has a div style -.div-button { - display: block; - width: 100%; - border: none; - text-align: left; -} - -// We can reenable these after the theme migration is complete -#scroll-top, -#legend-box-wrapper { - display: none !important; -} diff --git a/web/html/src/branding/css/base/tools.less b/web/html/src/branding/css/base/tools.less deleted file mode 100644 index 4f3296ef3c6e..000000000000 --- a/web/html/src/branding/css/base/tools.less +++ /dev/null @@ -1,43 +0,0 @@ -/* Progress Bar for the password strength check */ -.progress-pwstrength { - margin-bottom: 0; - margin-top: 4px; -} -.error-list { - padding-left: 1px; -} - -/** config mgmt feature file diff styles **/ - -.oldfile { - float: left; - width: 48%; - font-family: 'monospace'; -} - -.newfile { - float: right; - width: 48%; - font-family: 'monospace'; -} - -.changed { - background-color: #f5f3c4; -} - -.oldfile .deleted { - background-color: #f5c4c4; -} - -.newfile .deleted { - background-color: #d4d4d4; -} - -.oldfile .inserted { - background-color: #d4d4d4; -} - -.newfile .inserted { - background-color: #c5f4c4; -} - diff --git a/web/html/src/branding/css/body.less b/web/html/src/branding/css/body.less deleted file mode 100644 index 6cba92e25395..000000000000 --- a/web/html/src/branding/css/body.less +++ /dev/null @@ -1,23 +0,0 @@ -// NB! This must be in sync between the old and the new theme! -html, -body { - height: 100%; - min-height: 100%; - min-width: fit-content; - margin: 0; - max-height: 100%; - overflow: hidden; -} - -html { - font-size: 10px; -} - -body { - font-size: 14px; -} - -* { - box-sizing: border-box; -} - diff --git a/web/html/src/branding/css/bootstrap5-grid-patch.scss b/web/html/src/branding/css/bootstrap-grid-patch.scss similarity index 80% rename from web/html/src/branding/css/bootstrap5-grid-patch.scss rename to web/html/src/branding/css/bootstrap-grid-patch.scss index 90023b0dedc6..3ce55c5902d3 100644 --- a/web/html/src/branding/css/bootstrap5-grid-patch.scss +++ b/web/html/src/branding/css/bootstrap-grid-patch.scss @@ -1,8 +1,8 @@ -@import "bootstrap5/scss/bootstrap-grid.scss"; +@import "bootstrap/scss/bootstrap-grid.scss"; /** * This allows us to fix layouts on Bootstrap 5 pages without affecting Bootstrap 3 pages. - * For now this reimplements the relevant part from web/html/src/node_modules/bootstrap5/scss/_grid.scss + * For now this reimplements the relevant part from web/html/src/node_modules/bootstrap/scss/_grid.scss * TODO: After we finish the migration, we should be able to remove these classes and just use `row` everywhere */ .form-group, diff --git a/web/html/src/branding/css/bootstrap5-scaffolding-variables.scss b/web/html/src/branding/css/bootstrap-scaffolding-variables.scss similarity index 100% rename from web/html/src/branding/css/bootstrap5-scaffolding-variables.scss rename to web/html/src/branding/css/bootstrap-scaffolding-variables.scss diff --git a/web/html/src/branding/css/clearfix.less b/web/html/src/branding/css/clearfix.less deleted file mode 100644 index 36e0a53c74db..000000000000 --- a/web/html/src/branding/css/clearfix.less +++ /dev/null @@ -1,9 +0,0 @@ -.clearfix:before, .clearfix:after, .dl-horizontal dd:before, .dl-horizontal dd:after, .container:before, .container:after, .container-fluid:before, .container-fluid:after, .row:before, .row:after, .form-horizontal .form-group:before, .form-horizontal .form-group:after, .btn-toolbar:before, .btn-toolbar:after, .btn-group-vertical > .btn-group:before, .btn-group-vertical > .btn-group:after, .nav:before, .nav:after, .navbar:before, .navbar:after, .navbar-header:before, .navbar-header:after, .navbar-collapse:before, .navbar-collapse:after, .pager:before, .pager:after, .panel-body:before, .panel-body:after, .modal-header:before, .modal-header:after, .modal-footer:before, .modal-footer:after, footer:before, footer:after, .spacewalk-main-column-layout:before, .spacewalk-main-column-layout:after, .spacewalk-list .spacewalk-list-footer-addons:before, .spacewalk-list .spacewalk-list-footer-addons:after, .header-responsive .header-container:before, .header-responsive .header-container:after { - display: table; - content: " "; -} - -.clearfix:after, .dl-horizontal dd:after, .container:after, .container-fluid:after, .row:after, .form-horizontal .form-group:after, .btn-toolbar:after, .btn-group-vertical > .btn-group:after, .nav:after, .navbar:after, .navbar-header:after, .navbar-collapse:after, .pager:after, .panel-body:after, .modal-header:after, .modal-footer:after, footer:after, .spacewalk-main-column-layout:after, .spacewalk-list .spacewalk-list-footer-addons:after, .header-responsive .header-container:after { - clear: both; -} - diff --git a/web/html/src/branding/css/mixins.less b/web/html/src/branding/css/mixins.less deleted file mode 100644 index c890e7022ca0..000000000000 --- a/web/html/src/branding/css/mixins.less +++ /dev/null @@ -1,14 +0,0 @@ -.onSuma(@styles) { - & when (@theme = "susemanager-light") { - @styles(); - } - & when (@theme = "susemanager-dark") { - @styles(); - } -} - -.onUyuni(@styles) { - & when (@theme = "uyuni") { - @styles(); - } -} diff --git a/web/html/src/branding/css/susemanager-dark-variables.less b/web/html/src/branding/css/susemanager-dark-variables.less deleted file mode 100644 index bda85adfe709..000000000000 --- a/web/html/src/branding/css/susemanager-dark-variables.less +++ /dev/null @@ -1,8 +0,0 @@ -@import "susemanager-light-variables.less"; - -@aside-background: @eos-bc-pine-500; -@aside-menu-text: @eos-bc-white; -@aside-search-text-color: @eos-bc-white; -@aside-footer-text: @eos-bc-white; -@aside-footer-border: @eos-bc-dt-gray-700; -@aside-search-border: @eos-bc-dt-gray-700; diff --git a/web/html/src/branding/css/susemanager-dark.less b/web/html/src/branding/css/susemanager-dark.less deleted file mode 100644 index 4758828b92fe..000000000000 --- a/web/html/src/branding/css/susemanager-dark.less +++ /dev/null @@ -1,25 +0,0 @@ -@theme: "susemanager-dark"; - -@import "./body.less"; -@import "./susemanager/fonts.less"; - -.old-theme { - @import url(bootstrap/less/bootstrap.less); - - @import "clearfix.less"; - @import "mixins.less"; - @import "susemanager/variables.less"; - @import "susemanager-dark-variables.less"; - - display: flex; - flex-direction: column; - background: @body-background; - font-family: @body-font; - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; - font-size: @font-size-base; - line-height: 1.5; - color: @body-color; - - @import "susemanager/index.less"; -} diff --git a/web/html/src/branding/css/susemanager-dark.scss b/web/html/src/branding/css/susemanager-dark.scss index 0cf1b22870ab..a8ef08cc6ed6 100644 --- a/web/html/src/branding/css/susemanager-dark.scss +++ b/web/html/src/branding/css/susemanager-dark.scss @@ -3,11 +3,11 @@ $theme: "susemanager-dark"; @import "./body.scss"; @import "./fonts.scss"; -@import "./bootstrap5-scaffolding-variables.scss"; +@import "./bootstrap-scaffolding-variables.scss"; .new-theme { - @import "./bootstrap5-grid-patch.scss"; - @import "bootstrap5/scss/bootstrap"; + @import "./bootstrap-grid-patch.scss"; + @import "bootstrap/scss/bootstrap"; @import "./mixins.scss"; @import "./susemanager/variables.scss"; diff --git a/web/html/src/branding/css/susemanager-fullscreen.less b/web/html/src/branding/css/susemanager-fullscreen.less deleted file mode 100644 index 3e71389d3278..000000000000 --- a/web/html/src/branding/css/susemanager-fullscreen.less +++ /dev/null @@ -1,29 +0,0 @@ -@import url(bootstrap/less/bootstrap.less); - -/* Manually map Bootstrap's fonts since our setup is a bit unorthodox */ -@icon-font-path: "../../bootstrap/fonts/"; - -body { - height: 100%; -} -html, -body { - height: 100%; -} - -.spacewalk-main-column-layout { - height: 100%; - /* override the grid row margin */ - margin-right: 0; - margin-left: 0; - - /* fixing margins in the 1st and last columns */ - section { - width: 100%; - height: 100%; - padding-left: 0em; - padding-right: 0em; - padding-top: 0; - padding-bottom: 0em; - } -} diff --git a/web/html/src/branding/css/susemanager-light-variables.less b/web/html/src/branding/css/susemanager-light-variables.less deleted file mode 100644 index f240eb76edc1..000000000000 --- a/web/html/src/branding/css/susemanager-light-variables.less +++ /dev/null @@ -1,9 +0,0 @@ -@body-color: @eos-bc-gray-1000; -@body-font: @lato; -@link-color: @eos-bc-blue-500; - -@border-radius-base: 0; -@border-radius-large: 0; -@border-radius-small: 0; - -@content-area-padding: 0 4em 4em; diff --git a/web/html/src/branding/css/susemanager-light.less b/web/html/src/branding/css/susemanager-light.less deleted file mode 100644 index 48619ccfa990..000000000000 --- a/web/html/src/branding/css/susemanager-light.less +++ /dev/null @@ -1,25 +0,0 @@ -@theme: "susemanager-light"; - -@import "./body.less"; -@import "./susemanager/fonts.less"; - -.old-theme { - @import url(bootstrap/less/bootstrap.less); - - @import "clearfix.less"; - @import "mixins.less"; - @import "susemanager/variables.less"; - @import "susemanager-light-variables.less"; - - display: flex; - flex-direction: column; - background: @body-background; - font-family: @body-font; - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; - font-size: @font-size-base; - line-height: 1.5; - color: @body-color; - - @import "susemanager/index.less"; -} diff --git a/web/html/src/branding/css/susemanager-light.scss b/web/html/src/branding/css/susemanager-light.scss index efed877103b9..8bffb1be9ca3 100644 --- a/web/html/src/branding/css/susemanager-light.scss +++ b/web/html/src/branding/css/susemanager-light.scss @@ -3,11 +3,11 @@ $theme: "susemanager-light"; @import "./body.scss"; @import "./fonts.scss"; -@import "./bootstrap5-scaffolding-variables.scss"; +@import "./bootstrap-scaffolding-variables.scss"; .new-theme { - @import "./bootstrap5-grid-patch.scss"; - @import "bootstrap5/scss/bootstrap"; + @import "./bootstrap-grid-patch.scss"; + @import "bootstrap/scss/bootstrap"; @import "./mixins.scss"; @import "./susemanager/variables.scss"; diff --git a/web/html/src/branding/css/susemanager/components/address.less b/web/html/src/branding/css/susemanager/components/address.less deleted file mode 100644 index 5dc059a6c309..000000000000 --- a/web/html/src/branding/css/susemanager/components/address.less +++ /dev/null @@ -1,5 +0,0 @@ -address { - margin-bottom: 21px; - font-style: normal; - line-height: 1.5; -} diff --git a/web/html/src/branding/css/susemanager/components/alerts.less b/web/html/src/branding/css/susemanager/components/alerts.less deleted file mode 100644 index c5d7234c2a78..000000000000 --- a/web/html/src/branding/css/susemanager/components/alerts.less +++ /dev/null @@ -1,142 +0,0 @@ -// Toastify has separate styles, but try and share as much as we can -.Toastify__toast, -.alert { - position: relative; - z-index: 1; - padding: 8px; - padding-left: 30px; - border: none; - margin: 0 0 15px 0; - - &:before { - position: absolute; - top: 8px; - left: 8px; - font-size: 14px; - } - - ul { - padding-left: 0; - - li { - list-style: none; - } - } -} - -.alert:after, -.Toastify__toast:after { - font-family: "Fontawesome"; - content: "\f00d"; - position: absolute; - top: 9px; - right: 12px; - font-size: 12px; -} - -.alert:before, -.Toastify__toast:before { - font-family: 'spacewalk-icon'; -} - -.alert-info, -.Toastify__toast--info { - background-color: @eos-bc-cerulean-100; - border-left: 5px solid @eos-bc-cerulean-900; - color: @eos-bc-gray-1000; - - &:before { - content: "\e63e"; - } -} - -.alert-success, -.Toastify__toast--success { - background-color: @eos-bc-green-100; - border-left: 5px solid @eos-bc-green-500; - color: @eos-bc-gray-1000; - - &:before { - content: "\e63d"; - } -} - -.alert-warning, -.Toastify__toast--warning { - background-color: @eos-bc-yellow-100; - border-left: 5px solid @eos-bc-yellow-900; - color: @eos-bc-gray-1000; - - &:before { - content: "\e63f"; - } -} - -.alert-danger, -.Toastify__toast--error { - background-color: @eos-bc-red-100; - border-left: 5px solid @eos-bc-red-900; - color: @eos-bc-gray-1000; - - &:before { - content: "\e640"; - } -} - -.Toastify { - position: relative; - width: 100%; - - // Global alerts - &#global .Toastify__toast-container { - position: relative !important; - margin: 0 !important; - } -} - -.Toastify__toast-container { - margin-top: 24px; - width: 100% !important; -} - -.Toastify__toast { - cursor: pointer; - min-height: 0; - box-shadow: none; - margin-bottom: 8px; - - &:last-child { - margin-bottom: 0; - } -} - -@keyframes toast-enter { - 0% { - opacity: 0; - } - 100% { - opacity: 1; - } -} - -@keyframes toast-exit { - 0% { - opacity: 1; - } - 100% { - opacity: 0; - } -} - -// This is required to hide the toasts automatically -@keyframes Toastify__trackProgress { - 0% { - transform: scaleX(1); - } - 100% { - transform: scaleX(0); - } -} -.Toastify__progress-bar--animated { - animation: Toastify__trackProgress linear 1 forwards; -} diff --git a/web/html/src/branding/css/susemanager/components/buttons.less b/web/html/src/branding/css/susemanager/components/buttons.less deleted file mode 100644 index 99dfe97eef7e..000000000000 --- a/web/html/src/branding/css/susemanager/components/buttons.less +++ /dev/null @@ -1,60 +0,0 @@ -.btn, -.btn-link, -.btn-default, -.btn-primary, -.btn-success, -.btn-warning, -.btn-danger { - i.fa::before { - // No text-decoration for the icon text, see https://stackoverflow.com/a/19529256/1470607 - display: inline-block; - } -} - -button.is-plain { - -webkit-appearance: none !important; - -moz-appearance: none !important; - appearance: none !important; - background: none; - border: none; - border-radius: 0; - box-sizing: border-box; - cursor: pointer; - display: inline; - font: inherit; - line-height: inherit; - outline: none; - text-decoration: none; - user-select: text; - padding: 0; -} - -.onSuma({ - @import "buttons.suma.less"; -}); - -.onUyuni({ - @import "buttons.uyuni.less"; -}); - -.btn-link { - &, - &:active, - &:focus, - &:disabled, - &.disabled { - border-color: transparent; - text-decoration: none; - background: transparent; - - &, - &:hover { - color: @link-color; - font-weight: normal; - } - - &:not(:disabled):not(.disabled):not(.text-muted):hover { - text-decoration: underline; - } - } -} diff --git a/web/html/src/branding/css/susemanager/components/buttons.suma.less b/web/html/src/branding/css/susemanager/components/buttons.suma.less deleted file mode 100644 index 4f250bea181a..000000000000 --- a/web/html/src/branding/css/susemanager/components/buttons.suma.less +++ /dev/null @@ -1,233 +0,0 @@ -.btn, -.btn-default, -.btn-primary, -.btn-success, -.btn-warning, -.btn-danger { - // We use flex to ensure icons etc are correctly aligned in buttons - display: inline-flex; - align-items: center; - gap: 0.5em; - - color: inherit; - font-size: 14px; - font-weight: bold; - padding: 8px 16px; - position: relative; - border-style: solid; - border-width: 2px; - filter: none; - transition: none; - text-decoration: none; - box-shadow: none; - - &:hover { - text-decoration: none; - } - - &.btn-sm { - padding: 6px 14px; - font-size: 12px; - } - - .input-group-btn & { - padding: 5px 10px; - } - - &, - &:active, - &:focus { - outline: none; - // Remove Bootstrap's default gradient behavior - background-image: none; - box-shadow: none; - } - - // Branding hover effect - &:not(:disabled):not(.disabled):not(.text-muted):hover::after { - // background: #686565; - border: 2px solid transparent; - bottom: -2px; - box-sizing: content-box; - content: ""; - display: block; - height: 1px; - left: -2px; - position: absolute; - width: 100%; - } - - &.disabled, - &:disabled, - // Would be nice to deprecate this class in the long run - &.text-muted { - opacity: 0.5; - pointer-events: auto; - cursor: not-allowed; - } - - &.text-muted { - color: inherit !important; - } - - i[class~="fa"], - i[class*="icon-"], - i[class*="spacewalk-icon"] { - margin: 0; - } -} - -.btn-link { - &, - &:active, - &:focus, - &:disabled, - &.disabled { - &, - &:hover { - color: @link-color; - font-weight: normal; - } - - &:not(:disabled):not(.disabled):not(.text-muted):hover { - text-decoration: underline; - } - } -} - -// TODO: Add :active and :focus states for green etc -// NB! Here and below, these are not nested because they're not used consistently along with .btn -.btn-default { - &, - &:active, - &:focus, - &:disabled, - &.disabled { - &, - &:hover { - background: transparent; - border-color: @eos-bc-pine-500; - color: @eos-bc-pine-500; - - &:not(:disabled):not(.disabled):not(.text-muted):hover::after { - background: @eos-bc-pine-500; - } - } - } -} - -.btn-default-inverse { - &, - &:active, - &:focus, - &:disabled, - &.disabled { - &, - &:hover { - background: transparent; - border-color: @eos-bc-white; - color: @eos-bc-white; - - &:not(:disabled):not(.disabled):not(.text-muted):hover::after { - background: @eos-bc-white; - } - } - } -} - -.btn-primary { - &, - &:active, - &:focus, - &:disabled, - &.disabled { - &, - &:hover { - background: @eos-bc-persimmon-500; - border-color: @eos-bc-persimmon-500; - color: @eos-bc-gray-1000; - - &:not(:disabled):not(.disabled):not(.text-muted):hover::after { - background: @eos-bc-gray-900; - } - } - } -} - -.btn-success { - &, - &:active, - &:focus, - &:disabled, - &.disabled { - &, - &:hover { - background: transparent; - border-color: @eos-bc-persimmon-500; - color: @eos-bc-gray-1000; - - &:not(:disabled):not(.disabled):not(.text-muted):hover::after { - background: @eos-bc-persimmon-500; - } - } - } -} - -// Warning shouldn't currently be used anywhere, but cover it just in case -.btn-warning, -.btn-danger { - &, - &:active, - &:focus, - &:disabled, - &.disabled { - &, - &:hover { - background: @eos-bc-red-500; - border-color: @eos-bc-red-500; - color: @eos-bc-white; - - &:not(:disabled):not(.disabled):not(.text-muted):hover { - background: @eos-bc-red-900; - border-color: @eos-bc-red-900; - } - - &:not(:disabled):not(.disabled):not(.text-muted):hover::after { - background: @eos-bc-gray-900; - } - } - } -} - -.input-group-btn .btn { - border-width: 1px; - padding: 6px 12px; - height: @input-height; - z-index: 100; - - &:not(:disabled):not(.disabled):not(.text-muted):hover::after { - border-width: 1px; - bottom: -1px; - left: -1px; - } -} - -.btn-group .btn { - margin: 0 4px 0 0; - - &:last-child { - margin-right: 0; - } -} - -.panel-heading, -th { - .btn, - .btn-link, - a { - border: none; - padding: 0; - font-weight: bold; - color: @eos-bc-gray-1000; - } -} diff --git a/web/html/src/branding/css/susemanager/components/buttons.uyuni.less b/web/html/src/branding/css/susemanager/components/buttons.uyuni.less deleted file mode 100644 index 78ea3417bf93..000000000000 --- a/web/html/src/branding/css/susemanager/components/buttons.uyuni.less +++ /dev/null @@ -1,18 +0,0 @@ -.btn-default { - background-image: linear-gradient(to bottom, #fff 0%, #e6e6e6 100%); - border-color: #ccc;; - color: #5F5F5F; -} - -.btn-primary, -.btn-success { - background-image: linear-gradient(to bottom, #00da92 0%, #00C081 100%); - border-color: #00C081; - color: #fff; -} - - -.btn-warning, -.btn-danger { - // Use the default Bootstrap styles -} diff --git a/web/html/src/branding/css/susemanager/components/date-time-picker.less b/web/html/src/branding/css/susemanager/components/date-time-picker.less deleted file mode 100644 index bfed79d96c79..000000000000 --- a/web/html/src/branding/css/susemanager/components/date-time-picker.less +++ /dev/null @@ -1,81 +0,0 @@ -/* This element already has `position: absolute` */ -.react-datepicker-popper { - z-index: 1050 !important; -} - -.react-datepicker, -.react-datepicker__current-month, -.react-datepicker-time__header, -.react-datepicker-year-header { - font: inherit !important; -} - -.react-datepicker__navigation-icon::before { - width: 1rem !important; - height: 1rem !important; - top: 1rem !important; -} - -.react-datepicker__day--selected, -.react-datepicker__day--in-selecting-range, -.react-datepicker__day--in-range, -.react-datepicker__month-text--selected, -.react-datepicker__month-text--in-selecting-range, -.react-datepicker__month-text--in-range, -.react-datepicker__quarter-text--selected, -.react-datepicker__quarter-text--in-selecting-range, -.react-datepicker__quarter-text--in-range, -.react-datepicker__year-text--selected, -.react-datepicker__year-text--in-selecting-range, -.react-datepicker__year-text--in-range, -.react-datepicker__day--keyboard-selected, -.react-datepicker__month-text--keyboard-selected, -.react-datepicker__quarter-text--keyboard-selected, -.react-datepicker__year-text--keyboard-selected, -.react-datepicker__time-list-item--selected { - background: #666 !important; - border-radius: 0 !important; -} - -.react-datepicker__navigation { - top: 6px; -} - -.react-datepicker__day-name, -.react-datepicker__day, -.react-datepicker__time-name { - margin: 0; - padding: 7px; - box-sizing: content-box; -} - -.form-control.date-time-picker-wrapper { - padding: 0 !important; - position: relative; - - .form-control { - border: none !important; - border-radius: 0 !important; - } -} - -.react-datepicker__input-container, -.react-datepicker__input-container > input { - display: block !important; - width: 100%; - height: 100%; -} - -.react-datepicker__header--time { - display: none !important; -} - -// Only for the time picker, change the triangle color since the colliding box is a different color -#time-picker-portal .react-datepicker__triangle::after { - border-bottom-color: #fff; -} - -// Fix double borders with input-group-addon elements -.no-right-border { - border-right-width: 0 !important; -} diff --git a/web/html/src/branding/css/susemanager/components/header.less b/web/html/src/branding/css/susemanager/components/header.less deleted file mode 100644 index 1925672b3743..000000000000 --- a/web/html/src/branding/css/susemanager/components/header.less +++ /dev/null @@ -1,141 +0,0 @@ -.header-content { - display: flex; - align-items: center; - padding: 10px !important; - white-space: nowrap; - flex-wrap: nowrap !important; - min-height: 50px; - max-width: 100vw; - - @media (max-width: @screen-tablet) { - flex-wrap: wrap !important; - } -} - -.navbar-header, -.navbar-controls { - flex-wrap: nowrap; - margin: 0 !important; -} - -.navbar-header { - display: flex !important; - align-items: flex-end; - margin-right: auto !important; - overflow: hidden; - - @media (max-width: @screen-tablet) { - width: 100%; - padding-bottom: 4px; - - #breadcrumb { - margin-left: auto; - margin-right: auto; - } - } -} - -.navbar-controls { - display: flex !important; - flex-direction: row; - align-items: center; - - @media (max-width: @screen-tablet) { - width: 100%; - justify-content: space-evenly; - - .menu-link { - display: none; - } - } - - &:before, - &:after { - content: none !important; - } - - a { - position: relative; - display: flex !important; - align-items: center; - padding: 4px 12px !important; - gap: 8px; - } - - button, - a { - i { - margin: 0 !important; - } - } - - .hide-overflow { - flex-shrink: 1; - overflow: hidden; - text-overflow: ellipsis; - } -} - -.ssm-box { - padding: 0; - - #ssm-box-default { - padding: 0; - color: inherit !important; - } - - #ssm-counter { - display: flex; - gap: 0px; - } - - #header_selcount { - display: flex; - align-items: center; - gap: 4px; - - .badge { - flex-shrink: 0; - border-radius: 8px; - background: @gray-light; - display: block; - padding: 2px 6px; - margin-bottom: -2px; - text-align: center; - color: darken(@gray-dark, 20%); - } - } - - a { - border-radius: 0; - padding: 4px 12px; - cursor: pointer; - - &:hover, - &:focus { - color: @green; - } - } - - #manage-ssm { - padding: 4px 4px 4px 6px !important; - } - - #clear-ssm { - padding: 4px 6px 4px 4px !important; - color: @gray-light; - background-color: transparent; - cursor: pointer; - border-radius: 2px; - border-width: 0; - - &:hover { - background-color: @red; - color: @gray-light; - } - - i { - margin: 0; - } - } -} diff --git a/web/html/src/branding/css/susemanager/components/help-block.scss b/web/html/src/branding/css/susemanager/components/help-block.scss index 0dc7d95fe836..7fe594cb7d48 100644 --- a/web/html/src/branding/css/susemanager/components/help-block.scss +++ b/web/html/src/branding/css/susemanager/components/help-block.scss @@ -1,4 +1,3 @@ -// This module is provided by Bootstrap 3, hence it doesn't have a corresponding .less file .help-block { display: block; margin-top: 5px; diff --git a/web/html/src/branding/css/susemanager/components/icons.less b/web/html/src/branding/css/susemanager/components/icons.less deleted file mode 100644 index 393178cbee7f..000000000000 --- a/web/html/src/branding/css/susemanager/components/icons.less +++ /dev/null @@ -1,8 +0,0 @@ -.fa, -[class^="fa-"] { - font-family: "FontAwesome"; -} - -[class*="spacewalk-icon-"] { - font-family: "spacewalk-icon"; -} diff --git a/web/html/src/branding/css/susemanager/components/inputs.less b/web/html/src/branding/css/susemanager/components/inputs.less deleted file mode 100644 index 686fd8cd3543..000000000000 --- a/web/html/src/branding/css/susemanager/components/inputs.less +++ /dev/null @@ -1,90 +0,0 @@ -@input-height: 35px; - -.form-control, -.form-control--react-select > div:first-of-type { - color: @eos-bc-gray-1000; - height: @input-height; - max-width: 100%; - border-radius: @border-radius-base !important; - border-color: @input-border-color !important; - box-shadow: none !important; - font-size: @font-size-base; -} - -.form-control { - padding: 8px !important; - - &:focus { - border-color: @eos-bc-blue-500 !important; - outline: none !important; - } - - &.disabled, - &:disabled { - color: @eos-bc-gray-700; - pointer-events: auto; - cursor: not-allowed; - - &:focus { - border-color: @input-border-color !important; - } - } - - &:read-only { - color: @eos-bc-gray-700; - pointer-events: auto; - cursor: default; - - &:focus { - border-color: @input-border-color !important; - } - } - - &::placeholder { - color: @input-placeholder; - opacity: 1; - } -} - -.form-control-static { - padding-top: 8px; - padding-bottom: 8px; -} - -// TODO: Bind this class to the react-select control once we upgrade react-select, see https://react-select.com/styles#the-classnames-prop -.form-control--react-select > div:first-of-type { - outline: none !important; - - &[class*="--is-focused"], - &[class*="--menu-is-open"] { - border-color: @eos-bc-blue-500 !important; - } -} - -textarea.form-control, -select[multiple], -select[size] { - height: auto; -} - -.input-group > .form-control { - &:not(:first-child):not(:last-child) { - border-radius: 0 !important; - } -} - -.input-group-addon { - color: @eos-bc-gray-900; - border-color: @input-border-color !important; - background: @gray-lighter; - font-size: 1em; - - > .fa:first-child:last-child { - margin: 0; - } - - > .fa { - font-size: inherit; - line-height: inherit; - } -} diff --git a/web/html/src/branding/css/susemanager/components/legend-box.less b/web/html/src/branding/css/susemanager/components/legend-box.less deleted file mode 100644 index 8116806107ba..000000000000 --- a/web/html/src/branding/css/susemanager/components/legend-box.less +++ /dev/null @@ -1,5 +0,0 @@ -#legend-box .fa { - min-width: 18px; - text-align: center; - margin-right: 8px; -} diff --git a/web/html/src/branding/css/susemanager/components/modal.less b/web/html/src/branding/css/susemanager/components/modal.less deleted file mode 100644 index 7f448c295439..000000000000 --- a/web/html/src/branding/css/susemanager/components/modal.less +++ /dev/null @@ -1,70 +0,0 @@ -.modal-header { - padding: 15px; - - .close { - border: 1px solid #000; - border-radius: 2px; - width: 22px; - height: 22px; - box-sizing: content-box; - padding: 0; - margin: 0; - opacity: 0.4; - font-size: 14px; - - &:hover { - opacity: 0.6; - } - - .fa { - margin: 0; - } - } -} - -.modal-body { - height: auto; - overflow-y: auto; - padding: 15px; - - &, - &:active, - &:focus { - outline: none; - } - - .row { - margin-left: 0; - margin-right: 0; - } -} - -.modal-footer { - margin: 0; - padding: 15px; - // TODO: Here and elsewhere, standardize border colors after the Bootstrap migration is complete - border-top: 1px solid #e5e5e5; -} - -.modal-backdrop, -.modal-overlay { - position: fixed; - inset: 0px; - background-color: @modal-backdrop-color; - z-index: @zindex-modal-background; -} - -.modal-backdrop.in, -.modal-backdrop.show { - opacity: 1; -} - -.modal-content { - background: white; - box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); -} - -.ReactModal__Content { - background-color: @modal-color; - border-radius: @border-radius-base; -} diff --git a/web/html/src/branding/css/susemanager/components/nav.less b/web/html/src/branding/css/susemanager/components/nav.less deleted file mode 100644 index 96f2789afba1..000000000000 --- a/web/html/src/branding/css/susemanager/components/nav.less +++ /dev/null @@ -1,48 +0,0 @@ -@nav-tabs-offset: 30px; - -.nav-tabs { - margin-bottom: 0.25rem; - border-bottom: 1px solid @eos-bc-gray-100; - - &:nth-child(2) { - margin-left: @nav-tabs-offset; - } - - &:nth-child(3) { - margin-left: 2 * @nav-tabs-offset; - } - - &:last-child { - margin-bottom: 1rem; - } - - li { - margin-bottom: -1px; - - a { - color: @eos-bc-gray-1000; - - &:hover { - border-color: @eos-bc-green-500; - padding-bottom: 1px; - border-bottom-width: 5px; - text-decoration: none !important; - } - - &:active, &:focus { - color: @eos-bc-gray-1000; - background: transparent; - } - - // TODO: Check disabled states - } - - &.active { - a { - &, &:hover, &:active, &:focus { - color: @eos-bc-gray-1000; - } - } - } - } -} diff --git a/web/html/src/branding/css/susemanager/components/panels.less b/web/html/src/branding/css/susemanager/components/panels.less deleted file mode 100644 index 0b6e80632851..000000000000 --- a/web/html/src/branding/css/susemanager/components/panels.less +++ /dev/null @@ -1,7 +0,0 @@ -.panel-body .min-height-panel { - min-height: 20px; -} - -.onSuma({ - @import "panels.suma.less"; -}); diff --git a/web/html/src/branding/css/susemanager/components/panels.suma.less b/web/html/src/branding/css/susemanager/components/panels.suma.less deleted file mode 100644 index 5ecfe7b32163..000000000000 --- a/web/html/src/branding/css/susemanager/components/panels.suma.less +++ /dev/null @@ -1,59 +0,0 @@ -.panel { - margin-bottom: 14px; - background: @eos-bc-gray-50; - box-shadow: none !important; - - .panel { - background: @eos-bc-white; - } - - .panel-footer { - background: transparent !important; - - &:empty { - display: none; - } - } - - &-default { - border: none; - - > .panel-heading { - background: transparent; - border-bottom: 1px solid @eos-bc-gray-100; - padding: 1rem; - font-size: 14px; - - h1, h2, h3, h4, h5, h6 { - font-size: @font-size-h4; - font-weight: 500; - } - } - - .panel-body { - padding: 15px; - } - - .list-group:last-child { - margin-bottom: 0; - } - - .list-group-item { - background: transparent; - border-color: @eos-bc-gray-100; - } - } -} - -dl:last-child { - margin-bottom: 0; -} - -.well { - min-height: 0 !important; - padding: 0 !important; - background: transparent !important; - border: none !important; - box-shadow: none !important; - margin: 0 !important; -} diff --git a/web/html/src/branding/css/susemanager/components/tables.less b/web/html/src/branding/css/susemanager/components/tables.less deleted file mode 100644 index cbe20f9ffaf0..000000000000 --- a/web/html/src/branding/css/susemanager/components/tables.less +++ /dev/null @@ -1,54 +0,0 @@ -.spacewalk-list-head-addons { - display: flex; - justify-content: space-between; - align-items: flex-start; - - label { - cursor: pointer; - } -} - -.spacewalk-list-bottom-addons > div { - display: flex; - justify-content: space-between; - align-items: center; -} - -.table-input-search { - display: block; - width: 100%; - max-width: 500px; -} - -thead tr { - background: transparent !important; - color: @eos-bc-gray-700 !important; - - .btn-link { - padding: 0 !important; - border-width: 0 !important; - color: @eos-bc-gray-1000 !important; - font-weight: bold !important; - background: transparent; - } -} - -tbody tr, -tbody tr td, -.list-row-odd, -.list-row-even { - background: transparent !important; -} - -.display-number { - height: 30px; - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - display: inline-block; - width: fit-content; - border: none; - color: @eos-bc-gray-700; - background-color: @eos-bc-gray-100; -} diff --git a/web/html/src/branding/css/susemanager/components/titles.less b/web/html/src/branding/css/susemanager/components/titles.less deleted file mode 100644 index 30eef613d442..000000000000 --- a/web/html/src/branding/css/susemanager/components/titles.less +++ /dev/null @@ -1,26 +0,0 @@ -.onSuma({ - @import "titles.suma.less"; -}); - -.onUyuni({ - @import "titles.uyuni.less"; -}); - -h1, -h2, -h3, -h4, -h5, -h6, -.subheadline { - line-height: 1.5; - - small { - color: inherit; - font-size: 80%; - } - - a:hover { - text-decoration: underline !important; - } -} diff --git a/web/html/src/branding/css/susemanager/components/titles.suma.less b/web/html/src/branding/css/susemanager/components/titles.suma.less deleted file mode 100644 index 846e4ce87870..000000000000 --- a/web/html/src/branding/css/susemanager/components/titles.suma.less +++ /dev/null @@ -1,13 +0,0 @@ -h1, -h2, -h3, -h4, -h5, -h6, -.subheadline { - font-family: "Poppins", sans-serif; - - a { - color: inherit; - } -} diff --git a/web/html/src/branding/css/susemanager/components/titles.uyuni.less b/web/html/src/branding/css/susemanager/components/titles.uyuni.less deleted file mode 100644 index cbe29244e5e5..000000000000 --- a/web/html/src/branding/css/susemanager/components/titles.uyuni.less +++ /dev/null @@ -1,25 +0,0 @@ -h1, -h2, -h3, -h4, -h5, -h6, -.subheadline { - font-family: "Roboto Light", sans-serif; -} - -h1, -h2 { - font-weight: 400; -} - -h3, -h4, -h5, -h6 { - font-family: "Roboto Bold", sans-serif; -} - -.spacewalk-help-link { - vertical-align: top; -} diff --git a/web/html/src/branding/css/susemanager/components/toolbar.less b/web/html/src/branding/css/susemanager/components/toolbar.less deleted file mode 100644 index d27cddeeca25..000000000000 --- a/web/html/src/branding/css/susemanager/components/toolbar.less +++ /dev/null @@ -1,10 +0,0 @@ -.spacewalk-section-toolbar { - background: transparent; - padding: 0; - border: none; - - &.fixed { - background: @eos-bc-white; - border-bottom: 1px solid @eos-bc-gray-300; - } -} diff --git a/web/html/src/branding/css/susemanager/fonts.less b/web/html/src/branding/css/susemanager/fonts.less deleted file mode 100644 index b570581f1cb1..000000000000 --- a/web/html/src/branding/css/susemanager/fonts.less +++ /dev/null @@ -1,67 +0,0 @@ -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 300; - src: local('Lato'), url('../../fonts/Lato/Lato-Regular.ttf') format('truetype'); -} - -@font-face { - font-family: 'Lato Bold'; - font-style: normal; - font-weight: 300; - src: local('Lato Bold'), local('LatoBold'), url('../../fonts/Lato/Lato-Bold.ttf') format('truetype'); -} - -@font-face { - font-family: 'WorkSans'; - font-style: normal; - font-weight: 300; - src: local('WorkSans'), url('../../fonts/WorkSans/static/WorkSans-Regular.ttf') format('truetype'); -} - -@font-face { - font-family: 'WorkSans Bold'; - font-style: normal; - font-weight: 300; - src: local('WorkSans Bold'), local('WorkSansBold'), url('../../fonts/WorkSans/static/WorkSans-Bold.ttf') format('truetype'); -} - -@font-face { - font-family: 'Poppins'; - font-style: normal; - font-weight: 300; - src: url('../../fonts/Poppins/poppins-v15-latin-300.eot'); /* IE9 Compat Modes */ - src: local(''), - url('../../fonts/Poppins/poppins-v15-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../../fonts/Poppins/poppins-v15-latin-300.woff2') format('woff2'), /* Super Modern Browsers */ - url('../../fonts/Poppins/poppins-v15-latin-300.woff') format('woff'), /* Modern Browsers */ - url('../../fonts/Poppins/poppins-v15-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../../fonts/Poppins/poppins-v15-latin-300.svg#Poppins') format('svg'); /* Legacy iOS */ -} - -@font-face { - font-family: 'Poppins'; - font-style: normal; - font-weight: 500; - src: url('../../fonts/Poppins/poppins-v15-latin-500.eot'); /* IE9 Compat Modes */ - src: local(''), - url('../../fonts/Poppins/poppins-v15-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../../fonts/Poppins/poppins-v15-latin-500.woff2') format('woff2'), /* Super Modern Browsers */ - url('../../fonts/Poppins/poppins-v15-latin-500.woff') format('woff'), /* Modern Browsers */ - url('../../fonts/Poppins/poppins-v15-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../../fonts/Poppins/poppins-v15-latin-500.svg#Poppins') format('svg'); /* Legacy iOS */ -} - -@font-face { - font-family: 'Roboto Light'; - font-style: normal; - font-weight: 300; - src: local('Roboto Light'), local('RobotoLight'), url('../../fonts/Roboto/Roboto-Light.ttf') format('truetype'); -} - -@font-face { - font-family: 'Roboto Bold'; - font-style: normal; - font-weight: 300; - src: local('Roboto Bold'), local('RobotoBold'), url('../../fonts/Roboto/Roboto-Bold.ttf') format('truetype'); -} diff --git a/web/html/src/branding/css/susemanager/index.less b/web/html/src/branding/css/susemanager/index.less deleted file mode 100644 index 2ab30220f611..000000000000 --- a/web/html/src/branding/css/susemanager/index.less +++ /dev/null @@ -1,31 +0,0 @@ -@import "../base/theme.less"; -@import "../base/tables.less"; -@import "../base/error.less"; -@import "../base/tools.less"; -@import "../base/setup-wizard.less"; -@import "../base/notifications.less"; -@import "../base/fixes.less"; -@import "../base/network.less"; -@import "../base/inputs.less"; -@import "../base/forms.less"; -@import "../base/hr.less"; - -@import "./legacy-pages/login.less"; - -@import "./components/titles.less"; -@import "./components/alerts.less"; -@import "./components/buttons.less"; -@import "./components/inputs.less"; -@import "./components/modal.less"; -@import "./components/nav.less"; -@import "./components/panels.less"; -@import "./components/tables.less"; -@import "./components/toolbar.less"; -@import "./components/legend-box.less"; -@import "./components/date-time-picker.less"; -@import "./components/header.less"; -@import "./components/address.less"; -@import "./components/icons.less"; - -// Responsive overrides -@import "../base/responsive-rules.less"; diff --git a/web/html/src/branding/css/susemanager/legacy-pages/login.less b/web/html/src/branding/css/susemanager/legacy-pages/login.less deleted file mode 100644 index 1a9400e5800f..000000000000 --- a/web/html/src/branding/css/susemanager/legacy-pages/login.less +++ /dev/null @@ -1,3 +0,0 @@ -.onUyuni({ - @import "login.uyuni.less"; -}); diff --git a/web/html/src/branding/css/susemanager/legacy-pages/login.uyuni.less b/web/html/src/branding/css/susemanager/legacy-pages/login.uyuni.less deleted file mode 100644 index b6cf369f0ab9..000000000000 --- a/web/html/src/branding/css/susemanager/legacy-pages/login.uyuni.less +++ /dev/null @@ -1,168 +0,0 @@ -&.login-page { - background: @uyuni-blue-100; - font-size: 16px; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - width: 100%; - overflow: auto; - margin-top: 0px; - color: @gray-light; - - #login { - display: flex; - flex-direction: column; - height: 100%; - } -} -&.login-page { - .text-left; - .wrap { - width: 1024px; - margin: 0 auto; - box-sizing: border-box; - } - .navbar-header { - margin-left: 10px; - } - .spacewalk-main-column-layout { - flex: 1 0 auto; - - section { - padding: 3em 0; - width: 100%; - } - } - h1 { - font-size: 52px; - color: @green; - } - h2 { - font-size: 32px; - } - .btn-dark { - color: @green; - border: 1px solid @green; - display: inline-block; - text-decoration: none; - padding: 0.4em 1em; - border-radius: 4px; - font-size: 15px; - margin-left: 3em; - } - .btn-dark:hover { - border: 1px solid darken(@green, 10%); - } - .margins-updown { - margin: 2em 0; - } - input { - margin-bottom: 1em; - background: @uyuni-blue-900; - color: @gray-light; - border: 0; - -webkit-font-smoothing: antialiased; - box-shadow: 0px 1px 0px 0px @uyuni-blue-100, 0px 1px 0px 0px @uyuni-blue-900 inset; - -moz-box-shadow: 0px 1px 0px 0px @uyuni-blue-100, 0px 1px 0px 0px @uyuni-blue-900 inset; - -webkit-box-shadow: 0px 1px 0px 0px @uyuni-blue-100, 0px 1px 0px 0px @uyuni-blue-900 inset; - } - input:focus { - color: @white; - } - hr { - background: @uyuni-blue-900, 3%; - height: 1px; - border: 0; - border-bottom: 1px solid @uyuni-blue-100; - } - input[type="submit"] { - background: @green; - color: @white; - margin-bottom: 1em; - border: 0; - box-shadow: 0px 1px 0px 0px @green, 0px 0px 0px 0px @green-dark inset; - -moz-box-shadow: 0px 1px 0px 0px @green, 0px 0px 0px 0px @green-dark inset; - -webkit-box-shadow: 0px 1px 0px 0px @green, 0px 0px 0px 0px @green-dark inset; - } - input[type="submit"]:hover { - background: @green-dark; - -webkit-font-smoothing: antialiased; - } - a { - text-decoration: underline; - } - a:hover { - color: @green-dark; - } - .small-text { - font-size: 0.8em; - } - label { - font-weight: normal; - } - header { - font-size: 13px; - border-bottom: 0px; - .navbar-brand { - text-decoration: none; - } - } - .alert { - font-size: 14px; - } - footer { - border-bottom: 16px solid @green; - border-top-width: 0px; - background-color: @uyuni-blue-100; - position: static; - padding-bottom: 1em; - padding-left: 0; - color: @gray; - - div.wrapper { - padding: 0 15px; - background-size: auto 35px; - min-height: 35px; - } - .wrap { - display: flex; - gap: 16px; - - > div { - display: inline-block; - width: auto; - } - } - a { - color: inherit; - } - .bottom-line { - display: block; - margin-top: 10px; - } - } -} - -@media (max-width: @screen-desktop) { - &.login-page .wrap { - width: 100%; - } -} - -@media (max-width: @screen-tablet) { - &.login-page section.wrap { - padding-right: 1em; - padding-left: 1em; - } - - &.login-page { - header { - height: auto !important; - - .navbar-controls { - float: right !important; - width: auto; - margin-top: 0px !important; - } - } - } -} diff --git a/web/html/src/branding/css/susemanager/variables.less b/web/html/src/branding/css/susemanager/variables.less deleted file mode 100644 index 81304eb32708..000000000000 --- a/web/html/src/branding/css/susemanager/variables.less +++ /dev/null @@ -1,147 +0,0 @@ -/** - * EOS Colors guideline for products https://productbrand.suse.com/colors - * - * We can't use `eos-ds` as a dependency directly since they use Sass and we use Less - */ -@eos-bc-green-100: #e4f6ee; -@eos-bc-green-500: #30ba78; -@eos-bc-green-900: #0e7e3c; -// TODO: This name should be -1000 or similar -@eos-bc-pine-500: #0c322c; -@eos-bc-cerulean-100: #b3e8f6; -@eos-bc-cerulean-500: #00b2e2; -@eos-bc-cerulean-900: #008acf; -@eos-bc-red-100: #f5c2c7; -@eos-bc-red-500: #dc3545; -@eos-bc-red-900: #c5161f; -@eos-bc-yellow-100: #ffecb5; -@eos-bc-yellow-500: #ffc107; -@eos-bc-yellow-600: #cc7e00; -@eos-bc-yellow-900: #ff9e02; -@eos-bc-blue-500: #2453ff; -@eos-bc-persimmon-500: #fe7c3f; -@eos-bc-gray-50: #f2f2f2; -@eos-bc-gray-100: #e0dfdf; -@eos-bc-gray-300: #b6b4b4; -@eos-bc-gray-500: #969494; -@eos-bc-gray-700: #757575; -@eos-bc-gray-900: #686565; -@eos-bc-gray-1000: #141823; -@eos-bc-white: #fff; -@eos-bc-dt-gray-700: #57595f; -// TODO: These names are wrong, they should probably be -900 and -1000 -@eos-bc-dt-gray-100: #2b2e38; -@eos-bc-dt-gray-200: #1f222b; - -@uyuni-blue-900: #0d2c40; -// TODO: This name should be -800 or -700 -@uyuni-blue-100: #314c5d; -@uyuni-gray-100: #dcddde; -@uyuni-gray-300: #cccccc; - -/* Tags colours for Bootstrap */ -@green-dark: @eos-bc-green-900; -@green: @eos-bc-green-500; -@green-light: @eos-bc-green-100; -// This variable set controls the body color -@body-color: #000; -@gray-dark: @body-color; -@gray-dark-1: @eos-bc-gray-700; -@gray: @eos-bc-gray-500; -@gray-light: @eos-bc-gray-100; -@gray-light-1: @eos-bc-gray-50; -@orange: @eos-bc-yellow-900; -@orange-light: #fd9a2b; -@yellow-dark: #c5b345; -@yellow: @eos-bc-yellow-500; -@red: @eos-bc-red-500; -@white: @eos-bc-white; -@blue: @eos-bc-cerulean-900; -@blue-light: @eos-bc-cerulean-500; -@violet: #841781; -@black: @eos-bc-gray-1000; - -/* Basic text */ -@font-size-base: 14px; -@font-size-large: 18.2px; -@font-size-small: 12px; - -@font-size-h1: 24.5px; -@font-size-h2: 21px; -@font-size-h3: 18.2px; -@font-size-h4: 16.1px; -@font-size-h5: 14px; -@font-size-h6: 14px; - -@line-height-base: 1.5; -@headings-line-height: 1.5; - -/* Breakpoints, use with max-width only */ -@screen-phone: 480px; -@screen-tablet: 768px; -@screen-desktop: 992px; - -/* Header */ -@header: @eos-bc-pine-500; -@header-text: @eos-bc-white; -// This is a one-off color not used elsewhere? -@header-border: #26915e; - -// TODO: Clean this section up and merge all aside variables into one block -/* Left menu */ -@aside-background: @eos-bc-gray-50; -@aside-menu-text: @eos-bc-gray-1000; -@aside-search-border: @eos-bc-gray-900; -@aside-search-text-color: @eos-bc-gray-1000; -@aside-footer-text: @eos-bc-gray-900; -@aside-footer-border: @eos-bc-gray-100; -@aside-footer-logo-background: url("../../img/suse-logo-footer.svg") right center / 32px 16px no-repeat; - -/* Colours for the menu in the first column on the left */ -@aside-border: lighten(@aside-background, 8%); -@aside-menu-active: @green; - -/* aside menu search box */ -@aside-menu-search-clear: rgba(@eos-bc-gray-300, 60%); -@aside-menu-search-clear-hover: @eos-bc-gray-700; - -/* Icons legend */ -@icon-legend: @header; -@icon-legend-text: @header-text; - -/* Input */ -@input-placeholder: @gray; -:root { - --input-selected: @eos-bc-green-500; -} -@input-border-color: @eos-bc-gray-700; - -/* Modals */ -@modal-color: @white; -@modal-backdrop-color: rgba(@eos-bc-gray-1000, 50%); - -/* Other elements */ -@body-background: @white; -@notification-badge: @orange-light; -@box-shadow: @gray-light; -@inactive: @eos-bc-gray-100; -// TODO: This should be selection green instead? -@table-row-selected: lighten(@eos-bc-yellow-100, 5%); -@badge-bg: @eos-bc-gray-1000; - -/** -* FONTS -*/ - -/* Lato variable: font variable to be applied in different text elements */ -@lato: "Lato", arial, helvetica, sans-serif; -@lato-bold: "Lato Bold", arial, helvetica, sans-serif; - -/* WorkSans variable: font variable to be applied in different text elements */ -@worksans: "WorkSans", arial, helvetica, sans-serif; -@worksans-bold: "WorkSans Bold", arial, helvetica, sans-serif; - -@helvetica: "Helvetica Neue", Helvetica, Arial, sans-serif; - -/* Manually map Bootstrap's fonts since our setup is a bit unorthodox */ -@icon-font-path: "../../bootstrap/fonts/"; diff --git a/web/html/src/branding/css/uyuni-variables.less b/web/html/src/branding/css/uyuni-variables.less deleted file mode 100644 index 09d94aa9b3a1..000000000000 --- a/web/html/src/branding/css/uyuni-variables.less +++ /dev/null @@ -1,18 +0,0 @@ -@body-color: #5f5f5f; -@body-font: @helvetica; -@link-color: #337ab7; - -@header: @uyuni-blue-900; -@header-text: @uyuni-gray-100; - -@content-area-padding: 0 2em 3em; - -@aside-background: @uyuni-blue-900; -@aside-menu-text: @uyuni-gray-100; -@aside-search-text-color: @uyuni-gray-100; -@aside-footer-text: @uyuni-gray-100; -@aside-footer-border: @uyuni-blue-100; -@aside-search-border: @uyuni-blue-100; -@aside-footer-logo-background: url("../img/suse-logo-footer-white.svg") right center / 90px 30px no-repeat; - -@input-border-color: @uyuni-gray-300; diff --git a/web/html/src/branding/css/uyuni.less b/web/html/src/branding/css/uyuni.less deleted file mode 100644 index bb0b8ee44fab..000000000000 --- a/web/html/src/branding/css/uyuni.less +++ /dev/null @@ -1,25 +0,0 @@ -@theme: "uyuni"; - -@import "./body.less"; -@import "./susemanager/fonts.less"; - -.old-theme { - @import url(bootstrap/less/bootstrap.less); - - @import "clearfix.less"; - @import "mixins.less"; - @import "susemanager/variables.less"; - @import "uyuni-variables.less"; - - display: flex; - flex-direction: column; - background: @body-background; - font-family: @body-font; - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; - font-size: @font-size-base; - line-height: 1.5; - color: @body-color; - - @import "susemanager/index.less"; -} diff --git a/web/html/src/branding/css/uyuni.scss b/web/html/src/branding/css/uyuni.scss index b3f6a9e9f847..6fbd61d1b847 100644 --- a/web/html/src/branding/css/uyuni.scss +++ b/web/html/src/branding/css/uyuni.scss @@ -3,11 +3,11 @@ $theme: "uyuni"; @import "./body.scss"; @import "./fonts.scss"; -@import "./bootstrap5-scaffolding-variables.scss"; +@import "./bootstrap-scaffolding-variables.scss"; .new-theme { - @import "./bootstrap5-grid-patch.scss"; - @import "bootstrap5/scss/bootstrap"; + @import "./bootstrap-grid-patch.scss"; + @import "bootstrap/scss/bootstrap"; @import "./mixins.scss"; @import "./susemanager/variables.scss"; diff --git a/web/html/src/build/webpack.config.js b/web/html/src/build/webpack.config.js index 9bd51c25e202..9dad2ccd47b3 100644 --- a/web/html/src/build/webpack.config.js +++ b/web/html/src/build/webpack.config.js @@ -36,17 +36,14 @@ module.exports = (env, argv) => { }, // TODO: Copy all font licenses too { from: path.resolve(__dirname, "../branding/img"), to: path.resolve(__dirname, "../dist/img") }, - // Any non-compiled CSS, Less files will be compiled by their entry points + // Any non-compiled CSS files will be compiled by their entry points { from: path.resolve(__dirname, "../branding/css/*.css"), context: path.resolve(__dirname, "../branding/css"), to: path.resolve(__dirname, "../dist/css"), }, - /** - * Scripts and dependencies we're migrating from susemanager-frontend-libs to spacewalk-web - */ { - from: path.resolve(__dirname, "../node_modules/bootstrap5/dist/js/bootstrap.bundle.min.js"), + from: path.resolve(__dirname, "../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"), to: path.resolve(__dirname, "../dist/javascript/legacy/bootstrap-webpack.js"), }, { @@ -94,9 +91,6 @@ module.exports = (env, argv) => { pluginsInUse = [ ...pluginsInUse, new LicenseCheckerWebpackPlugin({ - // If we want, we could check licenses at build time via https://github.com/openSUSE/obs-service-format_spec_file or similar in the future - // allow: [...], - // emitError: true, outputFilename: "../vendors/npm.licenses.structured.js", outputWriter: path.resolve(__dirname, "../vendors/licenses.template.ejs"), }), @@ -109,10 +103,6 @@ module.exports = (env, argv) => { return { entry: { "javascript/manager/main": "./manager/index.ts", - "css/uyuni": path.resolve(__dirname, "../branding/css/uyuni.less"), - "css/susemanager-fullscreen": path.resolve(__dirname, "../branding/css/susemanager-fullscreen.less"), - "css/susemanager-light": path.resolve(__dirname, "../branding/css/susemanager-light.less"), - "css/susemanager-dark": path.resolve(__dirname, "../branding/css/susemanager-dark.less"), "css/updated-susemanager-light": path.resolve(__dirname, "../branding/css/susemanager-light.scss"), "css/updated-susemanager-dark": path.resolve(__dirname, "../branding/css/susemanager-dark.scss"), "css/updated-uyuni": path.resolve(__dirname, "../branding/css/uyuni.scss"), @@ -124,7 +114,6 @@ module.exports = (env, argv) => { publicPath: "/", hashFunction: "md5", }, - // context: __dirname, node: { __filename: true, __dirname: true, @@ -151,7 +140,7 @@ module.exports = (env, argv) => { }, { // Stylesheets that are imported directly by components - test: /(components|core|manager)\/.*\.(css|less)$/, + test: /(components|core|manager)\/.*\.css$/, exclude: /node_modules/, use: [ MiniCssExtractPlugin.loader, @@ -161,23 +150,6 @@ module.exports = (env, argv) => { modules: true, }, }, - { loader: "less-loader" }, - ], - }, - { - // Global stylesheets - test: /branding\/.*\.less$/, - exclude: /node_modules/, - use: [ - MiniCssExtractPlugin.loader, - { - loader: "css-loader", - options: { - // NB! This is crucial, we don't consume Bootstrap etc as a module, but as a regular style - modules: false, - }, - }, - { loader: "less-loader" }, ], }, { diff --git a/web/html/src/components/input/radio/Radio.module.css b/web/html/src/components/input/radio/Radio.module.scss similarity index 100% rename from web/html/src/components/input/radio/Radio.module.css rename to web/html/src/components/input/radio/Radio.module.scss diff --git a/web/html/src/components/input/radio/Radio.tsx b/web/html/src/components/input/radio/Radio.tsx index a1d8446ad62d..08ee7ebd6e45 100644 --- a/web/html/src/components/input/radio/Radio.tsx +++ b/web/html/src/components/input/radio/Radio.tsx @@ -3,7 +3,7 @@ import { useState } from "react"; import { FormContext } from "../form/Form"; import { InputBase, InputBaseProps } from "../InputBase"; -import styles from "./Radio.module.css"; +import styles from "./Radio.module.scss"; type Props = InputBaseProps & { /** Items to display in an array of objects with label and value properties. */ diff --git a/web/html/src/components/picker/recurring-event-picker.module.css b/web/html/src/components/picker/recurring-event-picker.module.scss similarity index 100% rename from web/html/src/components/picker/recurring-event-picker.module.css rename to web/html/src/components/picker/recurring-event-picker.module.scss diff --git a/web/html/src/components/picker/recurring-event-picker.tsx b/web/html/src/components/picker/recurring-event-picker.tsx index ea5b5dd46fd6..f8776af3ff80 100644 --- a/web/html/src/components/picker/recurring-event-picker.tsx +++ b/web/html/src/components/picker/recurring-event-picker.tsx @@ -8,7 +8,7 @@ import { localizedMoment } from "utils"; import { Combobox } from "../combobox"; import { ComboboxItem } from "../combobox"; -import styles from "./recurring-event-picker.module.css"; +import styles from "./recurring-event-picker.module.scss"; export type RecurringType = "hourly" | "daily" | "weekly" | "monthly" | "cron"; export type CronTimes = { diff --git a/web/html/src/components/table/SearchPanel.module.less b/web/html/src/components/table/SearchPanel.module.scss similarity index 100% rename from web/html/src/components/table/SearchPanel.module.less rename to web/html/src/components/table/SearchPanel.module.scss diff --git a/web/html/src/components/table/SearchPanel.tsx b/web/html/src/components/table/SearchPanel.tsx index 3da8b61f8bb1..7f3f9d3e63d0 100644 --- a/web/html/src/components/table/SearchPanel.tsx +++ b/web/html/src/components/table/SearchPanel.tsx @@ -2,7 +2,7 @@ import * as React from "react"; import { cloneReactElement } from "components/utils"; -import styles from "./SearchPanel.module.less"; +import styles from "./SearchPanel.module.scss"; type SearchPanelProps = { /** number representing the number of the first displayed item */ diff --git a/web/html/src/components/virtual-list/VirtualList.module.less b/web/html/src/components/virtual-list/VirtualList.module.scss similarity index 100% rename from web/html/src/components/virtual-list/VirtualList.module.less rename to web/html/src/components/virtual-list/VirtualList.module.scss diff --git a/web/html/src/components/virtual-list/VirtualList.tsx b/web/html/src/components/virtual-list/VirtualList.tsx index 9cb26230edbe..767eb6a7c4de 100644 --- a/web/html/src/components/virtual-list/VirtualList.tsx +++ b/web/html/src/components/virtual-list/VirtualList.tsx @@ -2,7 +2,7 @@ import * as React from "react"; import { Virtuoso } from "react-virtuoso"; -import styles from "./VirtualList.module.less"; +import styles from "./VirtualList.module.scss"; type ListProps = { renderItem: (item: T) => JSX.Element; diff --git a/web/html/src/core/spa/spa-engine.tsx b/web/html/src/core/spa/spa-engine.tsx index fe7ad841f8f5..116f9752d9eb 100644 --- a/web/html/src/core/spa/spa-engine.tsx +++ b/web/html/src/core/spa/spa-engine.tsx @@ -9,8 +9,6 @@ import SpaRenderer from "core/spa/spa-renderer"; import { showErrorToastr } from "components/toastr"; -import { onEndNavigate } from "./view-helper"; - function isLoginPage(pathName) { const allLoginPossiblePaths = ["/", "/rhn/manager/login"]; return allLoginPossiblePaths.some((loginPath) => loginPath === pathName); @@ -20,7 +18,7 @@ window.pageRenderers = window.pageRenderers || {}; window.pageRenderers.spaengine = window.pageRenderers.spaengine || {}; // Navigation hook for standalone renderers to detect navigation -const onSpaEndNavigationCallbacks: Function[] = [onEndNavigate]; +const onSpaEndNavigationCallbacks: Function[] = []; window.pageRenderers.spaengine.onSpaEndNavigation = function onSpaEndNavigation(callback: Function) { if (onSpaEndNavigationCallbacks.indexOf(callback) === -1) { onSpaEndNavigationCallbacks.push(callback); diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts deleted file mode 100644 index e86b705b268b..000000000000 --- a/web/html/src/core/spa/view-helper.ts +++ /dev/null @@ -1,66 +0,0 @@ -type PathString = `/rhn/${string}`; - -/** - * A list of updated page pathnames, e.g. `"/rhn/manager/foo/bar"` - * NB! This must be in sync with java/code/src/com/suse/manager/webui/utils/ViewHelper.java - */ -// eslint-disable-next-line @typescript-eslint/no-unused-vars -const BOOTSTRAP_READY_PAGES: PathString[] = [ - "/rhn/YourRhn.do", - "/rhn/account/UserPreferences.do", - "/rhn/account/UserDetails.do", - "/rhn/account/ChangeEmail.do", - "/rhn/account/AccountDeactivation.do", - "/rhn/account/Addresses.do", - "/rhn/account/EditAddress.do", - "/rhn/multiorg/OrgConfigDetails.do", - "/rhn/manager/notification-messages", - "/rhn/channels/software/Search.do", - "/rhn/activationkeys/List.do", - "/rhn/manager/systems/list/all", - "/rhn/manager/contentmanagement/projects", - "/rhn/kickstart/cobbler/DefaultSnippetList.do", - "/rhn/systems/details/packages/PackageList.do", - "/rhn/software/channels/All.do", - "/rhn/manager/systems/ssm/coco/settings", - "/rhn/systems/ssm/audit/ScheduleXccdf.do", - "/rhn/systems/ssm/provisioning/PowerManagementConfiguration.do", - "/rhn/systems/details/kickstart/PowerManagement.do", - "/rhn/systems/ssm/provisioning/PowerManagementOperations.do", - "/rhn/channels/ChannelDetail.do", - "/rhn/software/packages/Details.do", - "/rhn/manager/systems/details/formulas", - "/rhn/manager/cm/imagestores", - "/rhn/manager/systems/details/highstate", - "/rhn/manager/systems/keys", - "/rhn/manager/audit/cve", - "/rhn/errata/Search.do", - "/rhn/audit/scap/Search.do", - "/rhn/manager/schedule/recurring-actions", - "/rhn/manager/schedule/maintenance/calendars", - "/rhn/manager/multiorg/recurring-actions", - "/rhn/manager/schedule/maintenance/schedules", - "/rhn/manager/admin/config/monitoring", - "/rhn/admin/config/GeneralConfig.do", - "/rhn/manager/admin/config/monitoring", - "/rhn/manager/admin/setup/products", - "/rhn/systems/details/SystemRemoteCommand.do", - "/rhn/manager/systems/details/highstate", - "/rhn/manager/systems/details/recurring-actions", - "/rhn/manager/cm/build", - "/rhn/admin/ScheduleDetail.do", - "/rhn/manager/systems/cmd", - "/rhn/kickstart/KickstartIpRanges.do", - "/rhn/channels/manage/repos/RepoCreate.do", - "/rhn/systems/details/Overview", - "/rhn/manager/formula-catalog", - "/rhn/errata/manage/CloneErrata.do", - "/rhn/admin/setup/ProxySettings.do", - "/rhn/admin/setup/MirrorCredentials.do", - "/rhn/manager/admin/setup/payg", - "/rhn/manager/storybook", -]; - -export const onEndNavigate = () => { - document.body.className = document.body.className.replace("old-theme", "new-theme"); -}; diff --git a/web/html/src/imports.d.ts b/web/html/src/imports.d.ts index 2305d5016c1c..74467d772379 100644 --- a/web/html/src/imports.d.ts +++ b/web/html/src/imports.d.ts @@ -1,4 +1,4 @@ declare module "*.css"; -declare module "*.less"; +declare module "*.scss"; declare module "*.svg"; declare module "*?raw"; diff --git a/web/html/src/jest.config.js b/web/html/src/jest.config.js index 62a2f3bd12cd..6113f55267f1 100644 --- a/web/html/src/jest.config.js +++ b/web/html/src/jest.config.js @@ -15,7 +15,7 @@ module.exports = { "^core/(.*)$": "/core/$1", "^manager/(.*)$": "/manager/$1", "^utils/(.*)$": "/utils/$1", - "\\.(css|less)$": "identity-obj-proxy", + "\\.(css|scss)$": "identity-obj-proxy", }, modulePaths: [""], moduleDirectories: ["node_modules"], diff --git a/web/html/src/manager/admin/config/monitoring-admin.module.css b/web/html/src/manager/admin/config/monitoring-admin.module.scss similarity index 100% rename from web/html/src/manager/admin/config/monitoring-admin.module.css rename to web/html/src/manager/admin/config/monitoring-admin.module.scss diff --git a/web/html/src/manager/admin/config/monitoring-admin.tsx b/web/html/src/manager/admin/config/monitoring-admin.tsx index 1e6a5f452981..5c26f6e2c3bf 100644 --- a/web/html/src/manager/admin/config/monitoring-admin.tsx +++ b/web/html/src/manager/admin/config/monitoring-admin.tsx @@ -15,7 +15,7 @@ import { HelpLink } from "components/utils/HelpLink"; import { Utils } from "utils/functions"; import Network from "utils/network"; -import styles from "./monitoring-admin.module.css"; +import styles from "./monitoring-admin.module.scss"; import useMonitoringApi from "./use-monitoring-api"; const { capitalize } = Utils; diff --git a/web/html/src/manager/content-management/shared/components/panels/build/build-version.module.css b/web/html/src/manager/content-management/shared/components/panels/build/build-version.module.scss similarity index 100% rename from web/html/src/manager/content-management/shared/components/panels/build/build-version.module.css rename to web/html/src/manager/content-management/shared/components/panels/build/build-version.module.scss diff --git a/web/html/src/manager/content-management/shared/components/panels/build/build-version.tsx b/web/html/src/manager/content-management/shared/components/panels/build/build-version.tsx index 2b4c98c0a984..ad2f901f6818 100644 --- a/web/html/src/manager/content-management/shared/components/panels/build/build-version.tsx +++ b/web/html/src/manager/content-management/shared/components/panels/build/build-version.tsx @@ -1,6 +1,6 @@ import * as React from "react"; -import styles from "./build-version.module.css"; +import styles from "./build-version.module.scss"; type Props = { id: string; diff --git a/web/html/src/manager/content-management/shared/components/panels/filters-project/filters-project.module.css b/web/html/src/manager/content-management/shared/components/panels/filters-project/filters-project.module.scss similarity index 100% rename from web/html/src/manager/content-management/shared/components/panels/filters-project/filters-project.module.css rename to web/html/src/manager/content-management/shared/components/panels/filters-project/filters-project.module.scss diff --git a/web/html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx b/web/html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx index 3cc07864b1dd..cc230254d924 100644 --- a/web/html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx +++ b/web/html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx @@ -12,7 +12,7 @@ import { getClmFilterDescription } from "../../../business/filters.enum"; import statesEnum from "../../../business/states.enum"; import { ProjectFilterServerType, ProjectMessageType } from "../../../type"; import getRenderedMessages from "../../messages/messages"; -import styles from "./filters-project.module.css"; +import styles from "./filters-project.module.scss"; import FiltersProjectSelection from "./filters-project-selection"; type FiltersProps = { diff --git a/web/html/src/manager/content-management/shared/components/panels/sources/channels/base-channel.tsx b/web/html/src/manager/content-management/shared/components/panels/sources/channels/base-channel.tsx index 51c411ce5dc4..86b2818a0f54 100644 --- a/web/html/src/manager/content-management/shared/components/panels/sources/channels/base-channel.tsx +++ b/web/html/src/manager/content-management/shared/components/panels/sources/channels/base-channel.tsx @@ -5,7 +5,7 @@ import { BaseChannelType, ChannelTreeType, ChildChannelType } from "core/channel import { Highlight } from "components/table/Highlight"; import ChannelProcessor from "./channels-processor"; -import styles from "./channels-selection.module.css"; +import styles from "./channels-selection.module.scss"; import ChildChannel from "./child-channel"; import EmptyChild from "./empty-child"; import RecommendedToggle from "./recommended-toggle"; diff --git a/web/html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.module.css b/web/html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.module.scss similarity index 100% rename from web/html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.module.css rename to web/html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.module.scss diff --git a/web/html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx b/web/html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx index 0418b91aec77..2c88ec5682b1 100644 --- a/web/html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx +++ b/web/html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx @@ -17,7 +17,7 @@ import { useChannelsWithMandatoryApi, useLoadSelectOptions } from "./channels-ap import ChannelsFilters from "./channels-filters"; import { getInitialFiltersState } from "./channels-filters-state"; import ChannelProcessor from "./channels-processor"; -import styles from "./channels-selection.module.css"; +import styles from "./channels-selection.module.scss"; type PropsType = { isSourcesApiLoading: boolean; diff --git a/web/html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx b/web/html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx index 156f27137cfd..ac2b1192731a 100644 --- a/web/html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx +++ b/web/html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx @@ -6,7 +6,7 @@ import { ChannelAnchorLink } from "components/links"; import { Highlight } from "components/table/Highlight"; import ChannelProcessor from "./channels-processor"; -import styles from "./channels-selection.module.css"; +import styles from "./channels-selection.module.scss"; type Props = { definition: ChildChannelType; diff --git a/web/html/src/manager/content-management/shared/components/panels/sources/channels/empty-child.tsx b/web/html/src/manager/content-management/shared/components/panels/sources/channels/empty-child.tsx index c8400f5459b3..a8fa8ce601b0 100644 --- a/web/html/src/manager/content-management/shared/components/panels/sources/channels/empty-child.tsx +++ b/web/html/src/manager/content-management/shared/components/panels/sources/channels/empty-child.tsx @@ -1,6 +1,6 @@ import * as React from "react"; -import styles from "./channels-selection.module.css"; +import styles from "./channels-selection.module.scss"; const EmptyChild = () => { return ( diff --git a/web/html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx b/web/html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx index 8b45a1b81a8e..ca97d7668931 100644 --- a/web/html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx +++ b/web/html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx @@ -4,7 +4,7 @@ import { BaseChannelType, ChildChannelType } from "core/channels/type/channels.t import { Toggler } from "components/toggler"; -import styles from "./channels-selection.module.css"; +import styles from "./channels-selection.module.scss"; type Props = { base: BaseChannelType; diff --git a/web/html/src/manager/content-management/shared/components/panels/sources/sources.module.css b/web/html/src/manager/content-management/shared/components/panels/sources/sources.module.scss similarity index 100% rename from web/html/src/manager/content-management/shared/components/panels/sources/sources.module.css rename to web/html/src/manager/content-management/shared/components/panels/sources/sources.module.scss diff --git a/web/html/src/manager/content-management/shared/components/panels/sources/sources.tsx b/web/html/src/manager/content-management/shared/components/panels/sources/sources.tsx index c9f4cc351192..7695fa3de0af 100644 --- a/web/html/src/manager/content-management/shared/components/panels/sources/sources.tsx +++ b/web/html/src/manager/content-management/shared/components/panels/sources/sources.tsx @@ -14,7 +14,7 @@ import statesEnum from "../../../business/states.enum"; import { ProjectMessageType, ProjectSoftwareSourceType } from "../../../type"; import getRenderedMessages from "../../messages/messages"; import ChannelsSelection from "./channels/channels-selection"; -import styles from "./sources.module.css"; +import styles from "./sources.module.scss"; type SourcesProps = { projectId: string; diff --git a/web/html/src/manager/login/susemanager/login.module.less b/web/html/src/manager/login/susemanager/login.module.scss similarity index 85% rename from web/html/src/manager/login/susemanager/login.module.less rename to web/html/src/manager/login/susemanager/login.module.scss index 4a6f4389ad94..655ed8704da6 100644 --- a/web/html/src/manager/login/susemanager/login.module.less +++ b/web/html/src/manager/login/susemanager/login.module.scss @@ -1,4 +1,4 @@ -@import "../../../branding/css/susemanager/variables.less"; +@import "../../../branding/css/susemanager/variables.scss"; :global(.old-theme), :global(.new-theme) { @@ -7,7 +7,7 @@ min-height: 100vh; justify-content: center; align-items: center; - background: url("./background.svg") @eos-bc-pine-500 no-repeat center fixed; + background: url("./background.svg") $eos-bc-pine-500 no-repeat center fixed; } .wrapper { @@ -17,7 +17,7 @@ min-height: 700px; width: 100%; max-width: 1120px; - background-color: @eos-bc-white; + background-color: $eos-bc-white; } .brand { @@ -25,8 +25,8 @@ display: flex; flex-direction: column; justify-content: space-between; - background: @eos-bc-pine-500; - color: @eos-bc-white; + background: $eos-bc-pine-500; + color: $eos-bc-white; padding: 32px; } @@ -47,18 +47,18 @@ } .productLink { - color: @eos-bc-white; + color: $eos-bc-white; font-weight: bold; text-decoration: underline; } .productLink:hover { - color: @eos-bc-white; + color: $eos-bc-white; text-decoration: none; } .title { - color: @eos-bc-green-500; + color: $eos-bc-green-500; font-size: 28px; margin: 0 0 7px 0; } diff --git a/web/html/src/manager/login/susemanager/login.tsx b/web/html/src/manager/login/susemanager/login.tsx index dc9a77d34640..a29d73c13aa1 100644 --- a/web/html/src/manager/login/susemanager/login.tsx +++ b/web/html/src/manager/login/susemanager/login.tsx @@ -12,7 +12,7 @@ import { flatten } from "utils"; import { ThemeProps } from "../login"; import { getFormMessages, getGlobalMessages } from "../messages"; import useLoginApi from "../use-login-api"; -import styles from "./login.module.less"; +import styles from "./login.module.scss"; import logo from "./logo.svg"; import mobileLogo from "./mobile-logo.svg"; diff --git a/web/html/src/manager/shared/menu/menu.module.css b/web/html/src/manager/shared/menu/menu.module.scss similarity index 100% rename from web/html/src/manager/shared/menu/menu.module.css rename to web/html/src/manager/shared/menu/menu.module.scss diff --git a/web/html/src/manager/shared/menu/menu.tsx b/web/html/src/manager/shared/menu/menu.tsx index 1dba0a4dd1a1..450a7791139f 100644 --- a/web/html/src/manager/shared/menu/menu.tsx +++ b/web/html/src/manager/shared/menu/menu.tsx @@ -8,7 +8,7 @@ import { stringToReact } from "utils"; import { flatten } from "utils/jsx"; import { DEPRECATED_unsafeEquals } from "utils/legacy"; -import styles from "./menu.module.css"; +import styles from "./menu.module.scss"; type LinkProps = { url: string; diff --git a/web/html/src/manager/storybook/layout.module.less b/web/html/src/manager/storybook/layout.module.scss similarity index 100% rename from web/html/src/manager/storybook/layout.module.less rename to web/html/src/manager/storybook/layout.module.scss diff --git a/web/html/src/manager/storybook/layout.tsx b/web/html/src/manager/storybook/layout.tsx index 1f3481c3a800..47f3dceb760c 100644 --- a/web/html/src/manager/storybook/layout.tsx +++ b/web/html/src/manager/storybook/layout.tsx @@ -1,6 +1,6 @@ import React from "react"; -import styles from "./layout.module.less"; +import styles from "./layout.module.scss"; type Props = { children?: React.ReactNode; diff --git a/web/html/src/manager/storybook/storybook.module.less b/web/html/src/manager/storybook/storybook.module.scss similarity index 100% rename from web/html/src/manager/storybook/storybook.module.less rename to web/html/src/manager/storybook/storybook.module.scss diff --git a/web/html/src/manager/storybook/storybook.tsx b/web/html/src/manager/storybook/storybook.tsx index 434405890504..26902ebf0a60 100644 --- a/web/html/src/manager/storybook/storybook.tsx +++ b/web/html/src/manager/storybook/storybook.tsx @@ -7,7 +7,7 @@ import { IconTag } from "components/icontag"; import { StoryRow } from "./layout"; import stories from "./stories"; -import styles from "./storybook.module.less"; +import styles from "./storybook.module.scss"; const STORAGE_KEY = "storybook-show-code"; diff --git a/web/html/src/manager/virtualization/guests/console/guests-console.module.css b/web/html/src/manager/virtualization/guests/console/guests-console.module.scss similarity index 100% rename from web/html/src/manager/virtualization/guests/console/guests-console.module.css rename to web/html/src/manager/virtualization/guests/console/guests-console.module.scss diff --git a/web/html/src/manager/virtualization/guests/console/guests-console.tsx b/web/html/src/manager/virtualization/guests/console/guests-console.tsx index ccb4663eb5df..4a0f69ad763a 100644 --- a/web/html/src/manager/virtualization/guests/console/guests-console.tsx +++ b/web/html/src/manager/virtualization/guests/console/guests-console.tsx @@ -8,7 +8,7 @@ import { hideDialog } from "components/dialog/util"; import Network from "utils/network"; -import styles from "./guests-console.module.css"; +import styles from "./guests-console.module.scss"; import { ConsoleClientType } from "./guests-console-types"; import { MessagePopUp, PopupState } from "./MessagePopUp"; import { SpiceClient } from "./spice-client"; diff --git a/web/html/src/package.json b/web/html/src/package.json index e6ea3545c931..beca136c6d5f 100644 --- a/web/html/src/package.json +++ b/web/html/src/package.json @@ -70,8 +70,7 @@ "autoprefixer": "10.4.17", "babel-jest": "27.4.6", "babel-loader": "^8.0.5", - "bootstrap": "3.4.1", - "bootstrap5": "npm:bootstrap@5.3.2", + "bootstrap": "5.3.2", "clean-webpack-plugin": "^1.0.1", "copy-webpack-plugin": "5.1.2", "core-js": "^3.8.1", @@ -86,8 +85,6 @@ "jexl": "2.2.2", "jquery": "3.5.1", "jquery-ui": "1.10.4", - "less": "^4.1.2", - "less-loader": "^10.2.0", "license-checker-webpack-plugin": "0.2.1", "lodash": "4.17.21", "mini-css-extract-plugin": "^2.6.0", diff --git a/web/html/src/vendors/npm.licenses.structured.js b/web/html/src/vendors/npm.licenses.structured.js index 653346175e31..0c4fb78a82ba 100644 --- a/web/html/src/vendors/npm.licenses.structured.js +++ b/web/html/src/vendors/npm.licenses.structured.js @@ -1 +1 @@ -const npmLicensesArray=["MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MPL-2.0","MIT","ISC","LGPL-3.0-or-later","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","(MPL-2.0 OR Apache-2.0)","BSD-3-Clause","BSD-3-Clause","MIT","MIT","MIT","MIT","BSD-3-Clause","MIT","MIT","MIT","MIT","MIT","MIT","BSD-3-Clause","BSD","BSD","BSD","BSD","BSD","BSD","BSD","BSD","BSD","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","BSD-3-Clause","MIT","MIT","MIT","MIT","BSD-3-Clause","MIT","MIT","MIT","MIT","0BSD","MIT","MIT","MIT"],npmDependencies=[{name:"@babel/polyfill",license:"MIT",version:"7.7.0"},{name:"@babel/runtime",license:"MIT",version:"7.16.3"},{name:"@emotion/cache",license:"MIT",version:"11.11.0"},{name:"@emotion/hash",license:"MIT",version:"0.9.1"},{name:"@emotion/memoize",license:"MIT",version:"0.8.1"},{name:"@emotion/react",license:"MIT",version:"11.11.1"},{name:"@emotion/serialize",license:"MIT",version:"1.1.2"},{name:"@emotion/sheet",license:"MIT",version:"1.2.2"},{name:"@emotion/unitless",license:"MIT",version:"0.8.1"},{name:"@emotion/use-insertion-effect-with-fallbacks",license:"MIT",version:"1.0.1"},{name:"@emotion/utils",license:"MIT",version:"1.2.1"},{name:"@emotion/weak-memoize",license:"MIT",version:"0.3.1"},{name:"@formatjs/ecma402-abstract",license:"MIT",version:"1.17.0"},{name:"@formatjs/fast-memoize",license:"MIT",version:"2.2.0"},{name:"@formatjs/icu-messageformat-parser",license:"MIT",version:"2.6.0"},{name:"@formatjs/icu-skeleton-parser",license:"MIT",version:"1.6.0"},{name:"@formatjs/intl",license:"MIT",version:"2.9.0"},{name:"@formatjs/intl-localematcher",license:"MIT",version:"0.4.0"},{name:"@fullcalendar/common",license:"MIT",version:"5.5.1"},{name:"@fullcalendar/core",license:"MIT",version:"5.5.0"},{name:"@fullcalendar/daygrid",license:"MIT",version:"5.5.0"},{name:"@fullcalendar/interaction",license:"MIT",version:"5.5.0"},{name:"@fullcalendar/react",license:"MIT",version:"5.5.0"},{name:"@fullcalendar/timegrid",license:"MIT",version:"5.5.0"},{name:"@hot-loader/react-dom",license:"MIT",version:"17.0.1+4.13.0"},{name:"@novnc/novnc",license:"MPL-2.0",version:"1.1.0"},{name:"@popperjs/core",license:"MIT",version:"2.11.6"},{name:"@seznam/compose-react-refs",license:"ISC",version:"1.0.6"},{name:"@spice-project/spice-html5",license:"LGPL-3.0-or-later",version:"0.2.1"},{name:"@virtuoso.dev/react-urx",license:"MIT",version:"0.2.12"},{name:"@virtuoso.dev/urx",license:"MIT",version:"0.2.12"},{name:"babel-loader",license:"MIT",version:"8.2.2"},{name:"bootstrap",license:"MIT",version:"3.4.1"},{name:"classnames",license:"MIT",version:"2.3.1"},{name:"core-js",license:"MIT",version:"3.8.1"},{name:"css-loader",license:"MIT",version:"6.10.0"},{name:"date-fns",license:"MIT",version:"2.29.3"},{name:"dom-helpers",license:"MIT",version:"5.1.4"},{name:"dompurify",license:"(MPL-2.0 OR Apache-2.0)",version:"3.0.3"},{name:"exenv",license:"BSD-3-Clause",version:"1.2.2"},{name:"hoist-non-react-statics",license:"BSD-3-Clause",version:"3.3.2"},{name:"html-dom-parser",license:"MIT",version:"0.2.3"},{name:"html-react-parser",license:"MIT",version:"0.10.0"},{name:"immer",license:"MIT",version:"9.0.6"},{name:"inline-style-parser",license:"MIT",version:"0.1.1"},{name:"intl-messageformat",license:"BSD-3-Clause",version:"10.5.0"},{name:"ip-regex",license:"MIT",version:"4.3.0"},{name:"jexl",license:"MIT",version:"2.2.2"},{name:"less-loader",license:"MIT",version:"10.2.0"},{name:"lodash",license:"MIT",version:"4.17.21"},{name:"lodash.get",license:"MIT",version:"4.4.2"},{name:"memoize-one",license:"MIT",version:"5.2.1"},{name:"metal",license:"BSD-3-Clause",version:"2.16.8"},{name:"metal-ajax",license:"BSD",version:"2.1.1"},{name:"metal-debounce",license:"BSD",version:"2.0.2"},{name:"metal-dom",license:"BSD",version:"2.16.8"},{name:"metal-events",license:"BSD",version:"2.16.8"},{name:"metal-path-parser",license:"BSD",version:"1.0.4"},{name:"metal-promise",license:"BSD",version:"2.0.1"},{name:"metal-structs",license:"BSD",version:"1.0.2"},{name:"metal-uri",license:"BSD",version:"2.4.0"},{name:"metal-useragent",license:"BSD",version:"3.0.1"},{name:"mini-css-extract-plugin",license:"MIT",version:"2.6.0"},{name:"moment",license:"MIT",version:"2.29.4"},{name:"moment-timezone",license:"MIT",version:"0.5.35"},{name:"node-gettext",license:"MIT",version:"3.0.0"},{name:"object-assign",license:"MIT",version:"4.1.1"},{name:"postcss-loader",license:"MIT",version:"8.1.0"},{name:"prop-types",license:"MIT",version:"15.7.2"},{name:"react",license:"MIT",version:"16.14.0"},{name:"react-datepicker",license:"MIT",version:"4.5.0"},{name:"react-fast-compare",license:"MIT",version:"3.2.0"},{name:"react-hot-loader",license:"MIT",version:"4.13.0"},{name:"react-input-autosize",license:"MIT",version:"3.0.0"},{name:"react-is",license:"MIT",version:"16.12.0"},{name:"react-is-mounted-hook",license:"MIT",version:"1.1.2"},{name:"react-lifecycles-compat",license:"MIT",version:"3.0.4"},{name:"react-modal",license:"MIT",version:"3.13.1"},{name:"react-onclickoutside",license:"MIT",version:"6.12.2"},{name:"react-popper",license:"MIT",version:"2.3.0"},{name:"react-property",license:"MIT",version:"1.0.1"},{name:"react-select",license:"MIT",version:"4.3.1"},{name:"react-select-async-paginate",license:"MIT",version:"0.6.0"},{name:"react-toastify",license:"MIT",version:"6.0.5"},{name:"react-transition-group",license:"BSD-3-Clause",version:"4.4.2"},{name:"react-virtuoso",license:"MIT",version:"2.5.1"},{name:"regenerator-runtime",license:"MIT",version:"0.13.5"},{name:"sass-loader",license:"MIT",version:"14.1.0"},{name:"scheduler",license:"MIT",version:"0.20.1"},{name:"senna",license:"BSD-3-Clause",version:"2.7.9"},{name:"sleep-promise",license:"MIT",version:"9.1.0"},{name:"style-loader",license:"MIT",version:"3.3.4"},{name:"style-to-object",license:"MIT",version:"0.3.0"},{name:"stylis",license:"MIT",version:"4.2.0"},{name:"tslib",license:"0BSD",version:"2.1.0"},{name:"use-immer",license:"MIT",version:"0.3.5"},{name:"validator",license:"MIT",version:"13.7.0"},{name:"warning",license:"MIT",version:"4.0.3"}];module.exports={npmLicensesArray,npmDependencies}; \ No newline at end of file +const npmLicensesArray=["MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MPL-2.0","MIT","ISC","LGPL-3.0-or-later","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","(MPL-2.0 OR Apache-2.0)","BSD-3-Clause","BSD-3-Clause","MIT","MIT","MIT","MIT","BSD-3-Clause","MIT","MIT","MIT","MIT","MIT","BSD-3-Clause","BSD","BSD","BSD","BSD","BSD","BSD","BSD","BSD","BSD","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","MIT","BSD-3-Clause","MIT","MIT","MIT","MIT","BSD-3-Clause","MIT","MIT","MIT","MIT","0BSD","MIT","MIT","MIT"],npmDependencies=[{name:"@babel/polyfill",license:"MIT",version:"7.7.0"},{name:"@babel/runtime",license:"MIT",version:"7.16.3"},{name:"@emotion/cache",license:"MIT",version:"11.11.0"},{name:"@emotion/hash",license:"MIT",version:"0.9.1"},{name:"@emotion/memoize",license:"MIT",version:"0.8.1"},{name:"@emotion/react",license:"MIT",version:"11.11.1"},{name:"@emotion/serialize",license:"MIT",version:"1.1.2"},{name:"@emotion/sheet",license:"MIT",version:"1.2.2"},{name:"@emotion/unitless",license:"MIT",version:"0.8.1"},{name:"@emotion/use-insertion-effect-with-fallbacks",license:"MIT",version:"1.0.1"},{name:"@emotion/utils",license:"MIT",version:"1.2.1"},{name:"@emotion/weak-memoize",license:"MIT",version:"0.3.1"},{name:"@formatjs/ecma402-abstract",license:"MIT",version:"1.17.0"},{name:"@formatjs/fast-memoize",license:"MIT",version:"2.2.0"},{name:"@formatjs/icu-messageformat-parser",license:"MIT",version:"2.6.0"},{name:"@formatjs/icu-skeleton-parser",license:"MIT",version:"1.6.0"},{name:"@formatjs/intl",license:"MIT",version:"2.9.0"},{name:"@formatjs/intl-localematcher",license:"MIT",version:"0.4.0"},{name:"@fullcalendar/common",license:"MIT",version:"5.5.1"},{name:"@fullcalendar/core",license:"MIT",version:"5.5.0"},{name:"@fullcalendar/daygrid",license:"MIT",version:"5.5.0"},{name:"@fullcalendar/interaction",license:"MIT",version:"5.5.0"},{name:"@fullcalendar/react",license:"MIT",version:"5.5.0"},{name:"@fullcalendar/timegrid",license:"MIT",version:"5.5.0"},{name:"@hot-loader/react-dom",license:"MIT",version:"17.0.1+4.13.0"},{name:"@novnc/novnc",license:"MPL-2.0",version:"1.1.0"},{name:"@popperjs/core",license:"MIT",version:"2.11.6"},{name:"@seznam/compose-react-refs",license:"ISC",version:"1.0.6"},{name:"@spice-project/spice-html5",license:"LGPL-3.0-or-later",version:"0.2.1"},{name:"@virtuoso.dev/react-urx",license:"MIT",version:"0.2.12"},{name:"@virtuoso.dev/urx",license:"MIT",version:"0.2.12"},{name:"babel-loader",license:"MIT",version:"8.2.2"},{name:"classnames",license:"MIT",version:"2.3.1"},{name:"core-js",license:"MIT",version:"3.8.1"},{name:"css-loader",license:"MIT",version:"6.10.0"},{name:"date-fns",license:"MIT",version:"2.29.3"},{name:"dom-helpers",license:"MIT",version:"5.1.4"},{name:"dompurify",license:"(MPL-2.0 OR Apache-2.0)",version:"3.0.3"},{name:"exenv",license:"BSD-3-Clause",version:"1.2.2"},{name:"hoist-non-react-statics",license:"BSD-3-Clause",version:"3.3.2"},{name:"html-dom-parser",license:"MIT",version:"0.2.3"},{name:"html-react-parser",license:"MIT",version:"0.10.0"},{name:"immer",license:"MIT",version:"9.0.6"},{name:"inline-style-parser",license:"MIT",version:"0.1.1"},{name:"intl-messageformat",license:"BSD-3-Clause",version:"10.5.0"},{name:"ip-regex",license:"MIT",version:"4.3.0"},{name:"jexl",license:"MIT",version:"2.2.2"},{name:"lodash",license:"MIT",version:"4.17.21"},{name:"lodash.get",license:"MIT",version:"4.4.2"},{name:"memoize-one",license:"MIT",version:"5.2.1"},{name:"metal",license:"BSD-3-Clause",version:"2.16.8"},{name:"metal-ajax",license:"BSD",version:"2.1.1"},{name:"metal-debounce",license:"BSD",version:"2.0.2"},{name:"metal-dom",license:"BSD",version:"2.16.8"},{name:"metal-events",license:"BSD",version:"2.16.8"},{name:"metal-path-parser",license:"BSD",version:"1.0.4"},{name:"metal-promise",license:"BSD",version:"2.0.1"},{name:"metal-structs",license:"BSD",version:"1.0.2"},{name:"metal-uri",license:"BSD",version:"2.4.0"},{name:"metal-useragent",license:"BSD",version:"3.0.1"},{name:"mini-css-extract-plugin",license:"MIT",version:"2.6.0"},{name:"moment",license:"MIT",version:"2.29.4"},{name:"moment-timezone",license:"MIT",version:"0.5.35"},{name:"node-gettext",license:"MIT",version:"3.0.0"},{name:"object-assign",license:"MIT",version:"4.1.1"},{name:"postcss-loader",license:"MIT",version:"8.1.0"},{name:"prop-types",license:"MIT",version:"15.7.2"},{name:"react",license:"MIT",version:"16.14.0"},{name:"react-datepicker",license:"MIT",version:"4.5.0"},{name:"react-fast-compare",license:"MIT",version:"3.2.0"},{name:"react-hot-loader",license:"MIT",version:"4.13.0"},{name:"react-input-autosize",license:"MIT",version:"3.0.0"},{name:"react-is",license:"MIT",version:"16.12.0"},{name:"react-is-mounted-hook",license:"MIT",version:"1.1.2"},{name:"react-lifecycles-compat",license:"MIT",version:"3.0.4"},{name:"react-modal",license:"MIT",version:"3.13.1"},{name:"react-onclickoutside",license:"MIT",version:"6.12.2"},{name:"react-popper",license:"MIT",version:"2.3.0"},{name:"react-property",license:"MIT",version:"1.0.1"},{name:"react-select",license:"MIT",version:"4.3.1"},{name:"react-select-async-paginate",license:"MIT",version:"0.6.0"},{name:"react-toastify",license:"MIT",version:"6.0.5"},{name:"react-transition-group",license:"BSD-3-Clause",version:"4.4.2"},{name:"react-virtuoso",license:"MIT",version:"2.5.1"},{name:"regenerator-runtime",license:"MIT",version:"0.13.5"},{name:"sass-loader",license:"MIT",version:"14.1.0"},{name:"scheduler",license:"MIT",version:"0.20.1"},{name:"senna",license:"BSD-3-Clause",version:"2.7.9"},{name:"sleep-promise",license:"MIT",version:"9.1.0"},{name:"style-loader",license:"MIT",version:"3.3.4"},{name:"style-to-object",license:"MIT",version:"0.3.0"},{name:"stylis",license:"MIT",version:"4.2.0"},{name:"tslib",license:"0BSD",version:"2.1.0"},{name:"use-immer",license:"MIT",version:"0.3.5"},{name:"validator",license:"MIT",version:"13.7.0"},{name:"warning",license:"MIT",version:"4.0.3"}];module.exports={npmLicensesArray,npmDependencies}; \ No newline at end of file diff --git a/web/html/src/vendors/npm.licenses.txt b/web/html/src/vendors/npm.licenses.txt index 11e411f1c1ea..4172d2ccd1ce 100644 --- a/web/html/src/vendors/npm.licenses.txt +++ b/web/html/src/vendors/npm.licenses.txt @@ -916,34 +916,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------------------------------- -bootstrap v3.4.1 - Twitter, Inc. -https://github.com/twbs/bootstrap.git --------------------------------------------------------------------------------- - -The MIT License (MIT) - -Copyright (c) 2011-2019 Twitter, 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. - - -------------------------------------------------------------------------------- classnames v2.3.1 - Jed Watson https://github.com/JedWatson/classnames.git @@ -1725,33 +1697,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------------------------------- -less-loader v10.2.0 - Johannes Ewald @jhnns -webpack-contrib/less-loader --------------------------------------------------------------------------------- - -Copyright JS Foundation and other contributors - -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. - - -------------------------------------------------------------------------------- lodash v4.17.21 - John-David Dalton lodash/lodash diff --git a/web/html/src/yarn.lock b/web/html/src/yarn.lock index 8517cd30dd08..2fd0aee2a69b 100644 --- a/web/html/src/yarn.lock +++ b/web/html/src/yarn.lock @@ -3946,21 +3946,21 @@ bonjour@^3.5.0: multicast-dns "^6.0.1" multicast-dns-service-types "^1.1.0" -"bootstrap5@npm:bootstrap@5.3.2": +bootstrap@5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.2.tgz#97226583f27aae93b2b28ab23f4c114757ff16ae" integrity sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g== -bootstrap@3.4.1, bootstrap@^3.3.6: - version "3.4.1" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72" - integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA== - bootstrap@>=2.0.0: version "5.2.2" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.2.tgz#834e053eed584a65e244d8aa112a6959f56e27a0" integrity sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ== +bootstrap@^3.3.6: + version "3.4.1" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72" + integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA== + bootstrap@^4.3.1: version "4.6.1" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.1.tgz#bc25380c2c14192374e8dec07cf01b2742d222a2" @@ -4684,13 +4684,6 @@ cookie@0.4.1, cookie@^0.4.1: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== -copy-anything@^2.0.1: - version "2.0.6" - resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480" - integrity sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw== - dependencies: - is-what "^3.14.1" - copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -5364,13 +5357,6 @@ eos-ds@^5.0.0: bootstrap "^4.3.1" jquery "^3.6.0" -errno@^0.1.1: - version "0.1.8" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" - integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== - dependencies: - prr "~1.0.1" - errno@^0.1.3: version "0.1.7" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" @@ -6930,13 +6916,6 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -iconv-lite@^0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" - integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - icss-utils@^5.0.0, icss-utils@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" @@ -6979,11 +6958,6 @@ ignore@^5.2.0: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== -image-size@~0.5.0: - version "0.5.5" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" - integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ== - immer@9.0.6, immer@^9.0.7: version "9.0.6" resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.6.tgz#7a96bf2674d06c8143e327cbf73539388ddf1a73" @@ -7567,11 +7541,6 @@ is-weakref@^1.0.1: dependencies: call-bind "^1.0.2" -is-what@^3.14.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1" - integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA== - is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -8361,11 +8330,6 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -klona@^2.0.4: - version "2.0.6" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22" - integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA== - language-subtag-registry@~0.3.2: version "0.3.21" resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz#04ac218bea46f04cb039084602c6da9e788dd45a" @@ -8378,30 +8342,6 @@ language-tags@^1.0.5: dependencies: language-subtag-registry "~0.3.2" -less-loader@^10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-10.2.0.tgz#97286d8797dc3dc05b1d16b0ecec5f968bdd4e32" - integrity sha512-AV5KHWvCezW27GT90WATaDnfXBv99llDbtaj4bshq6DvAihMdNjaPDcUMa6EXKLRF+P2opFenJp89BXg91XLYg== - dependencies: - klona "^2.0.4" - -less@^4.1.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/less/-/less-4.1.3.tgz#175be9ddcbf9b250173e0a00b4d6920a5b770246" - integrity sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA== - dependencies: - copy-anything "^2.0.1" - parse-node-version "^1.0.1" - tslib "^2.3.0" - optionalDependencies: - errno "^0.1.1" - graceful-fs "^4.1.2" - image-size "~0.5.0" - make-dir "^2.1.0" - mime "^1.4.1" - needle "^3.1.0" - source-map "~0.6.0" - leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -8633,7 +8573,7 @@ magic-string@^0.25.7: dependencies: sourcemap-codec "^1.4.4" -make-dir@^2.0.0, make-dir@^2.1.0: +make-dir@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== @@ -8904,7 +8844,7 @@ mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17: dependencies: mime-db "1.51.0" -mime@1.6.0, mime@^1.4.1: +mime@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== @@ -9161,15 +9101,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -needle@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-3.1.0.tgz#3bf5cd090c28eb15644181ab6699e027bd6c53c9" - integrity sha512-gCE9weDhjVGCRqS8dwDR/D3GTAeyXLXuqp7I8EzH6DllZGXSUyxuqqLh+YX9rMAWaaTFyVAg6rHGL25dqvczKw== - dependencies: - debug "^3.2.6" - iconv-lite "^0.6.3" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -9703,11 +9634,6 @@ parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-node-version@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" - integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== - parse5@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" @@ -11003,11 +10929,6 @@ sass@1.70.0: immutable "^4.0.0" source-map-js ">=0.6.2 <2.0.0" -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" @@ -11462,7 +11383,7 @@ source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== @@ -12195,11 +12116,6 @@ tslib@^2.1.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== -tslib@^2.3.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== - tslib@^2.4.0: version "2.6.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" diff --git a/web/spacewalk-web.changes.eth.remove-3 b/web/spacewalk-web.changes.eth.remove-3 new file mode 100644 index 000000000000..8745c9f67f07 --- /dev/null +++ b/web/spacewalk-web.changes.eth.remove-3 @@ -0,0 +1 @@ +- Reduced bundle size for the web UI