diff options
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | css/overview.scss | 3 | ||||
| -rw-r--r-- | include/achernar.php | 18 | ||||
| -rw-r--r-- | include/benoit.php | 2 | ||||
| -rw-r--r-- | include/prelude.php | 12 | ||||
| -rw-r--r-- | index.php | 8 | ||||
| -rw-r--r-- | svg/glyph/benoitSmall.svg | 11 | ||||
| -rw-r--r-- | svg/glyph/pollexSmall.svg | 14 |
8 files changed, 48 insertions, 26 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ea3a7af..bb9af1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 11.5 + +* Elaborate pages +* Refactor server scripts +* Update overview icons + ## 11.4 * Fix *X* link diff --git a/css/overview.scss b/css/overview.scss index abd0fb5..3623478 100644 --- a/css/overview.scss +++ b/css/overview.scss @@ -17,7 +17,6 @@ align-items: center; aspect-ratio: 1; background-color: var(--backgroundColour); - background-size: cover; border-radius: $padding; display: flex; flex-basis: calc((100% - $padding * ($cardsPerRow - 1)) / $cardsPerRow); @@ -36,7 +35,7 @@ img { display: block; - width: 75%; + width: 50%; } } } diff --git a/include/achernar.php b/include/achernar.php index e71d601..b54d189 100644 --- a/include/achernar.php +++ b/include/achernar.php @@ -11,7 +11,7 @@ <?php addHeading("Projects", "projects"); ?> <section class="fullWidth"> - <p>The following is a list of our current and maintained projects.</p> + <p>The following is a list of our current projects. Click on a card to view the project's page.</p> <br> <p class="note">Scroll <a href="#anchor.vision">down</a> for more information about us.</p> <br> @@ -19,16 +19,16 @@ <?php function addCard($page, $title) { [$backgroundColour, $textColour] = pageColours($page); - $backgroundImage = pageBackgroundImage($page); - $glyphAddr = pageGlyph($page); - if (is_null($backgroundImage)) { - $backgroundImage = "none"; - } else { - $backgroundImage = "url('" . $backgroundImage . "')"; - } + $glyphAddr = match ($page) { + "benoit", + "pollex", + => "/svg/glyph/" . $page . "Small.svg", - $cardStyle = "--backgroundColour: $backgroundColour; --textColour: $textColour; background-image: $backgroundImage"; + default => "/svg/glyph/" . $page . ".svg", + }; + + $cardStyle = "--backgroundColour: $backgroundColour; --textColour: $textColour;"; echo <<<HTML <a href="?p=$page" style="$cardStyle" title="$title"> diff --git a/include/benoit.php b/include/benoit.php index 182867e..7d0013b 100644 --- a/include/benoit.php +++ b/include/benoit.php @@ -11,7 +11,7 @@ <?php addHeading("Features", "features"); ?> <section> - <p>The core library used multi-threading for rendering the provided scenes. Internally, the <a href="https://crates.io/crates/rayon/">Rayon</a> crate is used for threadpooling and such, where each pixel on the canvas is a job in and of itself.</p> + <p>The core library uses multi-threading for rendering the provided scenes. Internally, the <a href="https://crates.io/crates/rayon/">Rayon</a> crate is used for threadpooling and such, where each pixel on the canvas is a job in and of itself.</p> <br> <?php addImage("inverseJulia20231009200744", "An inverse Julia Set outside the Burning Ship fractal, resembling circles intertwined in a diamond shape with a dark red colour scheme.") ?> <br> diff --git a/include/prelude.php b/include/prelude.php index f89d036..e7d6324 100644 --- a/include/prelude.php +++ b/include/prelude.php @@ -26,18 +26,6 @@ }; } - function pageBackgroundImage($page) { - return match ($page) { - "benoit" => "/svg/benoitBackground.svg", - "dux" => "/image/duxBackground.webp", - default => null, - }; - } - - function pageGlyph($page) { - return "/svg/glyph/" . $page . ".svg"; - } - function addHeading($title, $anchor) { $anchor = "anchor." . $anchor; @@ -142,7 +142,11 @@ --textColour: <?php echo pageColours($currentPage)[0x1] ?>; <?php - $backgroundImage = pageBackgroundImage($currentPage); + $backgroundImage = match ($currentPage) { + "benoit" => "/svg/benoitBackground.svg", + "dux" => "/image/duxBackground.webp", + default => null, + }; if (!is_null($backgroundImage)) { echo 'background-image: url("' . $backgroundImage . '");'; @@ -192,7 +196,7 @@ </div> <?php - $glyphAddr = pageGlyph($currentPage); + $glyphAddr = "/svg/glyph/" . $currentPage . ".svg"; echo "<img alt=\"$currentPage\" id=\"glyph\" src=\"$glyphAddr\" />"; ?> diff --git a/svg/glyph/benoitSmall.svg b/svg/glyph/benoitSmall.svg new file mode 100644 index 0000000..5a5985b --- /dev/null +++ b/svg/glyph/benoitSmall.svg @@ -0,0 +1,11 @@ +<svg height="72" width="72" xmlns="http://www.w3.org/2000/svg"> + <mask id="glyph"> + <ellipse cx="36" cy="36" fill="white" rx="36" ry="24" /> + <ellipse cx="36" cy="36" fill="black" rx="30" ry="18" /> + + <ellipse cx="36" cy="36" fill="white" rx="24" ry="24" /> + <ellipse cx="36" cy="36" fill="black" rx="18" ry="18" /> + </mask> + + <rect fill="#FFFFFF" mask="url(#glyph)" height="100%" width="100%" x="0" y="0" /> +</svg> diff --git a/svg/glyph/pollexSmall.svg b/svg/glyph/pollexSmall.svg new file mode 100644 index 0000000..276746f --- /dev/null +++ b/svg/glyph/pollexSmall.svg @@ -0,0 +1,14 @@ +<svg height="64" width="64" xmlns="http://www.w3.org/2000/svg"> + <mask id="glyph"> + <polygon fill="white" points="0,0 55,0 55,18 16,18 16,0 16,24 0,24" /> + <circle cx="55" cy="9" fill="white" r="9" /> + + <polygon fill="black" points="16,6 45,6 45,12 16,12" /> + <circle cx="45" cy="9" fill="black" r="3" /> + + <polygon fill="white" points="0,40 16,40 64,64 48,64" /> + <polygon fill="white" points="48,40 64,40 16,64 0,64" /> + </mask> + + <rect fill="#FFFFFF" height="100%" mask="url(#glyph)" width="100%" x="0" y="0" /> +</svg> |
