Skip to content

Commit

Permalink
Add tailwind
Browse files Browse the repository at this point in the history
  • Loading branch information
acelaya committed May 16, 2024
1 parent 429f7d9 commit 99005e9
Show file tree
Hide file tree
Showing 8 changed files with 330 additions and 12 deletions.
2 changes: 1 addition & 1 deletion app/common/MainHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { ShlinkLogo } from './ShlinkLogo';
export const MainHeader: FC = () => (
<Navbar color="primary" dark fixed="top" className="main-header" expand="md">
<NavbarBrand tag={Link} to="/">
<ShlinkLogo className="main-header__brand-logo" color="white" /> Shlink
<ShlinkLogo className="tw-inline-block tw-mr-1 tw-w-[26px]" color="white" /> Shlink
</NavbarBrand>
</Navbar>
);
6 changes: 1 addition & 5 deletions app/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@import 'node_modules/bootstrap/scss/bootstrap.scss';
@import 'node_modules/@shlinkio/shlink-frontend-kit/dist/index'; // After bootstrap. Includes CSS overwrites
@import 'node_modules/@shlinkio/shlink-web-component/dist/index';
@import 'tailwind';

.app {
padding-top: $headerHeight;
Expand All @@ -15,8 +16,3 @@
color: inherit !important;
}
}

.main-header__brand-logo {
width: 26px;
margin-right: 5px;
}
3 changes: 1 addition & 2 deletions app/routes/login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ export default function Login() {
return (
<form
method="post"
className="d-flex flex-column gap-3 p-3 mt-5 mx-auto w-50 rounded-2 border-opacity-25 border-secondary"
style={{ borderWidth: '1px', borderStyle: 'solid' }}
className="tw-flex tw-flex-col tw-gap-4 tw-p-4 tw-mt-8 tw-mx-auto tw-w-[50%] tw-rounded-lg tw-border tw-border-gray-300"
>
<div>
<label htmlFor={usernameId}>Username:</label>
Expand Down
3 changes: 3 additions & 0 deletions app/tailwind.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// @tailwind base; // Can't add this for now, as it overrides many styles from bootstrap
@tailwind components;
@tailwind utilities;
Loading

0 comments on commit 99005e9

Please sign in to comment.