diff --git a/src/app/App.scss b/src/app/App.scss deleted file mode 100644 index 11f0bc7a..00000000 --- a/src/app/App.scss +++ /dev/null @@ -1,26 +0,0 @@ -@use '../../node_modules/@shlinkio/shlink-frontend-kit/dist/base'; - -.app-container { - height: 100%; -} - -.app { - padding-top: base.$headerHeight; - height: 100%; -} - -.shlink-wrapper { - min-height: 100%; - padding-bottom: base.$footer-height + base.$footer-margin; - margin-bottom: -(base.$footer-height + base.$footer-margin); -} - -.shlink-footer { - height: base.$footer-height; - margin-top: base.$footer-margin; - padding: 0; - - @media (min-width: base.$mdMin) { - padding: 0 15px; - } -} diff --git a/src/app/App.tsx b/src/app/App.tsx index 11e99895..ebf5f964 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -10,7 +10,6 @@ import type { FCWithDeps } from '../container/utils'; import { componentFactory, useDependencies } from '../container/utils'; import type { ServersMap } from '../servers/data'; import { forceUpdate } from '../utils/helpers/sw'; -import './App.scss'; type AppProps = { fetchServers: () => void; @@ -62,11 +61,16 @@ const App: FCWithDeps = ( }, [settings.ui?.theme]); return ( -
+
-
-
+
+
} /> @@ -82,7 +86,7 @@ const App: FCWithDeps = (
-
+
diff --git a/src/tailwind.css b/src/tailwind.css index 78ee9f46..2741f627 100644 --- a/src/tailwind.css +++ b/src/tailwind.css @@ -18,6 +18,9 @@ @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; }