diff --git a/package.json b/package.json index 3cde074..6929f27 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@firq/fgosite", "type": "module", - "version": "0.2.0-pre.10", + "version": "0.2.0-pre.11", "private": true, "scripts": { "dev": "astro dev", diff --git a/src/assets/favourites/scathach.png b/src/assets/favourites/scathach.png index e2325f7..e6a64a7 100644 Binary files a/src/assets/favourites/scathach.png and b/src/assets/favourites/scathach.png differ diff --git a/src/assets/favourites/skadi.png b/src/assets/favourites/skadi.png index 1585b7f..5908d09 100644 Binary files a/src/assets/favourites/skadi.png and b/src/assets/favourites/skadi.png differ diff --git a/src/assets/favourites/summerskadi.png b/src/assets/favourites/summerskadi.png index 0822e06..dd5251d 100644 Binary files a/src/assets/favourites/summerskadi.png and b/src/assets/favourites/summerskadi.png differ diff --git a/src/components/cards/ceCard.astro b/src/components/cards/ceCard.astro index ae5966f..6ecc872 100644 --- a/src/components/cards/ceCard.astro +++ b/src/components/cards/ceCard.astro @@ -35,14 +35,12 @@ const mlb_image = mlb ? 'mlbalign' : 'hidemlb' article { border-radius: 1.25rem; + border: 2px var(--c-darkgray) solid; background-color: var(--c-darkergray); - padding: 20px; - padding-top: 5px; width: 35%; height: auto; justify-content: center; text-align: center; - transition: transform var(--speed) var(--ease); margin: 0px; display: grid; grid-template-columns: 100%; @@ -55,11 +53,11 @@ const mlb_image = mlb ? 'mlbalign' : 'hidemlb' } article:hover { - transform: scale(var(--hover-scale)); + border: 2px var(--c-darkpurple) solid; } article div { - margin: 0.5em auto; + margin: auto; } img { @@ -70,27 +68,17 @@ const mlb_image = mlb ? 'mlbalign' : 'hidemlb' margin-right: auto; } - .heading-center { - display: flex; - height: 4rem; - width: 100%; - align-items: center; - justify-content: center; - font-size: 1.25em; - color: white; - font-weight: bold; - } - .ce-crop { - width: 6em; - height: 6em; + width: 100px; + height: 100px; } .mlb { - width: 5.5rem; + width: 85px; height: auto; margin-left: auto; margin-right: auto; + margin-top: 0px; } .mlbalign { @@ -101,18 +89,18 @@ const mlb_image = mlb ? 'mlbalign' : 'hidemlb' @media (min-width: 512px) { .ce-crop { - width: 7.5em; - height: 7.5em; + width: 100px; + height: 100px; } article { - width: 10em; + width: 128px; } .mlbalign { - width: 7.5em; + width: 85px; } .mlb { - width: 7rem; + width: 85px; } } diff --git a/src/components/cards/favouriteCard.astro b/src/components/cards/favouriteCard.astro index 3d3867f..f1478a7 100644 --- a/src/components/cards/favouriteCard.astro +++ b/src/components/cards/favouriteCard.astro @@ -34,7 +34,7 @@ const loadedImage = plsLoadImage(images, imagePath) diff --git a/src/components/cards/servantCard.astro b/src/components/cards/servantCard.astro index 6a34807..41ca2ff 100644 --- a/src/components/cards/servantCard.astro +++ b/src/components/cards/servantCard.astro @@ -64,7 +64,8 @@ if (bond10 === false) { } article:hover { - transform: scale(var(--hover-scale)); + transform: scale(1); + border-color: var(--c-darkpurple); } article { @@ -72,14 +73,13 @@ if (bond10 === false) { flex-wrap: wrap; flex-direction: column; background-color: var(--c-darkergray); - border-color: var(--c-darkgray); + border: 2px var(--c-darkgray) solid; padding: 0em 0.75em 0.5rem 0.75em; width: max(40%, 100px); height: auto; justify-content: center; align-items: center; text-align: center; - transition: transform var(--speed) var(--ease); border-radius: 1.25rem; } @@ -98,27 +98,27 @@ if (bond10 === false) { } .expand-on-hover { - background-color: var(--c-duskgray); + background-color: var(--c-darkergray); + border: 2px var(--c-darkpurple) solid; + border-top: 0px; z-index: 99; transform: scaleY(0); transform-origin: top; position: absolute; top: 92.5%; - left: 0px; - right: 0px; border-radius: 0px 0px 1.25rem 1.25rem; + width: 100%; } article:hover .expand-on-hover { transform: scaleY(1); transition: transform 200ms ease-in-out; - background-color: var(--c-duskgray); } .bond-ce { padding-top: 0.75rem; width: auto; - height: 3rem; + height: 3.5rem; } .unobtained { @@ -133,16 +133,12 @@ if (bond10 === false) { } article > img { - width: 200px; - height: 200px; + width: 128px; + height: 128px; } .bond-ce { - height: 3.5rem; - } - - .expand-on-hover { - top: 95%; + height: 3rem; } } diff --git a/src/components/titles/smallTitle.astro b/src/components/titles/smallTitle.astro index 893fe86..31def2d 100644 --- a/src/components/titles/smallTitle.astro +++ b/src/components/titles/smallTitle.astro @@ -1,6 +1,6 @@ --- -import '@fontsource/work-sans/800.css' -import '@fontsource/work-sans/600.css' +import '@fontsource/work-sans/700.css' +import '@fontsource/work-sans/500.css' export interface Props { maintext: string subtext: string @@ -22,7 +22,7 @@ const displayBackButton = returnbutton ? "": "display: none" diff --git a/src/components/titles/title.astro b/src/components/titles/title.astro index afe14c3..9a13732 100644 --- a/src/components/titles/title.astro +++ b/src/components/titles/title.astro @@ -1,10 +1,11 @@ --- -import '@fontsource/work-sans/800.css' +import '@fontsource/work-sans/700.css' +import '@fontsource/work-sans/500.css' ---