From aef1d1a3aedb3c0c5a51cc72bb254a3ef8fe040c Mon Sep 17 00:00:00 2001
From: William Allen <16820599+williamjallen@users.noreply.github.com>
Date: Tue, 16 Dec 2025 22:07:24 -0500
Subject: [PATCH] Restructure legacy CSS files

---
 resources/css/legacy.css                         |  4 ++++
 resources/css/{vue_common.css => legacy_vue.css} |  2 ++
 resources/views/cdash.blade.php                  | 10 +++-------
 webpack.mix.js                                   | 10 ++--------
 4 files changed, 11 insertions(+), 15 deletions(-)
 create mode 100644 resources/css/legacy.css
 rename resources/css/{vue_common.css => legacy_vue.css} (98%)

diff --git a/resources/css/legacy.css b/resources/css/legacy.css
new file mode 100644
index 0000000000..8d13375e6b
--- /dev/null
+++ b/resources/css/legacy.css
@@ -0,0 +1,4 @@
+@import 'bootstrap/dist/css/bootstrap.css';
+@import 'jquery-ui-dist/jquery-ui.css';
+@import 'nvd3/build/nv.d3.min.css';
+@import 'bootstrap.min.css';
diff --git a/resources/css/vue_common.css b/resources/css/legacy_vue.css
similarity index 98%
rename from resources/css/vue_common.css
rename to resources/css/legacy_vue.css
index a0e35678c0..2b7182505b 100644
--- a/resources/css/vue_common.css
+++ b/resources/css/legacy_vue.css
@@ -1,3 +1,5 @@
+@import 'legacy.css';
+
 .tooltip {
   display: block !important;
   z-index: 10000;
diff --git a/resources/views/cdash.blade.php b/resources/views/cdash.blade.php
index 5ba78e30ee..360ff04c25 100755
--- a/resources/views/cdash.blade.php
+++ b/resources/views/cdash.blade.php
@@ -30,24 +30,20 @@
 
     {{-- Framework-specific details --}}
     @if(isset($angular) && $angular === true)
-        <link rel="stylesheet" type="text/css" href="{{ asset(mix('assets/css/legacy_3rdparty.css')) }}"/>
+        <link rel="stylesheet" type="text/css" href="{{ asset(mix('assets/css/legacy.css')) }}"/>
         <link rel="stylesheet" type="text/css" href="{{ asset(mix(get_css_file())) }} }}"/>
-        <link rel="stylesheet" href="{{ asset(mix('assets/css/bootstrap.min.css')) }}"/>
         <script src="{{ asset(mix('assets/js/legacy.js')) }}"></script>
     @elseif(isset($vue) && $vue === true)
         <link rel="stylesheet" type="text/css" href="{{ asset(mix(get_css_file())) }}"/>
         @if(isset($daisyui) && $daisyui === true)
             <link rel="stylesheet" type="text/css" href="{{ asset(mix('assets/css/app.css')) }}"/>
         @else
-            <link rel="stylesheet" type="text/css" href="{{ asset(mix('assets/css/legacy_3rdparty.css')) }}"/>
-            <link rel="stylesheet" type="text/css" href="{{ asset(mix('assets/css/vue_common.css')) }}"/>
-            <link rel="stylesheet" type="text/css" href="{{ asset(mix('assets/css/bootstrap.min.css')) }}"/>
+            <link rel="stylesheet" type="text/css" href="{{ asset(mix('assets/css/legacy_vue.css')) }}"/>
         @endif
         <script src="{{ asset(mix('assets/js/app.js')) }}" type="text/javascript" defer></script>
     @else
-        <link rel="stylesheet" type="text/css" href="{{ asset(mix('assets/css/legacy_3rdparty.css')) }}"/>
+        <link rel="stylesheet" type="text/css" href="{{ asset(mix('assets/css/legacy.css')) }}"/>
         <link rel="stylesheet" type="text/css" href="{{ asset(mix(get_css_file())) }}"/>
-        <link rel="stylesheet" href="{{ asset(mix('assets/css/bootstrap.min.css')) }}"/>
         <script src="{{ asset(mix('assets/js/legacy.js')) }}"></script>
         @if(str_contains(request()->url(), 'viewCoverage.php')) {{-- This last XSL page needs special treatment... --}}
             <link rel="stylesheet" type="text/css" href="{{ asset(mix('assets/css/jquery.dataTables.css')) }}"/>
diff --git a/webpack.mix.js b/webpack.mix.js
index cffbaa4b20..59555824be 100755
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -26,15 +26,9 @@ mix.copy('resources/js/angular/views/partials/*.html', 'public/assets/js/angular
 mix.css('resources/css/cdash.css', 'public/assets/css/cdash.css');
 mix.css('resources/css/colorblind.css', 'public/assets/css/colorblind.css');
 mix.css('resources/css/jquery.dataTables.css', 'public/assets/css/jquery.dataTables.css');
-mix.css('resources/css/bootstrap.min.css', 'public/assets/css/bootstrap.min.css');
-mix.css('resources/css/vue_common.css', 'public/assets/css/vue_common.css');
-
-mix.styles([
-  'node_modules/bootstrap/dist/css/bootstrap.css',
-  'node_modules/jquery-ui-dist/jquery-ui.css',
-  'node_modules/nvd3/build/nv.d3.min.css',
-], 'public/assets/css/legacy_3rdparty.css');
 
+mix.css('resources/css/legacy.css', 'public/assets/css/legacy.css');
+mix.css('resources/css/legacy_vue.css', 'public/assets/css/legacy_vue.css');
 mix.sass('resources/sass/app.scss', 'public/assets/css/app.css');
 
 mix.copy('resources/js/angular/jquery.dataTables.min.js', 'public/assets/js/jquery.dataTables.min.js');