Multiple changes related to icons, and the server documentation #5

Closed
DorianNiemiecSVRJS wants to merge 18 commits from main into main
3 changed files with 39 additions and 26 deletions
Showing only changes of commit bd7223f452 - Show all commits

View file

@ -1,5 +1,3 @@
@import url("https://fonts.googleapis.com/css2?family=Poppins:wght@400;600;700;900&display=swap");
@tailwind base; @tailwind base;
@tailwind components; @tailwind components;
@tailwind utilities; @tailwind utilities;
@ -7,7 +5,21 @@
html { html {
height: 100%; height: 100%;
width: 100%; width: 100%;
font-family: "Poppins" sans-serif; font-family: "Poppins", sans-serif;
overflow-x: hidden;
}
body {
font-family: var(--font-poppins);
user-select: text;
overflow-x: clip;
}
* {
list-style: none;
padding: 0;
margin: 0;
scroll-behavior: smooth;
} }
@layer base { @layer base {
@ -59,26 +71,7 @@ html {
--input: 240 3.7% 15.9%; --input: 240 3.7% 15.9%;
--ring: 142.4 71.8% 29.2%; --ring: 142.4 71.8% 29.2%;
} }
}
* {
list-style: none;
padding: 0;
margin: 0;
scroll-behavior: smooth;
}
html {
overflow-x: hidden;
}
body {
font-family: var(--font-poppins);
user-select: text;
overflow-x: clip;
}
@layer base {
* { * {
@apply border-border; @apply border-border;
} }

View file

@ -1,10 +1,23 @@
import "@/app/globals.css"; import { Poppins } from "next/font/google";
import "./globals.css";
const poppins = Poppins({
weight: ["400", "600", "700", "900"],
subsets: ["latin"],
});
function MyApp({ Component, pageProps }) { function MyApp({ Component, pageProps }) {
return ( return (
<main style={{ fontFamily: "Poppins" }}> <>
<style jsx global>{`
html {
font-family: ${poppins.style.fontFamily};
}
`}</style>
<div className={`antialiased ${poppins.className}`}>
<Component {...pageProps} /> <Component {...pageProps} />
</main> </div>
</>
); );
} }

7
pages/globals.css Normal file
View file

@ -0,0 +1,7 @@
html {
font-family: "Poppins", sans-serif;
}
* {
scroll-behavior: smooth;
}