This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-release.git
The following commit(s) were added to refs/heads/main by this push:
new b9eb669 Make a range of small stylistic improvements
b9eb669 is described below
commit b9eb669f6cc9fa5a1102d0f561e5e0454da71bcc
Author: Sean B. Palmer <[email protected]>
AuthorDate: Tue Apr 22 16:33:08 2025 +0100
Make a range of small stylistic improvements
---
atr/routes/draft.py | 3 ++-
atr/static/css/atr.css | 19 +++++++++++++++----
atr/static/css/bootstrap.custom.css | 12 ++++++++++--
atr/templates/draft-content.html | 11 -----------
atr/templates/draft-vote-start.html | 7 ++++---
atr/templates/index-committer.html | 5 +++--
atr/templates/release-start.html | 2 +-
bootstrap/custom.scss | 7 +++++++
bootstrap/reboot-shim.scss | 4 ++++
9 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/atr/routes/draft.py b/atr/routes/draft.py
index 8bdf2bd..41dfeb9 100644
--- a/atr/routes/draft.py
+++ b/atr/routes/draft.py
@@ -1148,7 +1148,8 @@ async def vote_preview(session: routes.CommitterSession)
-> quart.wrappers.respo
return quart.Response(body, mimetype="text/plain")
[email protected]("/draft/vote/start/<project_name>/<version>/<revision>",
methods=["GET", "POST"])
+# TODO: Rename to vote.revision?
[email protected]("/vote/<project_name>/<version>/<revision>", methods=["GET",
"POST"])
async def vote_start(
session: routes.CommitterSession, project_name: str, version: str,
revision: str
) -> response.Response | str:
diff --git a/atr/static/css/atr.css b/atr/static/css/atr.css
index 1305bd2..0e30fdd 100644
--- a/atr/static/css/atr.css
+++ b/atr/static/css/atr.css
@@ -33,6 +33,10 @@ body {
font-weight: 425;
}
+a {
+ font-weight: 450;
+}
+
input, textarea, select, option {
font-size: 17px !important;
font-weight: 425 !important;
@@ -72,10 +76,6 @@ input:not([type="submit"]), textarea, select, option {
border-width: 2px !important;
}
-a {
- font-weight: 450;
-}
-
strong a {
font-weight: 600;
}
@@ -406,3 +406,14 @@ img {
font-weight: 300;
padding: 0 0.5rem;
}
+
+h1 strong {
+ font-weight: 550;
+}
+
+h1 em {
+ font-weight: 425;
+ font-style: normal;
+ font-variation-settings: "ital" 0.5;
+ color: #555555;
+}
diff --git a/atr/static/css/bootstrap.custom.css
b/atr/static/css/bootstrap.custom.css
index 896258f..eb9a413 100644
--- a/atr/static/css/bootstrap.custom.css
+++ b/atr/static/css/bootstrap.custom.css
@@ -88,8 +88,8 @@
--bs-tertiary-bg: #f8f9fa;
--bs-tertiary-bg-rgb: 248, 249, 250;
--bs-heading-color: inherit;
- --bs-link-color: #0d6efd;
- --bs-link-color-rgb: 13, 110, 253;
+ --bs-link-color: #0011cc;
+ --bs-link-color-rgb: 0, 17, 204;
--bs-link-decoration: underline;
--bs-link-hover-color: rgb(10.4, 88, 202.4);
--bs-link-hover-color-rgb: 10, 88, 202;
@@ -188,6 +188,10 @@ mark, .mark {
display: inline;
}
+a:not(.btn):not(.btn-link):link {
+ color: var(--bs-link-color, #0011cc);
+}
+
.accordion {
--bs-accordion-color: var(--bs-body-color);
--bs-accordion-bg: var(--bs-body-bg);
@@ -11495,4 +11499,8 @@ small, .small, .text-muted {
border-color: rgb(0, 38.8571428571, 68);
}
+.btn-link {
+ text-decoration: none;
+}
+
/*# sourceMappingURL=custom.css.map */
diff --git a/atr/templates/draft-content.html b/atr/templates/draft-content.html
index 999d288..f474fa9 100644
--- a/atr/templates/draft-content.html
+++ b/atr/templates/draft-content.html
@@ -22,17 +22,6 @@
text-align: center;
}
- h1 strong {
- font-weight: 550;
- }
-
- h1 em {
- font-weight: 425;
- font-style: normal;
- font-variation-settings: "ital" 0.5;
- color: #555555;
- }
-
table tr {
border-bottom: none;
}
diff --git a/atr/templates/draft-vote-start.html
b/atr/templates/draft-vote-start.html
index 44d5506..9945865 100644
--- a/atr/templates/draft-vote-start.html
+++ b/atr/templates/draft-vote-start.html
@@ -10,11 +10,12 @@
{% block content %}
<div class="my-4">
- <h1 class="mb-4">Start release vote</h1>
+ <h1 class="mb-4">
+ Start a vote on <strong>{{
release.project.display_name.removeprefix("Apache ") }}</strong> <em>{{
release.version }}</em>
+ </h1>
- <div class="px-3 pb-4 mb-4 bg-light border rounded">
+ <div class="px-3 py-4 mb-4 bg-light border rounded">
<!-- TODO: Specify the draft revision too? -->
- <h2 class="mt-4 mb-3 fs-5 border-0">{{ release.project.display_name }}
{{ release.version }}</h2>
<p class="mb-0">
Starting a vote for this draft release will cause an email to be sent
to the appropriate mailing list, and advance the draft to the "waiting for vote
result" phase, unless you send a test message to yourself.
</p>
diff --git a/atr/templates/index-committer.html
b/atr/templates/index-committer.html
index 2b8a1b7..c80a689 100644
--- a/atr/templates/index-committer.html
+++ b/atr/templates/index-committer.html
@@ -48,8 +48,9 @@
{% endblock stylesheets %}
{% block content %}
+ <h1>Select a release</h1>
<p>
- Welcome to the <strong>Apache Trusted Release</strong> (ATR) platform,
designed to assist you through the process of releasing a new version of an
Apache software project. Get started by selecting from the options below.
+ Welcome to the <strong>Apache Trusted Release</strong> (ATR) platform,
designed to assist you through the process of releasing a new version of an
Apache software project. Get started by selecting a release below.
</p>
{% if all_projects %}
@@ -129,7 +130,7 @@
<a href="{{ release_link }}" class="text-decoration-none">
<div class="card h-100 shadow-sm hover-lift atr-cursor-pointer
page-card">
<div class="card-body text-center d-flex flex-column
justify-content-center">
- <div class="fw-bold mb-3 fs-3 page-version">{{
release.version }}</div>
+ <div class="fw-semibold mb-3 fs-4 page-version">{{
release.version }}</div>
<div class="page-phase-progression">
{# set phase_symbols = ["①", "②", "③", "④", "⑤"] #}
{% set phase_symbols = ["1.", "2.", "3.", "4.", "5."] %}
diff --git a/atr/templates/release-start.html b/atr/templates/release-start.html
index 5299bbf..a95dbb7 100644
--- a/atr/templates/release-start.html
+++ b/atr/templates/release-start.html
@@ -27,7 +27,7 @@
<div class="mb-3">
<label for="{{ form.version_name.id }}" class="form-label">{{
form.version_name.label.text }}:</label>
- {{ form.version_name(class_="form-control form-control-lg",
placeholder="E.g. 1.2.3+rc1 or 2.5") }}
+ {{ form.version_name(class_="form-control form-control-lg",
placeholder="Examples: 1.2.3+rc1 or 2.5") }}
{% if form.version_name.errors -%}
<div class="invalid-feedback d-block">{{ form.version_name.errors[0]
}}</div>
{%- endif %}
diff --git a/bootstrap/custom.scss b/bootstrap/custom.scss
index 35a13ee..9295ea6 100644
--- a/bootstrap/custom.scss
+++ b/bootstrap/custom.scss
@@ -12,6 +12,7 @@ $table-cell-padding-y: 0.75rem;
$table-cell-padding-x: 0.75rem;
$table-bg: transparent;
$table-accent-bg: transparent;
+$link-color: #0011cc;
// Merge custom colors after variables but before maps
$theme-colors: map-merge(
@@ -117,3 +118,9 @@ small, .text-muted {
background-color: darken(#004477, 10%);
border-color: darken(#004477, 10%);
}
+
+// Patch for btn-link due to using reboot-shim
+.btn-link {
+ // Set base state - remove underline from shim's a rule
+ text-decoration: none;
+}
diff --git a/bootstrap/reboot-shim.scss b/bootstrap/reboot-shim.scss
index 26513da..45c7a6b 100644
--- a/bootstrap/reboot-shim.scss
+++ b/bootstrap/reboot-shim.scss
@@ -5,3 +5,7 @@
h1, h2, h3, h4, h5, h6 { display: block; }
small { display: inline; }
mark { display: inline; }
+
+a:not(.btn):not(.btn-link):link {
+ color: var(--bs-link-color, #{$link-color});
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
