From 00619080a820a1e2153282b089367f61ea5ca646 Mon Sep 17 00:00:00 2001
From: Alex Cabal <alex@alexcabal.com>
Date: Mon, 15 Apr 2024 20:36:51 -0500
Subject: [PATCH] Add icons to form elements across site, and remove some CSS
 classes in favor of :has()

---
 templates/ArtworkForm.php            |  14 ++--
 templates/SearchForm.php             |   8 +-
 www/artworks/get.php                 |   2 +-
 www/artworks/index.php               |   8 +-
 www/css/artwork.css                  |  28 ++++++-
 www/css/core.css                     | 109 +++++++++++++++++++--------
 www/css/dark.css                     |   2 +-
 www/css/ereader.css                  |   9 +--
 www/fonts/fork-awesome-subset.woff2  | Bin 2300 -> 4576 bytes
 www/newsletter/subscriptions/new.php |   2 +-
 www/sessions/new.php                 |   4 +-
 www/settings/index.php               |   2 +-
 12 files changed, 127 insertions(+), 61 deletions(-)

diff --git a/templates/ArtworkForm.php b/templates/ArtworkForm.php
index cb579957..2748d9c1 100644
--- a/templates/ArtworkForm.php
+++ b/templates/ArtworkForm.php
@@ -14,7 +14,7 @@ $now = new DateTimeImmutable('now', new DateTimeZone('America/Juneau')); // Late
 ?>
 <fieldset>
 	<legend>Artist details</legend>
-	<label>
+	<label class="user">
 		<span>Name</span>
 		<span>For existing artists, leave the year of death blank.</span>
 		<datalist id="artist-names">
@@ -34,7 +34,7 @@ $now = new DateTimeImmutable('now', new DateTimeZone('America/Juneau')); // Late
 			value="<?= Formatter::EscapeHtml($artwork->Artist->Name) ?>"
 		/>
 	</label>
-	<label>
+	<label class="year">
 		<span>Year of death</span>
 		<span>If circa or unknown, enter the latest possible year.</span>
 		<? /* Not using <input type="number"> for now, see https://technology.blog.gov.uk/2020/02/24/why-the-gov-uk-design-system-team-changed-the-input-type-for-numbers/ */ ?>
@@ -50,13 +50,13 @@ $now = new DateTimeImmutable('now', new DateTimeZone('America/Juneau')); // Late
 </fieldset>
 <fieldset>
 	<legend>Artwork details</legend>
-	<label>
+	<label class="picture">
 		Name
 		<input type="text" name="artwork-name" required="required" autocomplete="off"
 		       value="<?= Formatter::EscapeHtml($artwork->Name) ?>"/>
 	</label>
 	<fieldset>
-		<label>
+		<label class="year">
 			Year of completion
 			<input
 				type="text"
@@ -75,7 +75,7 @@ $now = new DateTimeImmutable('now', new DateTimeZone('America/Juneau')); // Late
 			/> Year is circa
 		</label>
 	</fieldset>
-	<label>
+	<label class="tags">
 		<span>Tags</span>
 		<span>A list of comma-separated tags.</span>
 		<input
@@ -123,7 +123,7 @@ $now = new DateTimeImmutable('now', new DateTimeZone('America/Juneau')); // Late
 			<span>This book was published in the U.S.</span>
 			<span>Yes, if a U.S. city appears anywhere near the publication year or rights statement.</span>
 		</label>
-		<label>
+		<label class="year">
 			Year of publication
 			<input
 				type="text"
@@ -186,7 +186,7 @@ $now = new DateTimeImmutable('now', new DateTimeZone('America/Juneau')); // Late
 <fieldset>
 	<legend>Editor options</legend>
 	<? if($artwork->CanStatusBeChangedBy($GLOBALS['User'] ?? null)){ ?>
-		<label class="select">
+		<label>
 			<span>Artwork approval status</span>
 			<span>
 				<select name="artwork-status">
diff --git a/templates/SearchForm.php b/templates/SearchForm.php
index c91f7b5c..a4ca171d 100644
--- a/templates/SearchForm.php
+++ b/templates/SearchForm.php
@@ -10,10 +10,10 @@ $allSelected = sizeof($tags) == 0 || in_array('all', $tags);
 		<? } ?>
 		</select>
 	</label>
