Skip to content

Commit f78b76e

Browse files
murrantmurrant
authored
Upgrade to Tailwind 4 (librenms#17253)
1 parent 92a490a commit f78b76e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3612
-2559
lines changed

‎html/css/app.css‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎html/css/vendor.css‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎html/js/app.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎html/js/boot.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ $.ajaxSetup({
3030

3131
// toastr style to match php toasts
3232
toastr.options = {
33-
toastClass: 'tw-border-current tw-relative tw-pl-20 tw-py-4 tw-pr-2 tw-bg-white dark:tw-bg-dark-gray-300 tw-opacity-80 hover:tw-opacity-100 tw-rounded-md tw-shadow-lg hover:tw-shadow-xl tw-border-l-8 tw-border-t-0.5 tw-border-r-0.5 tw-border-b-0.5 tw-mt-2 tw-cursor-pointer',
34-
titleClass: 'tw-text-xl tw-leading-7 tw-font-semibold tw-capitalize',
35-
messageClass: 'tw-mt-1 tw-text-base tw-leading-5 tw-text-gray-500 dark:tw-text-white',
33+
toastClass: 'tw:border-current tw:relative tw:pl-20 tw:py-4 tw:pr-2 tw:bg-white tw:dark:bg-dark-gray-300 tw:opacity-80 tw:hover:opacity-100 tw:rounded-md tw:shadow-lg tw:hover:shadow-xl tw:border-l-8 tw:border-t-0.5 tw:border-r-0.5 tw:border-b-0.5 tw:mt-2 tw:cursor-pointer',
34+
titleClass: 'tw:text-xl tw:leading-7 tw:font-semibold tw:capitalize',
35+
messageClass: 'tw:mt-1 tw:text-base tw:leading-5 tw:text-gray-500 tw:dark:text-white',
3636
iconClasses: {
37-
error: 'toast-error tw-text-red-600 tw-border-red-600',
38-
info: 'toast-info tw-text-blue-600 tw-border-blue-600',
39-
success: 'toast-success tw-text-green-600 tw-border-green-600',
40-
warning: 'toast-warning tw-text-yellow-600 tw-border-yellow-600'
37+
error: 'toast-error tw:text-red-600 tw:border-red-600',
38+
info: 'toast-info tw:text-blue-600 tw:border-blue-600',
39+
success: 'toast-success tw:text-green-600 tw:border-green-600',
40+
warning: 'toast-warning tw:text-yellow-600 tw:border-yellow-600'
4141
},
4242
timeOut: 12000,
4343
progressBar: true,
44-
progressClass: 'toast-progress tw-h-1 tw-bg-current tw-absolute tw-bottom-0 tw-left-0 tw-mr-0.5',
44+
progressClass: 'toast-progress tw:h-1 tw:bg-current tw:absolute tw:bottom-0 tw:left-0 tw:mr-0.5',
4545
containerId: 'toast-container-top-right'
4646
};

‎html/js/vendor.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎html/js/vendor.js.LICENSE.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* Released under the MIT License.
1818
*/
1919

20+
/*! Axios v1.8.3 Copyright (c) 2025 Matt Zabriskie and contributors */
21+
2022
/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
2123

2224
/**

‎html/mix-manifest.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"/js/app.js": "/js/app.js?id=eb2bdde63ce2ff449be654729ed0136b",
2+
"/js/app.js": "/js/app.js?id=1a03d9f0eac647f5657d05383996731f",
33
"/js/manifest.js": "/js/manifest.js?id=2eb19d92c19953027907b72ff5963ebb",
4-
"/css/vendor.css": "/css/vendor.css?id=d520734ded0ec75b0a572aa8db1c2161",
5-
"/css/app.css": "/css/app.css?id=dcc1cfc548f711f258651833d592f7fb",
6-
"/js/vendor.js": "/js/vendor.js?id=9c1ce1964559bbafd2c87384ac2f9058",
7-
"/js/lang/de.js": "/js/lang/de.js?id=d40933e0d2f0b7c3b63a",
8-
"/js/lang/en.js": "/js/lang/en.js?id=dee372fc02db6880698c",
9-
"/js/lang/fr.js": "/js/lang/fr.js?id=e893e6ab2524aef3d07e",
10-
"/js/lang/it.js": "/js/lang/it.js?id=71de629d4ce5fecb2126",
11-
"/js/lang/pt-BR.js": "/js/lang/pt-BR.js?id=3d42629cde9f87dfa8d7",
12-
"/js/lang/ru.js": "/js/lang/ru.js?id=72c8c6753f761ccd17c2",
13-
"/js/lang/sr.js": "/js/lang/sr.js?id=eac37137736d4f0fea4f",
14-
"/js/lang/uk.js": "/js/lang/uk.js?id=6bc672052e314b054242",
15-
"/js/lang/zh-CN.js": "/js/lang/zh-CN.js?id=4dfdb26b7ac232e299a6",
16-
"/js/lang/zh-TW.js": "/js/lang/zh-TW.js?id=3e0ff8611b6f6a88ed66"
4+
"/css/vendor.css": "/css/vendor.css?id=999cd44ea0dcc1c8ca959a573c2866e1",
5+
"/css/app.css": "/css/app.css?id=4725348c1a9d8f6d72074efe80aa28b6",
6+
"/js/vendor.js": "/js/vendor.js?id=532b0b119be47808e51dc1d760b53955",
7+
"/js/lang/de.js": "/js/lang/de.js?id=d40933e0d2f0b7c3b63a9b8f2e8a5168",
8+
"/js/lang/en.js": "/js/lang/en.js?id=ae40d5f1b2e2748b3531c33f9de307ba",
9+
"/js/lang/fr.js": "/js/lang/fr.js?id=b3514c3dafd3c1be60a32e98ebd0a231",
10+
"/js/lang/it.js": "/js/lang/it.js?id=22f98925e66b89811e6ce7cdb4148bc0",
11+
"/js/lang/pt-BR.js": "/js/lang/pt-BR.js?id=b0624b2440751b800b58940a09177290",
12+
"/js/lang/ru.js": "/js/lang/ru.js?id=d1783c8f6434b9478587bf252c8c9fdc",
13+
"/js/lang/sr.js": "/js/lang/sr.js?id=eac37137736d4f0fea4f4395326e7a2f",
14+
"/js/lang/uk.js": "/js/lang/uk.js?id=0ac05238aac82fcd840b624afebb17d1",
15+
"/js/lang/zh-CN.js": "/js/lang/zh-CN.js?id=4dfdb26b7ac232e299a66adc3f2f25bb",
16+
"/js/lang/zh-TW.js": "/js/lang/zh-TW.js?id=3e0ff8611b6f6a88ed6640b453683ea6"
1717
}

‎includes/html/pages/device/edit/modules.inc.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@
9595
</td>
9696
<td style="vertical-align: middle">';
9797

98-
echo '<button type="button" class="btn btn-default tw-mr-1 poller-reset-button" id="poller-reset-button-' . $module . '" style="visibility: ' . (isset($attribs['poll_' . $module]) ? 'visible' : 'hidden') . '" title="Reset device override"><i class="fa fa-lg fa-solid fa-rotate-left"></i></button>';
98+
echo '<button type="button" class="btn btn-default tw:mr-1 poller-reset-button" id="poller-reset-button-' . $module . '" style="visibility: ' . (isset($attribs['poll_' . $module]) ? 'visible' : 'hidden') . '" title="Reset device override"><i class="fa fa-lg fa-solid fa-rotate-left"></i></button>';
9999

100100
$moduleInstance = Module::fromName($module);
101101
if ($moduleInstance->dataExists(DeviceCache::getPrimary())) {
102-
echo '<button type="button" class="btn btn-default delete-button-' . $module . '" title="Delete Module Data" data-toggle="modal" data-target="#delete-module-data" data-module="' . $module . '" data-module-name="' . $module_name . '"><i class="fa fa-lg fa-solid fa-trash tw-text-red-600"></button>';
102+
echo '<button type="button" class="btn btn-default delete-button-' . $module . '" title="Delete Module Data" data-toggle="modal" data-target="#delete-module-data" data-module="' . $module . '" data-module-name="' . $module_name . '"><i class="fa fa-lg fa-solid fa-trash tw:text-red-600"></button>';
103103
}
104104

105105
echo '</td>
@@ -190,11 +190,11 @@
190190
</td>
191191
<td style="vertical-align: middle">';
192192

193-
echo '<button type="button" class="btn btn-default tw-mr-1 discovery-reset-button" id="discovery-reset-button-' . $module . '" style="visibility: ' . (isset($attribs['discover_' . $module]) ? 'visible' : 'hidden') . '" title="Reset device override"><i class="fa fa-lg fa-solid fa-rotate-left"></i></button>';
193+
echo '<button type="button" class="btn btn-default tw:mr-1 discovery-reset-button" id="discovery-reset-button-' . $module . '" style="visibility: ' . (isset($attribs['discover_' . $module]) ? 'visible' : 'hidden') . '" title="Reset device override"><i class="fa fa-lg fa-solid fa-rotate-left"></i></button>';
194194

195195
$moduleInstance = Module::fromName($module);
196196
if ($moduleInstance->dataExists(DeviceCache::getPrimary())) {
197-
echo '<button type="button" class="btn btn-default delete-button-' . $module . '" title="Delete Module Data" data-toggle="modal" data-target="#delete-module-data" data-module="' . $module . '" data-module-name="' . $module_name . '"><i class="fa fa-lg fa-solid fa-trash tw-text-red-600"></button>';
197+
echo '<button type="button" class="btn btn-default delete-button-' . $module . '" title="Delete Module Data" data-toggle="modal" data-target="#delete-module-data" data-module="' . $module . '" data-module-name="' . $module_name . '"><i class="fa fa-lg fa-solid fa-trash tw:text-red-600"></button>';
198198
}
199199

200200
echo '</td>

‎includes/html/pages/notifications.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
}
4141

4242
if ($total > 0 && ! isset($vars['archive'])) {
43-
echo '<button class="btn btn-success pull-right fa fa-eye read-all-notif tw-mr-2" data-toggle="tooltip" data-placement="bottom" title="Mark all as Read" style="margin-top:-10px;"></button>';
43+
echo '<button class="btn btn-success pull-right fa fa-eye read-all-notif tw:mr-2" data-toggle="tooltip" data-placement="bottom" title="Mark all as Read" style="margin-top:-10px;"></button>';
4444
}
4545
?>
4646
</h4>

0 commit comments

Comments
 (0)