Update to tailwind 3 (librenms#13695)

TheMysteriousX · Jan 27, 2022 · 3a4efc6 · 3a4efc6
1 parent 25ab5df
commit 3a4efc6
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 456 deletions.
diff --git a/html/css/app.css b/html/css/app.css
diff --git a/html/mix-manifest.json b/html/mix-manifest.json
@@ -2,7 +2,7 @@
     "/js/app.js": "/js/app.js?id=50f82aa2aac679191fac",
     "/js/manifest.js": "/js/manifest.js?id=2951ae529be231f05a93",
     "/css/vendor.css": "/css/vendor.css?id=2568831af31dbfc3128a",
-    "/css/app.css": "/css/app.css?id=32efa78901389534a9e8",
+    "/css/app.css": "/css/app.css?id=936fe619dcf1bac0a33f",
     "/js/vendor.js": "/js/vendor.js?id=c5fd3d75a63757080dbb",
     "/js/lang/de.js": "/js/lang/de.js?id=1aedfce25e3daad3046a",
     "/js/lang/en.js": "/js/lang/en.js?id=3617cad4c8bcf97221a6",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
         "resolve-url-loader": "^5.0.0",
         "sass": "^1.49.0",
         "sass-loader": "^12.4.0",
-        "tailwindcss": "^2.2.19",
+        "tailwindcss": "^3.0.15",
         "vue": "^2.6.14",
         "vue-loader": "^15.9.8",
         "vue-template-compiler": "^2.6.14"

diff --git a/resources/views/layouts/flasher-notification.blade.php b/resources/views/layouts/flasher-notification.blade.php
@@ -2,15 +2,15 @@
 $title = $envelope->getTitle();
 switch ($envelope->getType()) {
     case 'success':
-        $color = 'tw-text-green-600';
+        $color = 'tw-text-emerald-600';
         $class = 'flasher-success';
         break;
     case 'error':
         $color = 'tw-text-red-600';
         $class = 'flasher-error';
         break;
     case 'warning':
-        $color = 'tw-text-yellow-600';
+        $color = 'tw-text-amber-600';
         $class = 'flasher-warning';
         break;
     case 'info':

diff --git a/resources/views/layouts/librenmsv1.blade.php b/resources/views/layouts/librenmsv1.blade.php
@@ -22,7 +22,6 @@
     <meta name="msapplication-config" content="{{ asset('images/browserconfig.xml') }}">
     <meta name="theme-color" content="#ffffff">
 
-    <link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet">
     <link href="{{ asset('css/bootstrap-datetimepicker.min.css') }}" rel="stylesheet">
     <link href="{{ asset('css/bootstrap-switch.min.css') }}" rel="stylesheet">
     <link href="{{ asset('css/toastr.min.css') }}" rel="stylesheet">
@@ -41,6 +40,7 @@
     <link href="{{ asset('css/select2-bootstrap.min.css') }}" rel="stylesheet">
     <link href="{{ asset('css/query-builder.default.min.css') }}" rel="stylesheet">
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
+    <link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet">
     <link href="{{ asset(LibreNMS\Config::get('stylesheet', 'css/styles.css')) }}?ver=20210421" rel="stylesheet">
     <link href="{{ asset('css/' . LibreNMS\Config::get('applied_site_style', 'light') . '.css?ver=632417643') }}" rel="stylesheet">
     @foreach(LibreNMS\Config::get('webui.custom_css', []) as $custom_css)

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   prefix: 'tw-',
-  purge: [
+  content: [
       './storage/framework/views/*.php',
       './resources/**/*.blade.php',
       './resources/**/*.js',
@@ -33,8 +33,5 @@ module.exports = {
       'xl': '1200px',
     }
   },
-  variants: {
-    extend: {},
-  },
   plugins: [],
 }