Skip to content

Commit

Permalink
Improve font format, rollback moving postcss to typescript, a few min…
Browse files Browse the repository at this point in the history
…or changes
  • Loading branch information
Bamboooz committed Nov 24, 2024
1 parent d58b717 commit f8ed0cf
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Thank you for considering contributing to magnetar! We welcome contributions fro
## How to Contribute

1. Fork the repository.
2. Create a new branch (`git checkout -b feature/YourFeature`).
2. Create a new branch (`git checkout -b YourFeature`).
3. Make your changes.
4. Commit your changes (`git commit -m 'Add some feature'`).
5. Push to the branch (`git push origin feature/YourFeature`).
5. Push to the branch (`git push origin YourFeature`).
6. Open a pull request.

## Code of Conduct
Expand Down
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ body:
attributes:
label: Describe alternatives you've considered
description: Have you considered any alternative solutions or workarounds?
validations:
required: true
- type: textarea
attributes:
label: Additional context
Expand Down
7 changes: 6 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
{
"recommendations": ["tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"]
"recommendations": [
"tauri-apps.tauri-vscode",
"rust-lang.rust-analyzer",
"bradlc.vscode-tailwindcss",
"yoavbls.pretty-ts-errors"
]
}
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
<h1>magnetar</h1>
<p>Your ultimate Windows toolbox</p>

[![License](https://img.shields.io/github/license/Bamboooz/magnetar)](https://github.com/Bamboooz/magnetar/blob/main/LICENSE)
[![GitHub stars](https://img.shields.io/github/stars/Bamboooz/magnetar)](https://github.com/Bamboooz/magnetar/stargazers)
[![GitHub issues](https://img.shields.io/github/issues/Bamboooz/magnetar)](https://github.com/Bamboooz/magnetar/issues)
[![GitHub release](https://img.shields.io/github/v/release/Bamboooz/magnetar)](https://github.com/Bamboooz/magnetar/releases)
[![License](https://img.shields.io/github/license/Bamboooz/magnetar)](https://github.com/Bamboooz/magnetar/blob/main/LICENSE)
[![GitHub stars](https://img.shields.io/github/stars/Bamboooz/magnetar)](https://github.com/Bamboooz/magnetar/stargazers)
[![GitHub issues](https://img.shields.io/github/issues/Bamboooz/magnetar)](https://github.com/Bamboooz/magnetar/issues)
[![GitHub release](https://img.shields.io/github/v/release/Bamboooz/magnetar)](https://github.com/Bamboooz/magnetar/releases)

</div>

<div align="center">
Expand Down
File renamed without changes.
Binary file modified public/admin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions src/components/Commands/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@ export default function Commands({ page, search }: HomeProps) {
))
) : (
<div className="size-full flex flex-col items-center justify-center">
<p className=" text-2xl font-medium">
No commands found
</p>
<p className=" text-2xl font-medium">No commands found</p>
</div>
)}
</Page>
Expand Down
4 changes: 1 addition & 3 deletions src/components/Games/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@ export default function Games({ page, search }: GamesProps) {
</>
) : (
<div className="size-full flex flex-col items-center justify-center">
<p className=" text-2xl font-medium">
No games found
</p>
<p className=" text-2xl font-medium">No games found</p>
</div>
)}
</Page>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ interface HeaderProps {

export default function Header({ setPage }: HeaderProps) {
return (
<div className="w-full h-16 flex items-center justify-between shrink-0 pr-6 bg-black">
<div className="w-full h-16 flex items-center justify-between shrink-0 pr-6 bg-header">
<button
onClick={() => setPage(PageType.HOME)}
className="h-full flex items-center justify-center gap-6 px-6"
Expand Down
Binary file removed src/fonts/Poppins-Medium.ttf
Binary file not shown.
Binary file added src/fonts/Poppins-Medium.woff2
Binary file not shown.
Binary file removed src/fonts/Poppins-Regular.ttf
Binary file not shown.
Binary file added src/fonts/Poppins-Regular.woff2
Binary file not shown.
6 changes: 3 additions & 3 deletions src/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

@font-face {
font-family: "Poppins";
src: url("./fonts/Poppins-Regular.ttf") format("truetype");
src: url("./fonts/Poppins-Regular.woff2") format("woff2");
font-weight: 400;
font-style: normal;
}

@font-face {
font-family: "Poppins";
src: url("./fonts/Poppins-Medium.ttf") format("truetype");
src: url("./fonts/Poppins-Medium.woff2") format("woff2");
font-weight: 500;
font-style: normal;
}
Expand Down Expand Up @@ -45,4 +45,4 @@
::-webkit-scrollbar-track {
@apply bg-transparent;
}
}
}
1 change: 1 addition & 0 deletions tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export default {
theme: {
extend: {
colors: {
header: "var(--header)",
background: "var(--background)",
"background-secondary": "var(--background-secondary)",
"background-tertiary": "var(--background-tertiary)",
Expand Down

0 comments on commit f8ed0cf

Please sign in to comment.