From 85c31ee8d278ac6fa1f0ba143b78d65e5f665f32 Mon Sep 17 00:00:00 2001 From: Tyler Flowers Date: Sun, 26 Nov 2023 15:57:52 -0500 Subject: initial cleanup --- apps/website/src/components/base/Button.astro | 3 +- apps/website/src/components/base/CodeBlock.astro | 70 +++++++++++++++++++----- apps/website/src/components/base/Section.astro | 6 +- 3 files changed, 62 insertions(+), 17 deletions(-) (limited to 'apps/website/src/components/base') diff --git a/apps/website/src/components/base/Button.astro b/apps/website/src/components/base/Button.astro index adbc656..0a4dc9f 100644 --- a/apps/website/src/components/base/Button.astro +++ b/apps/website/src/components/base/Button.astro @@ -4,8 +4,9 @@ import Icon from "@components/icons/Icon.astro"; import type { HTMLAttributes } from "astro/types"; const styles = { + // TODO: adjust active / disabled colors primary: "bg-blue-500 text-white hover:bg-blue-400 active:bg-blue-600 disabled:bg-blue-800 disabled:text-white-1/4", - secondary: "bg-blue-100 text-blue-500 hover:bg-blue-200 active:bg-blue-300 disabled:bg-blue-50 disabled:text-blue-200", + secondary: "bg-blue-20 text-blue-60 border-[1px] border-blue-30 hover:bg-blue-200 active:bg-blue-300 disabled:bg-blue-50 disabled:text-blue-200", } const sizes = { diff --git a/apps/website/src/components/base/CodeBlock.astro b/apps/website/src/components/base/CodeBlock.astro index 5991428..ceeecc0 100644 --- a/apps/website/src/components/base/CodeBlock.astro +++ b/apps/website/src/components/base/CodeBlock.astro @@ -2,20 +2,62 @@ --- -
-	{`public class MyConfig {
-
-	@Switch(name = "Sub Switch", type = OptionType.SWITCH)
-	public static boolean subSwitch = false;
-
-	public MyConfig() {
-		super(new Mod("My Mod", ModType.UTIL_QOL), "config.json");
+
+	
+	public class MyConfig {
+	
+	    @Switch(name = "Sub Switch", type = OptionType.SWITCH)
+	    public static boolean subSwitch = false;
+	
+	    public MyConfig() {
+	        super(new Mod("My Mod", ModType.UTIL_QOL), "config.json");
+	
+	        addDependency("subSwitch", () -> {
+	            // Do stuff here!
+	        });
+	    }
+	
+	}
+

 
-		addDependency("subSwitch", () -> {
-			// TODO: Make codeblocks better lmao
-		});
+
diff --git a/apps/website/src/components/base/Section.astro b/apps/website/src/components/base/Section.astro
index 0d177ef..bb7a062 100644
--- a/apps/website/src/components/base/Section.astro
+++ b/apps/website/src/components/base/Section.astro
@@ -5,23 +5,25 @@ interface Props extends HTMLAttributes<"section"> {
 	maxWidth?: "none" | String;
 	colReverse?: boolean;
 	wrapperClass?: string;
+	wFull?: boolean;
 }
 
 const {
 	maxWidth = "1080px",
 	colReverse = true,
 	wrapperClass = "",
+	wFull = true,
 	...props
 } = Astro.props;
 
 const twoColumn = Astro.slots.has("left") || Astro.slots.has("right");
 
-const className = `max-w-[${maxWidth}] w-full px-5 md:p-0 flex gap-4`
+const className = `max-w-[${maxWidth}] ${wFull ? "w-full" : ""} px-5 md:p-0 flex gap-4`
 	+ (twoColumn ? ` ${maxWidth == "none" ? "justify-center" : "justify-between md:justify-evenly lg:justify-between"} ${colReverse ? "flex-col-reverse" : "flex-col"} md:flex-row md:items-center md:flex-row` : "")
 	+ (props.class ? ` ${props.class}` : "");
 ---
 
-

+

 	

 		{twoColumn ? (
 			

-- 
cgit 


From e9d485fe3b5db8c426ac03b30ed8917df0baa62d Mon Sep 17 00:00:00 2001
From: Pauline 
Date: Sun, 26 Nov 2023 17:13:07 -0500
Subject: feat(lint): switch to eslint config and formatting (use vscode for
 autoformat)

---
 apps/website/src/components/base/Button.astro      |  50 ++++-----
 apps/website/src/components/base/CodeBlock.astro   |  42 -------
 apps/website/src/components/base/Footer.astro      |   5 +-
 apps/website/src/components/base/Header.astro      |  40 +++----
 apps/website/src/components/base/Navbar.astro      |  34 +++---
 .../src/components/base/NavbarElement.astro        | 123 +++++++++++----------
 apps/website/src/components/base/Paragraph.astro   |  32 +++---
 .../src/components/base/ScreenOverlay.astro        |  16 +--
 .../base/ScrollbarOverlayContainer.astro           |  16 +--
 apps/website/src/components/base/Section.astro     |  54 ++++-----
 apps/website/src/components/base/Tag.astro         |  15 ++-
 11 files changed, 195 insertions(+), 232 deletions(-)

(limited to 'apps/website/src/components/base')

diff --git a/apps/website/src/components/base/Button.astro b/apps/website/src/components/base/Button.astro
index 0a4dc9f..438bafd 100644
--- a/apps/website/src/components/base/Button.astro
+++ b/apps/website/src/components/base/Button.astro
@@ -1,27 +1,27 @@
 ---
-import type { Icons } from "@components/icons/Icon.astro";
-import Icon from "@components/icons/Icon.astro";
-import type { HTMLAttributes } from "astro/types";
+import type { Icons } from '@components/icons/Icon.astro';
+import Icon from '@components/icons/Icon.astro';
+import type { HTMLAttributes } from 'astro/types';
 
 const styles = {
 	// TODO: adjust active / disabled colors
-	primary: "bg-blue-500 text-white hover:bg-blue-400 active:bg-blue-600 disabled:bg-blue-800 disabled:text-white-1/4",
-	secondary: "bg-blue-20 text-blue-60 border-[1px] border-blue-30 hover:bg-blue-200 active:bg-blue-300 disabled:bg-blue-50 disabled:text-blue-200",
-}
+	primary: 'bg-blue-500 text-white hover:bg-blue-400 active:bg-blue-600 disabled:bg-blue-800 disabled:text-white-1/4',
+	secondary: 'bg-blue-20 text-blue-60 border-[1px] border-blue-30 hover:bg-blue-200 active:bg-blue-300 disabled:bg-blue-50 disabled:text-blue-200',
+};
 
 const sizes = {
-	sm: "px-4 py-2 text-sm",
-	md: "px-5 py-3 text-md",
-	lg: "px-6 py-3 text-lg rounded-2xl"
-}
+	sm: 'px-4 py-2 text-sm',
+	md: 'px-5 py-3 text-md',
+	lg: 'px-6 py-3 text-lg rounded-2xl',
+};
 
 const iconSize = {
 	sm: 15,
 	md: 18,
-	lg: 24
-}
+	lg: 24,
+};
 
-interface Props extends HTMLAttributes<"button"> {
+interface Props extends HTMLAttributes<'button'> {
 	style?: keyof typeof styles
 	size?: keyof typeof sizes
 	text?: string
@@ -31,28 +31,28 @@ interface Props extends HTMLAttributes<"button"> {
 }
 
 const {
-	style = "primary",
-	size = "md",
-    text = "",
-	iconLeft = "",
-	iconRight = "",
+	style = 'primary',
+	size = 'md',
+	text = '',
+	iconLeft = '',
+	iconRight = '',
 	...rest
 } = Astro.props;
 
 const className = [
-	"flex flex-row justify-center items-center text-center focus-visible:ring-offset-4 focus-visible:outline-offset-4",
-	"rounded-xl font-medium",
+	'flex flex-row justify-center items-center text-center focus-visible:ring-offset-4 focus-visible:outline-offset-4',
+	'rounded-xl font-medium',
 	styles[style],
 	sizes[size],
-	"transition-colors",
-	rest.class
-].join(" ");
+	'transition-colors',
+	rest.class,
+].join(' ');
 
-const Element = rest.href ? "a" : "button" as any;
+const Element = rest.href ? 'a' : 'button' as any;
 ---
 
 
 	{iconLeft && }
-	{text ? text : }
+	{text || }
 	{iconRight && }
 
diff --git a/apps/website/src/components/base/CodeBlock.astro b/apps/website/src/components/base/CodeBlock.astro
index ceeecc0..fd2cdd6 100644
--- a/apps/website/src/components/base/CodeBlock.astro
+++ b/apps/website/src/components/base/CodeBlock.astro
@@ -19,45 +19,3 @@
 	
 	}
- - diff --git a/apps/website/src/components/base/Footer.astro b/apps/website/src/components/base/Footer.astro index b24db5f..9bc1c61 100644 --- a/apps/website/src/components/base/Footer.astro +++ b/apps/website/src/components/base/Footer.astro @@ -2,6 +2,5 @@ --- -
- -
+
+
diff --git a/apps/website/src/components/base/Header.astro b/apps/website/src/components/base/Header.astro index d35ad9f..70dc799 100644 --- a/apps/website/src/components/base/Header.astro +++ b/apps/website/src/components/base/Header.astro @@ -1,40 +1,40 @@ --- -import type { HTMLAttributes } from "astro/types" +import type { HTMLAttributes } from 'astro/types'; const sizes = { - "xxl": "h1", - "xl": "h2", - "lg": "h2", - "md": "h3", - "sm": "h4", - "xs": "h5", - "xxs": "h6" + xxl: 'h1', + xl: 'h2', + lg: 'h2', + md: 'h3', + sm: 'h4', + xs: 'h5', + xxs: 'h6', }; -type Headers = "h1" | "h2" | "h3" | "h4" | "h5" | "h6"; +type Headers = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6'; interface Props extends HTMLAttributes { - size?: keyof typeof sizes; - align?: "left" | "center" | "right" | "inherit"; + size?: keyof typeof sizes + align?: 'left' | 'center' | 'right' | 'inherit' } const { - size = "lg", - align = "inherit", + size = 'lg', + align = 'inherit', ...attr } = Astro.props; const Element = sizes[size] as any; // Unfortunately gotta do this -const className = (align == "inherit" ? "" : `text-${align} `) - + (size == "xxl" ? " page-header" : "") - + (attr.class ? ` ${attr.class}` : ""); +const className = (align == 'inherit' ? '' : `text-${align} `) + + (size == 'xxl' ? ' page-header' : '') + + (attr.class ? ` ${attr.class}` : ''); --- - - - + + + - \ No newline at end of file + diff --git a/apps/website/src/components/base/Section.astro b/apps/website/src/components/base/Section.astro index bb7a062..51d9fa1 100644 --- a/apps/website/src/components/base/Section.astro +++ b/apps/website/src/components/base/Section.astro @@ -1,40 +1,42 @@ --- -import type { HTMLAttributes } from "astro/types"; +import type { HTMLAttributes } from 'astro/types'; -interface Props extends HTMLAttributes<"section"> { - maxWidth?: "none" | String; - colReverse?: boolean; - wrapperClass?: string; - wFull?: boolean; +interface Props extends HTMLAttributes<'section'> { + maxWidth?: 'none' | String + colReverse?: boolean + wrapperClass?: string + wFull?: boolean } const { - maxWidth = "1080px", + maxWidth = '1080px', colReverse = true, - wrapperClass = "", + wrapperClass = '', wFull = true, ...props } = Astro.props; -const twoColumn = Astro.slots.has("left") || Astro.slots.has("right"); +const twoColumn = Astro.slots.has('left') || Astro.slots.has('right'); -const className = `max-w-[${maxWidth}] ${wFull ? "w-full" : ""} px-5 md:p-0 flex gap-4` - + (twoColumn ? ` ${maxWidth == "none" ? "justify-center" : "justify-between md:justify-evenly lg:justify-between"} ${colReverse ? "flex-col-reverse" : "flex-col"} md:flex-row md:items-center md:flex-row` : "") - + (props.class ? ` ${props.class}` : ""); +const className = `max-w-[${maxWidth}] ${wFull ? 'w-full' : ''} px-5 md:p-0 flex gap-4${ + twoColumn ? ` ${maxWidth == 'none' ? 'justify-center' : 'justify-between md:justify-evenly lg:justify-between'} ${colReverse ? 'flex-col-reverse' : 'flex-col'} md:flex-row md:items-center md:flex-row` : '' + }${props.class ? ` ${props.class}` : ''}`; --- -
-
- {twoColumn ? ( -
- -
+
+
+ {twoColumn + ? ( +
+ +
-
- -
- ) : ( - - )} -
-
+
+ +
+ ) + : ( + + )} +
+
diff --git a/apps/website/src/components/base/Tag.astro b/apps/website/src/components/base/Tag.astro index e6fd34f..b903344 100644 --- a/apps/website/src/components/base/Tag.astro +++ b/apps/website/src/components/base/Tag.astro @@ -1,14 +1,13 @@ --- -import type { HTMLAttributes } from "astro/types"; +import type { HTMLAttributes } from 'astro/types'; -interface Props extends HTMLAttributes<"span"> {} +interface Props extends HTMLAttributes<'span'> {} const { ...attr } = Astro.props; --- -
- - - -
- +
+ + + +
-- cgit From 580c9d6dbabafcfeb47c7e53aff71daac0da38af Mon Sep 17 00:00:00 2001 From: Tyler Flowers Date: Sun, 26 Nov 2023 18:42:56 -0500 Subject: more index work --- apps/website/src/components/base/Section.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/website/src/components/base') diff --git a/apps/website/src/components/base/Section.astro b/apps/website/src/components/base/Section.astro index 51d9fa1..4edf1ba 100644 --- a/apps/website/src/components/base/Section.astro +++ b/apps/website/src/components/base/Section.astro @@ -18,7 +18,7 @@ const { const twoColumn = Astro.slots.has('left') || Astro.slots.has('right'); -const className = `max-w-[${maxWidth}] ${wFull ? 'w-full' : ''} px-5 md:p-0 flex gap-4${ +const className = `max-w-[${maxWidth}] ${wFull ? 'w-full' : `w-[${maxWidth}]`} px-5 md:p-0 flex gap-4${ twoColumn ? ` ${maxWidth == 'none' ? 'justify-center' : 'justify-between md:justify-evenly lg:justify-between'} ${colReverse ? 'flex-col-reverse' : 'flex-col'} md:flex-row md:items-center md:flex-row` : '' }${props.class ? ` ${props.class}` : ''}`; --- -- cgit From 181547a25213bee8a20002e07344b957386c4d0f Mon Sep 17 00:00:00 2001 From: Pauline Date: Sun, 26 Nov 2023 22:55:04 -0500 Subject: feat(build): transfer everything to esm/ts --- apps/website/src/components/base/FormattedDate.astro | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 apps/website/src/components/base/FormattedDate.astro (limited to 'apps/website/src/components/base') diff --git a/apps/website/src/components/base/FormattedDate.astro b/apps/website/src/components/base/FormattedDate.astro new file mode 100644 index 0000000..1bcce73 --- /dev/null +++ b/apps/website/src/components/base/FormattedDate.astro @@ -0,0 +1,17 @@ +--- +interface Props { + date: Date; +} + +const { date } = Astro.props; +--- + + -- cgit From ef0b02e2659310103c0772990f7e8f7fe77de63a Mon Sep 17 00:00:00 2001 From: Tyler Flowers Date: Mon, 4 Dec 2023 18:23:33 -0500 Subject: Make Slider + Card and add to index --- apps/website/src/components/base/Card.astro | 22 ++++++++++++++++ apps/website/src/components/base/Slider.astro | 38 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 apps/website/src/components/base/Card.astro create mode 100644 apps/website/src/components/base/Slider.astro (limited to 'apps/website/src/components/base') diff --git a/apps/website/src/components/base/Card.astro b/apps/website/src/components/base/Card.astro new file mode 100644 index 0000000..b3fbc00 --- /dev/null +++ b/apps/website/src/components/base/Card.astro @@ -0,0 +1,22 @@ +--- +import type { Icons } from '@components/icons/Icon.astro'; +import Icon from '@components/icons/Icon.astro'; +import type { HTMLAttributes } from 'astro/types'; + +interface Props extends HTMLAttributes<'div'> { + icon: Icons; + text?: string; +} + +const { + icon, + text = 'Hiiii', + ...rest +} = Astro.props; +--- + + +
+ +

{text}

+
diff --git a/apps/website/src/components/base/Slider.astro b/apps/website/src/components/base/Slider.astro new file mode 100644 index 0000000..f40b747 --- /dev/null +++ b/apps/website/src/components/base/Slider.astro @@ -0,0 +1,38 @@ +--- +import type { HTMLAttributes } from 'astro/types'; + +interface Props extends HTMLAttributes<'div'> { + dir?: string; + wrapperClass?: string; +} + +const { + dir = "left", + wrapperClass = "" +} = Astro.props; +--- + +
+ +
+ + + -- cgit From a79d129d410ab8cad9ea8f2d56201d53b22c8024 Mon Sep 17 00:00:00 2001 From: Tyler Flowers Date: Sun, 17 Dec 2023 22:23:28 -0500 Subject: Fix up Slider to accept differing cards --- apps/website/src/components/base/Slider.astro | 31 +++++++++++++++++---------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'apps/website/src/components/base') diff --git a/apps/website/src/components/base/Slider.astro b/apps/website/src/components/base/Slider.astro index f40b747..8814f63 100644 --- a/apps/website/src/components/base/Slider.astro +++ b/apps/website/src/components/base/Slider.astro @@ -20,19 +20,28 @@ const { - -- cgit From ce0bc210251c15e772841a4fb94efa8811c4a8ac Mon Sep 17 00:00:00 2001 From: Tyler Flowers Date: Sun, 17 Dec 2023 22:50:28 -0500 Subject: Fix gap in Slider --- apps/website/src/components/base/Slider.astro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/website/src/components/base') diff --git a/apps/website/src/components/base/Slider.astro b/apps/website/src/components/base/Slider.astro index 8814f63..c1b32d1 100644 --- a/apps/website/src/components/base/Slider.astro +++ b/apps/website/src/components/base/Slider.astro @@ -21,7 +21,7 @@ const { + diff --git a/apps/website/src/components/base/Navbar.astro b/apps/website/src/components/base/Navbar.astro index 8fa98df..15f7638 100644 --- a/apps/website/src/components/base/Navbar.astro +++ b/apps/website/src/components/base/Navbar.astro @@ -1,6 +1,6 @@ --- -import config from 'config'; import type { Config } from '@webtypes/Config'; +import config from 'config'; import NavbarElement from './NavbarElement.astro'; --- @@ -9,12 +9,12 @@ import NavbarElement from './NavbarElement.astro'; diff --git a/apps/website/src/components/base/NavbarElement.astro b/apps/website/src/components/base/NavbarElement.astro index 17c3662..6d549bf 100644 --- a/apps/website/src/components/base/NavbarElement.astro +++ b/apps/website/src/components/base/NavbarElement.astro @@ -1,11 +1,11 @@ --- -import type { LogoType, NavbarElement } from '@webtypes/Config'; -import Logo from '@components/logos/Logo.astro'; import Icon from '@components/icons/Icon.astro'; -import ScreenOverlay from './ScreenOverlay.astro'; +import Logo from '@components/logos/Logo.astro'; +import type { LogoType, NavbarElement } from '@webtypes/Config'; import Header from './Header.astro'; -import Tag from './Tag.astro'; +import ScreenOverlay from './ScreenOverlay.astro'; import ScrollbarOverlayContainer from './ScrollbarOverlayContainer.astro'; +import Tag from './Tag.astro'; interface Props { element: NavbarElement @@ -25,66 +25,64 @@ const { ? ( {element.text && element.text} - {element.logo && } - {element.dropdown && } + {element.logo && } + {element.dropdown && } - ) + ) : (

{element.text && element.text} - {element.logo && } - {element.dropdown && } + {element.logo && } + {element.dropdown && }

- )} + )} {element.dropdown && ( - - + +
+ group-focus-within:pointer-events-auto group-focus-within:opacity-100 + focus-within:pointer-events-auto focus-within:opacity-100 + hover:pointer-events-auto hover:opacity-100 + `}> + bg-gray-50 + rounded-t-lg md:rounded-lg + transition-transform + max-sm:translate-y-1/3 max-sm:left-0 + group-focus-within:translate-y-0 + max-h-full md:max-h-96 overflow-y-auto + md:shadow-lg + `}>
+ + ))} diff --git a/apps/website/src/components/base/Paragraph.astro b/apps/website/src/components/base/Paragraph.astro index 832b296..ffb1030 100644 --- a/apps/website/src/components/base/Paragraph.astro +++ b/apps/website/src/components/base/Paragraph.astro @@ -27,5 +27,5 @@ const className = [ ---

- {text || } + {text || }

diff --git a/apps/website/src/components/base/ScrollbarOverlayContainer.astro b/apps/website/src/components/base/ScrollbarOverlayContainer.astro index 84bedf5..235dbc7 100644 --- a/apps/website/src/components/base/ScrollbarOverlayContainer.astro +++ b/apps/website/src/components/base/ScrollbarOverlayContainer.astro @@ -48,4 +48,4 @@ const { ...attr } = Astro.props; background-color: #00000040; } } - + diff --git a/apps/website/src/components/base/Section.astro b/apps/website/src/components/base/Section.astro index 4edf1ba..55e3737 100644 --- a/apps/website/src/components/base/Section.astro +++ b/apps/website/src/components/base/Section.astro @@ -19,8 +19,8 @@ const { const twoColumn = Astro.slots.has('left') || Astro.slots.has('right'); const className = `max-w-[${maxWidth}] ${wFull ? 'w-full' : `w-[${maxWidth}]`} px-5 md:p-0 flex gap-4${ - twoColumn ? ` ${maxWidth == 'none' ? 'justify-center' : 'justify-between md:justify-evenly lg:justify-between'} ${colReverse ? 'flex-col-reverse' : 'flex-col'} md:flex-row md:items-center md:flex-row` : '' - }${props.class ? ` ${props.class}` : ''}`; + twoColumn ? ` ${maxWidth === 'none' ? 'justify-center' : 'justify-between md:justify-evenly lg:justify-between'} ${colReverse ? 'flex-col-reverse' : 'flex-col'} md:flex-row md:items-center md:flex-row` : '' +}${props.class ? ` ${props.class}` : ''}`; ---
diff --git a/apps/website/src/components/base/Slider.astro b/apps/website/src/components/base/Slider.astro index c1b32d1..95ffd05 100644 --- a/apps/website/src/components/base/Slider.astro +++ b/apps/website/src/components/base/Slider.astro @@ -2,20 +2,21 @@ import type { HTMLAttributes } from 'astro/types'; interface Props extends HTMLAttributes<'div'> { - dir?: string; - wrapperClass?: string; + dir?: string + wrapperClass?: string } const { - dir = "left", - wrapperClass = "" + dir = 'left', + wrapperClass = '', } = Astro.props; ---
+ ${dir === 'right' ? 'reverse' : ''} + ${wrapperClass}` +}>
-- cgit From 53ce28a960cc929efc4ead964d79c1b0a67f5d57 Mon Sep 17 00:00:00 2001 From: Tyler Flowers Date: Thu, 21 Dec 2023 02:48:08 -0500 Subject: Clean up Slider --- apps/website/src/components/base/Slider.astro | 66 ++++++++++++++++++--------- 1 file changed, 44 insertions(+), 22 deletions(-) (limited to 'apps/website/src/components/base') diff --git a/apps/website/src/components/base/Slider.astro b/apps/website/src/components/base/Slider.astro index 95ffd05..ae4bbae 100644 --- a/apps/website/src/components/base/Slider.astro +++ b/apps/website/src/components/base/Slider.astro @@ -4,45 +4,67 @@ import type { HTMLAttributes } from 'astro/types'; interface Props extends HTMLAttributes<'div'> { dir?: string wrapperClass?: string + childrenNum: number + childrenSize?: string + speed?: string } const { dir = 'left', wrapperClass = '', + childrenNum, + childrenSize = '256px', + speed = '15s', } = Astro.props; + ---
- +
+ + +
- - -- cgit From 6db9917e7d2ffaa1a9e08c326c0ac8736332823c Mon Sep 17 00:00:00 2001 From: LynithDev <61880709+LynithDev@users.noreply.github.com> Date: Tue, 26 Dec 2023 17:16:04 +0100 Subject: Slider tweaks --- apps/website/src/components/base/Button.astro | 1 + apps/website/src/components/base/Card.astro | 8 ++++---- apps/website/src/components/base/Slider.astro | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'apps/website/src/components/base') diff --git a/apps/website/src/components/base/Button.astro b/apps/website/src/components/base/Button.astro index 285052a..fef01f6 100644 --- a/apps/website/src/components/base/Button.astro +++ b/apps/website/src/components/base/Button.astro @@ -7,6 +7,7 @@ const styles = { // TODO: adjust active / disabled colors primary: 'bg-blue-500 text-white hover:bg-blue-400 active:bg-blue-600 disabled:bg-blue-800 disabled:text-white-1/4', secondary: 'bg-blue-20 text-blue-60 border-[1px] border-blue-30 hover:bg-blue-200 active:bg-blue-300 disabled:bg-blue-50 disabled:text-blue-200', + ghost: 'bg-transparent text-blue-500 hover:bg-blue-20 active:bg-blue-30 disabled:bg-transparent disabled:text-blue-200', }; const sizes = { diff --git a/apps/website/src/components/base/Card.astro b/apps/website/src/components/base/Card.astro index 7cc51b2..9b75f16 100644 --- a/apps/website/src/components/base/Card.astro +++ b/apps/website/src/components/base/Card.astro @@ -16,7 +16,7 @@ const { --- -
- -

{text}

-
+
+ +

{text}

+
diff --git a/apps/website/src/components/base/Slider.astro b/apps/website/src/components/base/Slider.astro index ae4bbae..3fbca91 100644 --- a/apps/website/src/components/base/Slider.astro +++ b/apps/website/src/components/base/Slider.astro @@ -14,7 +14,7 @@ const { wrapperClass = '', childrenNum, childrenSize = '256px', - speed = '15s', + speed = '20s', } = Astro.props; --- -- cgit From 542fb33102902fd7461bee0c0ca8ab4d9ef58de0 Mon Sep 17 00:00:00 2001 From: LynithDev <61880709+LynithDev@users.noreply.github.com> Date: Tue, 26 Dec 2023 19:01:26 +0100 Subject: Responsiveness + fixes --- apps/website/src/components/base/Footer.astro | 13 ++++++++-- .../src/components/base/NavbarElement.astro | 7 +++-- apps/website/src/components/base/Section.astro | 30 +++++++++++----------- 3 files changed, 31 insertions(+), 19 deletions(-) (limited to 'apps/website/src/components/base') diff --git a/apps/website/src/components/base/Footer.astro b/apps/website/src/components/base/Footer.astro index 9bc1c61..0eaa4ba 100644 --- a/apps/website/src/components/base/Footer.astro +++ b/apps/website/src/components/base/Footer.astro @@ -2,5 +2,14 @@ --- -
-
+
+
+
+ +
+ +
+ +
+
+
diff --git a/apps/website/src/components/base/NavbarElement.astro b/apps/website/src/components/base/NavbarElement.astro index 6d549bf..8a254d6 100644 --- a/apps/website/src/components/base/NavbarElement.astro +++ b/apps/website/src/components/base/NavbarElement.astro @@ -38,7 +38,7 @@ const { )} {element.dropdown && ( - +
@@ -57,11 +59,12 @@ const { tabindex="-1" class={` bg-gray-50 + border border-gray-100 rounded-t-lg md:rounded-lg transition-transform max-sm:translate-y-1/3 max-sm:left-0 group-focus-within:translate-y-0 - max-h-full md:max-h-96 overflow-y-auto + max-h-full md:max-h-96 overflow-y-auto min-h-full md:shadow-lg `}>
    diff --git a/apps/website/src/components/base/Section.astro b/apps/website/src/components/base/Section.astro index 55e3737..b2842f6 100644 --- a/apps/website/src/components/base/Section.astro +++ b/apps/website/src/components/base/Section.astro @@ -23,20 +23,20 @@ const className = `max-w-[${maxWidth}] ${wFull ? 'w-full' : `w-[${maxWidth}]`} p }${props.class ? ` ${props.class}` : ''}`; --- -
    -
    - {twoColumn - ? ( +
    +
    + {twoColumn + ? ( +
    + +
    +
    - +
    - -
    - -
    - ) - : ( - - )} -
    -
    + ) + : ( + + )} +
    +
    -- cgit From 530634fea254c344684d42fe7a1d5b4020f6a3ab Mon Sep 17 00:00:00 2001 From: LynithDev <61880709+LynithDev@users.noreply.github.com> Date: Tue, 26 Dec 2023 20:29:16 +0100 Subject: Footer + small tweaks --- apps/website/src/components/base/Footer.astro | 39 +++++++-- apps/website/src/components/base/Link.astro | 17 ++++ apps/website/src/components/base/Navbar.astro | 21 ----- .../src/components/base/NavbarElement.astro | 95 ---------------------- apps/website/src/components/base/Paragraph.astro | 6 +- apps/website/src/components/base/Slider.astro | 2 +- .../src/components/base/navbar/Navbar.astro | 21 +++++ .../src/components/base/navbar/NavbarElement.astro | 95 ++++++++++++++++++++++ 8 files changed, 170 insertions(+), 126 deletions(-) create mode 100644 apps/website/src/components/base/Link.astro delete mode 100644 apps/website/src/components/base/Navbar.astro delete mode 100644 apps/website/src/components/base/NavbarElement.astro create mode 100644 apps/website/src/components/base/navbar/Navbar.astro create mode 100644 apps/website/src/components/base/navbar/NavbarElement.astro (limited to 'apps/website/src/components/base') diff --git a/apps/website/src/components/base/Footer.astro b/apps/website/src/components/base/Footer.astro index 0eaa4ba..bf019ac 100644 --- a/apps/website/src/components/base/Footer.astro +++ b/apps/website/src/components/base/Footer.astro @@ -1,15 +1,42 @@ --- - +import Icon from "@components/icons/Icon.astro"; +import Logo from "@components/logos/Logo.astro"; +import configConst from "@config"; +import Link from "./Link.astro"; --- -