diff --git a/package-lock.json b/package-lock.json index 3338654b..0013829b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,9 +16,9 @@ "@json2csv/plainjs": "^7.0.6", "@reduxjs/toolkit": "^2.8.2", "@shlinkio/data-manipulation": "^1.0.3", - "@shlinkio/shlink-frontend-kit": "^0.9.5", + "@shlinkio/shlink-frontend-kit": "^0.9.7", "@shlinkio/shlink-js-sdk": "^2.1.0", - "@shlinkio/shlink-web-component": "^0.14.0", + "@shlinkio/shlink-web-component": "^0.14.1", "bootstrap": "5.2.3", "bottlejs": "^2.0.1", "clsx": "^2.1.1", @@ -3456,9 +3456,9 @@ } }, "node_modules/@shlinkio/shlink-frontend-kit": { - "version": "0.9.5", - "resolved": "https://registry.npmjs.org/@shlinkio/shlink-frontend-kit/-/shlink-frontend-kit-0.9.5.tgz", - "integrity": "sha512-uHRtXzONFQ+fi8u9k3QtIRORp5VK3H5GPsJcADvwrmR/OB6ZI2Sb30yVvYDQBDlW/gijhJAvg+QqZbLStsj5Ag==", + "version": "0.9.7", + "resolved": "https://registry.npmjs.org/@shlinkio/shlink-frontend-kit/-/shlink-frontend-kit-0.9.7.tgz", + "integrity": "sha512-ZOrBeAPLa7ekOjBYE0vs/1OXqTJjppMBkvQCdGoN16KGLXqfNqUSZAXykMxgRnxgjcr9sauVVIuMnPmFvHYQng==", "license": "MIT", "dependencies": { "clsx": "^2.1.1" @@ -3489,9 +3489,9 @@ "license": "MIT" }, "node_modules/@shlinkio/shlink-web-component": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@shlinkio/shlink-web-component/-/shlink-web-component-0.14.0.tgz", - "integrity": "sha512-IzsSft5mkKZchk1MvfUsUgZtX0q5mYiisZlJmM1lt766ZeQHXROei1gnoWojtfB5zmSRe7gDwaE3Ogp05vGAOw==", + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/@shlinkio/shlink-web-component/-/shlink-web-component-0.14.1.tgz", + "integrity": "sha512-cgi12ovvprD+0ozKYZu1ZTHzfQQa4Gaju6VOoBZuheucg8whr3NyNQ3YZKWhmqWaWeW0qK3/I3lsDGSkuWs0sQ==", "license": "MIT", "dependencies": { "@formkit/drag-and-drop": "^0.5.3", @@ -3518,7 +3518,7 @@ "@fortawesome/free-solid-svg-icons": "^6.7.2", "@fortawesome/react-fontawesome": "^0.2.2", "@reduxjs/toolkit": "^2.5.0", - "@shlinkio/shlink-frontend-kit": "^0.9.1", + "@shlinkio/shlink-frontend-kit": "^0.9.7", "@shlinkio/shlink-js-sdk": "^2.0.0", "react": "^18.3 || ^19.0", "react-dom": "^18.3 || ^19.0", @@ -13873,9 +13873,9 @@ "requires": {} }, "@shlinkio/shlink-frontend-kit": { - "version": "0.9.5", - "resolved": "https://registry.npmjs.org/@shlinkio/shlink-frontend-kit/-/shlink-frontend-kit-0.9.5.tgz", - "integrity": "sha512-uHRtXzONFQ+fi8u9k3QtIRORp5VK3H5GPsJcADvwrmR/OB6ZI2Sb30yVvYDQBDlW/gijhJAvg+QqZbLStsj5Ag==", + "version": "0.9.7", + "resolved": "https://registry.npmjs.org/@shlinkio/shlink-frontend-kit/-/shlink-frontend-kit-0.9.7.tgz", + "integrity": "sha512-ZOrBeAPLa7ekOjBYE0vs/1OXqTJjppMBkvQCdGoN16KGLXqfNqUSZAXykMxgRnxgjcr9sauVVIuMnPmFvHYQng==", "requires": { "clsx": "^2.1.1" } @@ -13886,9 +13886,9 @@ "integrity": "sha512-K6zmA/A7Ux9hTn+ZjAm85YmMl7/v5XgZBM62syCxCsK7Tdw7Gg4+C06cZ2gUv+HWrHtv5IXsi4ax00++8Kg5vw==" }, "@shlinkio/shlink-web-component": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@shlinkio/shlink-web-component/-/shlink-web-component-0.14.0.tgz", - "integrity": "sha512-IzsSft5mkKZchk1MvfUsUgZtX0q5mYiisZlJmM1lt766ZeQHXROei1gnoWojtfB5zmSRe7gDwaE3Ogp05vGAOw==", + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/@shlinkio/shlink-web-component/-/shlink-web-component-0.14.1.tgz", + "integrity": "sha512-cgi12ovvprD+0ozKYZu1ZTHzfQQa4Gaju6VOoBZuheucg8whr3NyNQ3YZKWhmqWaWeW0qK3/I3lsDGSkuWs0sQ==", "requires": { "@formkit/drag-and-drop": "^0.5.3", "@json2csv/plainjs": "^7.0.6", diff --git a/package.json b/package.json index cb95fa19..ee5a69cd 100644 --- a/package.json +++ b/package.json @@ -29,9 +29,9 @@ "@json2csv/plainjs": "^7.0.6", "@reduxjs/toolkit": "^2.8.2", "@shlinkio/data-manipulation": "^1.0.3", - "@shlinkio/shlink-frontend-kit": "^0.9.5", + "@shlinkio/shlink-frontend-kit": "^0.9.7", "@shlinkio/shlink-js-sdk": "^2.1.0", - "@shlinkio/shlink-web-component": "^0.14.0", + "@shlinkio/shlink-web-component": "^0.14.1", "bootstrap": "5.2.3", "bottlejs": "^2.0.1", "clsx": "^2.1.1", diff --git a/src/tailwind.css b/src/tailwind.css index f8a4d3f5..acb00729 100644 --- a/src/tailwind.css +++ b/src/tailwind.css @@ -1,15 +1,12 @@ @import 'tailwindcss' prefix(tw) important; @import '@shlinkio/shlink-frontend-kit/tailwind.preset.css'; +@import '@shlinkio/shlink-web-component/tailwind.preset.css'; @source '../node_modules/@shlinkio/shlink-frontend-kit'; @source '../node_modules/@shlinkio/shlink-web-component'; @layer base { :root { - --header-height: 56px; --footer-height: 2.3rem; --footer-margin: .8rem; - - /* Width of ShlinkWebComponent's side menu when not collapsed */ - --aside-menu-width: 260px; } } diff --git a/test/servers/__snapshots__/ManageServersRow.test.tsx.snap b/test/servers/__snapshots__/ManageServersRow.test.tsx.snap index 532db703..d30a8eea 100644 --- a/test/servers/__snapshots__/ManageServersRow.test.tsx.snap +++ b/test/servers/__snapshots__/ManageServersRow.test.tsx.snap @@ -19,7 +19,7 @@ exports[` > renders auto-connect icon only if server is auto class="tw:group tw:lg:table-row tw:flex tw:flex-col tw:lg:border-0 tw:border-y-2 tw:border-lm-border tw:dark:border-dm-border tw:hover:bg-lm-primary tw:dark:hover:bg-dm-primary tw:group-[&]/card:hover:bg-lm-secondary tw:dark:group-[&]/card:hover:bg-dm-secondary tw:relative" > > renders auto-connect icon only if server is auto > renders auto-connect icon only if server is auto https://example.com ManageServersRowDropdown @@ -88,11 +88,11 @@ exports[` > renders auto-connect icon only if server is auto class="tw:group tw:lg:table-row tw:flex tw:flex-col tw:lg:border-0 tw:border-y-2 tw:border-lm-border tw:dark:border-dm-border tw:hover:bg-lm-primary tw:dark:hover:bg-dm-primary tw:group-[&]/card:hover:bg-lm-secondary tw:dark:group-[&]/card:hover:bg-dm-secondary tw:relative" > > renders auto-connect icon only if server is auto https://example.com ManageServersRowDropdown