-	<label class="search">Keywords
+	<label>Keywords
 		<input type="search" name="query" value="<?= Formatter::EscapeHtml($query ?? '') ?>"/>
 	</label>
-	<label class="select sort">
+	<label class="sort">
 		<span>Sort</span>
 		<span>
 			<select name="sort">
@@ -24,7 +24,7 @@ $allSelected = sizeof($tags) == 0 || in_array('all', $tags);
 			</select>
 		</span>
 	</label>
-	<label class="select view">
+	<label class="view">
 		<span>View</span>
 		<span>
 			<select name="view">
@@ -33,7 +33,7 @@ $allSelected = sizeof($tags) == 0 || in_array('all', $tags);
 			</select>
 		</span>
 	</label>
-	<label class="select per-page">
+	<label class="per-page">
 		<span>Per page</span>
 		<span>
 			<select name="per-page">
diff --git a/www/artworks/get.php b/www/artworks/get.php
index 31cf5a70..bc2a4d9b 100644
--- a/www/artworks/get.php
+++ b/www/artworks/get.php
@@ -157,7 +157,7 @@ catch(Exceptions\InvalidPermissionsException){
 			<form method="post" action="<?= $artwork->Url ?>">
 				<input type="hidden" name="_method" value="PATCH" />
 				<? if($artwork->CanStatusBeChangedBy($GLOBALS['User'] ?? null)){ ?>
-					<label class="select">
+					<label>
 						<span>Artwork approval status</span>
 						<span>
 							<select name="artwork-status">
diff --git a/www/artworks/index.php b/www/artworks/index.php
index 05c195dc..e02144a9 100644
--- a/www/artworks/index.php
+++ b/www/artworks/index.php
@@ -119,7 +119,7 @@ catch(Exceptions\PageOutOfBoundsException){
 		<h1>Browse U.S. Public Domain Artwork</h1>
 		<p>You can help Standard Ebooks by <a href="/artworks/new">submitting new public domain artwork</a> to add to this catalog for use in future ebooks. For free access to the submission form, <a href="/about#editor-in-chief">contact the Editor-in-Chief</a>.</p>
 		<form class="browse-artwork" action="/artworks" method="get" rel="search">
-			<label class="select">
+			<label>
 				<span>Status</span>
 				<span>
 					<select name="status" size="1">
@@ -131,10 +131,10 @@ catch(Exceptions\PageOutOfBoundsException){
 					</select>
 				</span>
 			</label>
-			<label class="search">Keywords
+			<label>Keywords
 				<input type="search" name="query" value="<?= Formatter::EscapeHtml($query) ?>"/>
 			</label>
-			<label class="select sort">
+			<label class="sort">
 				<span>Sort</span>
 				<span>
 					<select name="sort">
@@ -144,7 +144,7 @@ catch(Exceptions\PageOutOfBoundsException){
 					</select>
 				</span>
 			</label>
-			<label class="select">
+			<label>
 				<span>Per page</span>
 				<span>
 					<select name="per-page">
diff --git a/www/css/artwork.css b/www/css/artwork.css
index 986d05e6..ccfc7823 100644
--- a/www/css/artwork.css
+++ b/www/css/artwork.css
@@ -166,6 +166,11 @@ form[action^="/artworks/"]{
 	margin-top: 1.4rem;
 }
 
+
+label.picture::before{
+	bottom: 2.6rem; /* Fix alignment caused by "circa" checkbox */
+}
+
 .artworks form.browse-artwork label.search{
 	grid-column: span 3;
 }
@@ -210,10 +215,10 @@ form.create-update-artwork fieldset label:has(input[type="checkbox"]){
 }
 
 form.create-update-artwork #pd-proof > fieldset{
-	border-left-color: var(--body-text);
-	border-left-width: 3px;
-	border-left-style: dotted;
-	padding-left: .75rem;
+	border-color: var(--body-text);
+	border-width: 3px;
+	border-style: double;
+	padding: 1rem;
 }
 
 form.create-update-artwork fieldset p{
@@ -401,6 +406,21 @@ main section.narrow h1 ~ picture{
 	}
 }
 
+@media(max-width: 560px){
+	form.create-update-artwork > fieldset:nth-of-type(1),
+	form.create-update-artwork > fieldset:nth-of-type(2),
+	form.create-update-artwork fieldset fieldset:has(input[name="artwork-publication-year"]){
+		grid-template-columns: 1fr;
+	}
+
+	form.create-update-artwork fieldset label:has(input[type="url"]),
+	form.create-update-artwork fieldset label:has(input[type="checkbox"]),
+	form.create-update-artwork > fieldset label:has(input[name="artwork-tags"]),
+	form.create-update-artwork > fieldset label:has(input[name="artwork-image"]){
+		grid-column: 1;
+	}
+}
+
 @media(max-width: 480px){
 	main > section > ol.artwork-list{
 		grid-template-columns: auto;
diff --git a/www/css/core.css b/www/css/core.css
index df2c75f8..87561b36 100644
--- a/www/css/core.css
+++ b/www/css/core.css
@@ -1745,8 +1745,8 @@ label.automation-test{
 	display: none;
 }
 
-label.email,
-label.search{
+label:has(input[type="email"]),
+label:has(input[type="search"]){
 	display: block;
 }
 
@@ -1776,9 +1776,14 @@ input[type="search"]{
 	box-shadow: 1px 1px 0 rgba(255, 255, 255, .5) inset;
 }
 
-label.email input,
-label.search input,
+label:has(input[type="email"]) input,
+label:has(input[type="search"]) input,
+label:has(input[type="url"]) input,
 label.captcha input,
+label.year input,
+label.tags input,
+label.picture input,
+label.user input,
 label:has(input[type="password"]) input{
 	padding-left: 2.5rem;
 }
@@ -1790,12 +1795,17 @@ select{
 	display: block;
 }
 
+label:not(:has(input[type="checkbox"])){
+	font-weight: bold;
+}
+
 label span{
 	display: block;
 }
 
 label span + span{
 	font-style: italic;
+	font-weight: normal;
 }
 
 label span + span code{
@@ -1834,15 +1844,15 @@ select[multiple]{
 	padding: 1rem;
 }
 
-label.select > span{
+label:has(select) > span{
 	display: block;
 }
 
-label.select > span + span{
+label:has(select) > span + span{
 	display: inline-block;
 }
 
-label.select > span + span::after{
+label:has(select) > span + span::after{
 	display: block;
 	font-style: normal;
 	position: absolute;
@@ -1859,25 +1869,35 @@ label.select > span + span::after{
 	z-index: -1;
 }
 
-label.search:focus-within::before,
-label.search:hover::before,
-label.select:hover > span + span::after{
+label:has(input[type="search"]):focus-within::before,
+label:has(input[type="search"]):hover::before,
+label:has(select):hover > span + span::after{
 	color: var(--input-outline);
 	transition: none;
 }
 
-label.select > span + span,
-label.email,
-label.search,
+label:has(select) > span + span,
+label:has(input[type="email"]),
+label:has(input[type="search"]),
+label:has(input[type="url"]),
 label.captcha,
+label.year,
+label.tags,
+label.picture,
+label.user,
 label:has(input[type="password"]){
 	position: relative;
 	max-width: 100%;
 }
 
-label.email::before,
-label.search::before,
+label:has(input[type="email"])::before,
+label:has(input[type="search"])::before,
 label.captcha::before,
+label.year::before,
+label.tags::before,
+label.picture::before,
+label.user::before,
+label:has(input[type="url"])::before,
 label:has(input[type="password"])::before{
 	display: block;
 	position: absolute;
@@ -1886,7 +1906,6 @@ label:has(input[type="password"])::before{
 	font-family: "Fork Awesome";
 	font-size: 1rem;
 	line-height: 1;
-	margin-right: 1rem;
 	color: var(--sub-text);
 	margin-top: -3px; /* Adjust for Crimson Pro line-height */
 	text-shadow: 1px 1px 0 rgba(255, 255, 255, .5);
@@ -1895,7 +1914,11 @@ label:has(input[type="password"])::before{
 	cursor: text;
 }
 
-label.search::before{
+label:has(input[type="url"])::before{
+	content: "\f0c1";
+}
+
+label:has(input[type="search"])::before{
 	content: "\f002";
 }
 
@@ -1911,6 +1934,22 @@ label.captcha::before{
 	content: "\f256";
 }
 
+label.year::before{
+	content: "\f073";
+}
+
+label.tags:not(:has(select))::before{
+	content: "\f02c";
+}
+
+label.picture::before{
+	content: "\f03e";
+}
+
+label.user::before{
+	content: "\f007";
+}
+
 nav li.highlighted a,
 nav a[rel],
 a.button,
@@ -2015,7 +2054,7 @@ form[action="/ebooks"] label.tags select{
 	height: calc(100% - 1.4rem);
 }
 
-form[action="/ebooks"] label.search{
+form[action="/ebooks"] label:has(input[type="search"]){
 	grid-column: 2 / span 4;
 }
 
@@ -2401,8 +2440,8 @@ form[action="/newsletter/subscriptions"]{
 	margin-bottom: 0;
 }
 
-form[action*="/polls/"] label.email,
-form[action="/newsletter/subscriptions"] label.email,
+form[action*="/polls/"] label:has(input[type="email"]),
+form[action="/newsletter/subscriptions"] label:has(input[type="email"]),
 form[action="/newsletter/subscriptions"] label.captcha{
 	grid-column: 1 / span 2;
 }
@@ -2442,6 +2481,14 @@ fieldset p{
 	border-bottom: 1px dashed var(--input-border);
 }
 
+fieldset p:has(+ ul){
+	font-weight: bold;
+}
+
+input[type="checkbox"] + span:has(+ span){
+	font-weight: bold;
+}
+
 label.checkbox{
 	display: inline-flex;
 	align-items: flex-start;
@@ -2978,7 +3025,7 @@ ul.feed p{
 		grid-row: 1;
 	}
 
-	form[action="/ebooks"] label.search{
+	form[action="/ebooks"] label:has(input[type="search"]){
 		grid-column: 2 / span 3;
 	}
 
@@ -3042,7 +3089,7 @@ ul.feed p{
 		height: calc(1rem + 1.4rem + 1rem + 2px); /* Size equal to a select boxes */
 	}
 
-	form[action="/ebooks"] label.search{
+	form[action="/ebooks"] label:has(input[type="search"]){
 		grid-row: 1;
 		grid-column: 2 / span 3;
 	}
@@ -3226,7 +3273,7 @@ ul.feed p{
 		grid-column: 1 / span 2;
 	}
 
-	form[action="/ebooks"] label.search{
+	form[action="/ebooks"] label:has(input[type="search"]){
 		grid-row: 1;
 		grid-column: 3 / span 2;
 	}
@@ -3373,7 +3420,7 @@ ul.feed p{
 		grid-column: 1 / span 3;
 	}
 
-	form[action="/ebooks"] label.search{
+	form[action="/ebooks"] label:has(input[type="search"]){
 		grid-row: 2;
 		grid-column: 1 / span 3;
 	}
@@ -3582,7 +3629,7 @@ ul.feed p{
 		grid-template-columns: 100%;
 	}
 
-	form[action="/ebooks"] label.search,
+	form[action="/ebooks"] label:has(input[type="search"]),
 	form[action="/ebooks"] label.tags,
 	form[action="/ebooks"] label.sort,
 	form[action="/ebooks"] label.view,
@@ -3676,12 +3723,12 @@ ul.feed p{
 	article.ebook #more-ebooks img,
 	article.ebook #more-ebooks a:active img,
 	ol.ebooks-list > li a[tabindex]:active,
-	label.select > span + span::after,
-	label.search:focus-within::before,
-	label.search:hover::before,
-	label.select:hover > span + span::after,
-	label.email::before,
-	label.search::before,
+	label:has(select) > span + span::after,
+	label:has(input[type="search"]):focus-within::before,
+	label:has(input[type="search"]):hover::before,
+	label:has(select):hover > span + span::after,
+	label:has(input[type="email"])::before,
+	label:has(input[type="search"])::before,
 	textarea:hover,
 	nav li.highlighted a,
 	nav a[rel],
diff --git a/www/css/dark.css b/www/css/dark.css
index ca46e086..92705e86 100644
--- a/www/css/dark.css
+++ b/www/css/dark.css
@@ -79,7 +79,7 @@ article.ebook #more-ebooks img:hover{
 	box-shadow: 3px 3px 1px rgba(0, 0, 0, .5);
 }
 
-label.select > span + span::after,
+label:has(select) > span + span::after,
 label.search::before{
 	text-shadow: 1px 1px 0 #000;
 }
diff --git a/www/css/ereader.css b/www/css/ereader.css
index 5a73d970..facf5566 100644
--- a/www/css/ereader.css
+++ b/www/css/ereader.css
@@ -145,12 +145,11 @@ select{
 	padding-right: 2rem;
 }
 
-
-label.select > span{
+label:has(select) > span{
 	display: block;
 }
 
-label.select > span + span{
+label:has(select) > span + span{
 	display: inline-block;
 }
 
@@ -175,11 +174,11 @@ ol.ebooks-list.list > li .thumbnail-container{
 	margin-right: 1rem;
 }
 
-ol.ebooks-list.list ul.tags{
+ol.ebooks-list.list ul.genres{
 	list-style: none;
 }
 
-ol.ebooks-list.list ul.tags li{
+ol.ebooks-list.list ul.genres li{
 	float: left;
 	margin-right: .5rem;
 	margin-top: .5rem;
diff --git a/www/fonts/fork-awesome-subset.woff2 b/www/fonts/fork-awesome-subset.woff2
index 25ed581398dd3af517edd5cd6bb5f0de2aa8d16d..3c302eef5c237fde00781c61aff3a604324e3819 100644
GIT binary patch
literal 4576
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
Kzkea`0000U&c`hP

delta 2290
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
MG2@I}P9B@b2YEbA*#H0l

diff --git a/www/newsletter/subscriptions/new.php b/www/newsletter/subscriptions/new.php
index d29eb8fc..4c0d6c05 100644
--- a/www/newsletter/subscriptions/new.php
+++ b/www/newsletter/subscriptions/new.php
@@ -31,7 +31,7 @@ if($exception){
 			<label class="automation-test"><? /* Test for spam bots filling out all fields */ ?>
 				<input type="text" name="automationtest" value="" maxlength="80" />
 			</label>
-			<label class="email">Your email address
+			<label>Your email address
 				<input type="email" name="email" value="<? if($subscription->User !== null){ ?><?= Formatter::EscapeHtml($subscription->User->Email) ?><? } ?>" maxlength="80" required="required" />
 			</label>
 			<label class="captcha">
diff --git a/www/sessions/new.php b/www/sessions/new.php
index be7fe533..6179e1ac 100644
--- a/www/sessions/new.php
+++ b/www/sessions/new.php
@@ -43,13 +43,13 @@ if($exception){
 			<input type="hidden" name="redirect" value="<?= Formatter::EscapeHtml($redirect) ?>" />
 			<? if($passwordRequired){ ?>
 				<input type="hidden" name="email" value="<?= Formatter::EscapeHtml($email) ?>" maxlength="80" required="required" />
-				<label class="password">
+				<label>
 					<span>Your password</span>
 					<span>Logging in as <?= Formatter::EscapeHtml($email) ?>.</span>
 					<input type="password" name="password" value="" required="required" />
 				</label>
 			<? }else{ ?>
-				<label class="email">Your email address
+				<label>Your email address
 					<input type="email" name="email" value="<?= Formatter::EscapeHtml($email) ?>" maxlength="80" required="required" />
 				</label>
 			<? } ?>
diff --git a/www/settings/index.php b/www/settings/index.php
index 4c2cc294..81c3e3ba 100644
--- a/www/settings/index.php
+++ b/www/settings/index.php
@@ -5,7 +5,7 @@ $colorScheme = $_COOKIE['color-scheme'] ?? 'auto';
 <main>
 	<h1>Website Settings</h1>
 	<form action="/settings" method="post">
-		<label class="select">
+		<label>
 			<span>Color scheme</span>
 			<span>
 				<select name="color-scheme">