From 3633ce374e65a3526bff00b4a4490088e0f2c9e2 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Fri, 21 Jun 2024 13:05:53 -0700 Subject: [PATCH] Revert "[JENKINS-73114] avoid conflicts with css classes from bootstrap" on `stable-2.452` (#9409) Revert "[JENKINS-73114] avoid conflicts with css classes from bootstrap (#9254)" This reverts commit b87adb7e812098695386a640d665ef1e8cee6b72. --- .../message.jelly | 2 +- .../PluginDeprecationMonitor/message.jelly | 2 +- .../PluginUpdateMonitor/message.jelly | 2 +- .../hudson/PluginManager/advanced.jelly | 2 +- .../hudson/PluginManager/installed.jelly | 10 +- .../hudson/PluginManager/updates.jelly | 16 +-- .../message.jelly | 2 +- .../HudsonHomeDiskUsageMonitor/message.jelly | 2 +- .../NullIdDescriptorMonitor/message.jelly | 2 +- .../diagnosis/OldDataMonitor/message.jelly | 2 +- .../ReverseProxySetupMonitor/message.jelly | 2 +- .../TooManyJobsButNoView/message.jelly | 2 +- .../logging/LogRecorder/configure.jelly | 2 +- .../logging/LogRecorderManager/all.jelly | 2 +- .../CoreUpdateMonitor/message.jelly | 2 +- .../MonitorMarkedNodeOffline/message.jelly | 2 +- .../AdministrativeMonitorImpl/message.jelly | 2 +- .../SlowTriggerAdminMonitor/message.groovy | 2 +- .../util/AdministrativeError/message.jelly | 2 +- .../util/DoubleLaunchChecker/message.jelly | 2 +- .../diagnosis/HsErrPidList/message.jelly | 2 +- .../message.jelly | 2 +- .../ControllerExecutorsAgents/message.jelly | 2 +- .../ControllerExecutorsNoAgents/message.jelly | 2 +- .../RootUrlNotSetMonitor/message.jelly | 2 +- .../SecurityIsOffMonitor/message.jelly | 2 +- .../authenticate-security-token.jelly | 2 +- .../install/pluginSetupWizard.properties | 6 +- .../install/pluginSetupWizard_fr.properties | 4 +- .../install/pluginSetupWizard_it.properties | 6 +- .../install/pluginSetupWizard_lt.properties | 2 +- .../install/pluginSetupWizard_pl.properties | 4 +- .../pluginSetupWizard_pt_BR.properties | 6 +- .../install/pluginSetupWizard_sr.properties | 4 +- .../pluginSetupWizard_sv_SE.properties | 111 ------------------ .../pluginSetupWizard_zh_CN.properties | 6 +- .../pluginSetupWizard_zh_TW.properties | 6 +- .../resources.css | 17 ++- .../model/BuiltInNodeMigration/message.jelly | 2 +- .../message.jelly | 2 +- .../jenkins/model/Jenkins/downgrade.jelly | 2 +- .../message.jelly | 2 +- .../message.jelly | 2 +- .../RekeySecretAdminMonitor/message.groovy | 8 +- .../message.groovy | 2 +- .../UpdateSiteWarningsMonitor/message.groovy | 2 +- .../message.jelly | 2 +- .../message.jelly | 2 +- .../message.jelly | 2 +- .../CSRFAdministrativeMonitor/message.jelly | 2 +- .../test/java/hudson/PluginManagerTest.java | 2 +- .../js/templates/plugin-manager/available.hbs | 8 +- war/src/main/scss/components/_alert.scss | 55 --------- war/src/main/scss/pages/_manage-jenkins.scss | 39 +++--- war/src/main/scss/simple-page.scss | 3 +- 55 files changed, 109 insertions(+), 276 deletions(-) delete mode 100644 core/src/main/resources/jenkins/install/pluginSetupWizard_sv_SE.properties delete mode 100644 war/src/main/scss/components/_alert.scss diff --git a/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly index cb20ebf8dfe7..5ccac430ecd2 100644 --- a/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly +++ b/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. -
+
${%PluginCycles}
diff --git a/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly index 1f5ec400bd3c..45c4cead0a44 100644 --- a/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly +++ b/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. -
+
${%DeprecatedPlugins}
diff --git a/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly index b1f9ba193d49..73182ec483e4 100644 --- a/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly +++ b/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. -
+
${%RequiredPluginUpdates}
diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly index 81948afa6e80..8d0e6abcd22e 100644 --- a/core/src/main/resources/hudson/PluginManager/advanced.jelly +++ b/core/src/main/resources/hudson/PluginManager/advanced.jelly @@ -37,7 +37,7 @@ THE SOFTWARE. -
+
${%proxyMovedBlurb(rootURL+"/manage/configure")}
diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly index 57679d61ffe3..8013742cf738 100644 --- a/core/src/main/resources/hudson/PluginManager/installed.jelly +++ b/core/src/main/resources/hudson/PluginManager/installed.jelly @@ -54,7 +54,7 @@ THE SOFTWARE. data-is-restart-required="${app.updateCenter.isRestartRequiredForCompletion()}" /> -
${%Warning}: ${%requires.restart}
+
${%Warning}: ${%requires.restart}