From 1b42ad35cfe2b5d3a706c9ffce7dd11232a7356a Mon Sep 17 00:00:00 2001 From: Firq Date: Thu, 26 Jan 2023 23:29:36 +0100 Subject: [PATCH] Updated README, hopefully fixed mobile design, refactored and refined desktop design --- README.md | 40 ++++++++++++----------- src/components/ceCard.astro | 55 ++++++++++++++++---------------- src/components/servantCard.astro | 30 ++++++++--------- 3 files changed, 62 insertions(+), 63 deletions(-) diff --git a/README.md b/README.md index 8252739..5672379 100644 --- a/README.md +++ b/README.md @@ -1,38 +1,45 @@ -# Welcome to [Astro](https://astro.build) +# Welcome to Firqs FGO Site -[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/basics) -[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/basics) - -> 🧑‍🚀 **Seasoned astronaut?** Delete this file. Have fun! - -![basics](https://user-images.githubusercontent.com/4677417/186188965-73453154-fdec-4d6b-9c34-cb35c248ae5b.png) +This is build using [Astro](https://astro.build) ## 🚀 Project Structure -Inside of your Astro project, you'll see the following folders and files: - ``` / -├── public/ -│ └── favicon.svg +├── static/ +│ ├── favicon.svg +│ └── other files ... +│ ├── src/ │ ├── components/ -│ │ └── Card.astro +│ │ ├── servantCard.astro +│ │ ├── ceCard.astro +│ │ ├── contactCard.astro +│ │ └── taCard.astro +│ │ │ ├── layouts/ +│ │ ├── customFooter.astro +│ │ ├── baseSection.astro +│ │ ├── taSection.astro +│ │ ├── contactSection.astro │ │ └── Layout.astro +│ │ │ └── pages/ │ └── index.astro +│ +├── .gitlab-ci.yml +├── astro.config.mjs └── package.json ``` Astro looks for `.astro` or `.md` files in the `src/pages/` directory. Each page is exposed as a route based on its file name. -There's nothing special about `src/components/`, but that's where we like to put any Astro/React/Vue/Svelte/Preact components. +More routes will follow soon -Any static assets, like images, can be placed in the `public/` directory. +Any static assets, like images, can be placed in the `static/` directory. -## 🧞 Commands +## 🧞 Astro-Specific Commands All commands are run from the root of the project, from a terminal: @@ -45,6 +52,3 @@ All commands are run from the root of the project, from a terminal: | `npm run astro ...` | Run CLI commands like `astro add`, `astro preview` | | `npm run astro --help` | Get help using the Astro CLI | -## 👀 Want to learn more? - -Feel free to check [our documentation](https://docs.astro.build) or jump into our [Discord server](https://astro.build/chat). diff --git a/src/components/ceCard.astro b/src/components/ceCard.astro index b142e77..7e53264 100644 --- a/src/components/ceCard.astro +++ b/src/components/ceCard.astro @@ -16,11 +16,9 @@ if(mlb === "false") { ---
-
-

{name}

-
+
{name}
- A Fragment of 2030 + {name}
Max-limit broken @@ -38,16 +36,15 @@ if(mlb === "false") { border-color: #1e1e1e; padding: 20px; padding-top: 5px; - width: 7em; + width: 35%; height: auto; justify-content: center; text-align: center; transition: transform var(--speed) var(--ease); - overflow: hidden; margin: 0px; display: grid; - grid-template-columns: auto; - grid-template-rows: auto 11em 3em; + grid-template-columns: 100%; + grid-template-rows: auto auto 3em; gap: 0px 0px; grid-auto-flow: row; grid-template-areas: @@ -65,22 +62,20 @@ if(mlb === "false") { } img { - display: block; + display: flex; margin-left: auto; margin-right: auto; } .heading-center { - display: table; + display: flex; height: 4rem; - } - - .heading-center > h1 { + width: 100%; + align-items: center; + justify-content: center; font-size: 1.25em; color: white; - width: 12rem; - display: table-cell; - vertical-align: middle; + font-weight: bold; } .ce-crop { @@ -90,26 +85,30 @@ if(mlb === "false") { object-position: 0% 0%; } - @media (min-width: 512px) { - .ce-crop { - width: 10em; - height: 10em; - } - article { - width: auto; - } - } - .mlb { - width: 60%; + width: 100%; margin-left: auto; margin-right: auto; } .mlbalign { - width: 10em; display: flex; justify-items: center; align-items: center; } + + @media (min-width: 512px) { + .ce-crop { + width: 7.5em; + height: 7.5em; + } + article { + width: 10em; + grid-template-columns: auto; + grid-template-rows: auto auto 3em; + } + .mlbalign { + width: 7.5em; + } + } \ No newline at end of file diff --git a/src/components/servantCard.astro b/src/components/servantCard.astro index 0afcc9d..2bc86b7 100644 --- a/src/components/servantCard.astro +++ b/src/components/servantCard.astro @@ -22,9 +22,7 @@ if(bond10 === "false") { ---
-
-

{name}

-
+
{name}
{name}

Level {level}
@@ -32,15 +30,22 @@ if(bond10 === "false") { NP {np}

-

Mana Loading: {ml === "Not Unlocked" &&
}{ml}

+

Mana Loading: {ml === "Not Unlocked" &&
}{ml}