You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tooling.apache.org by sb...@apache.org on 2025/04/23 16:01:43 UTC
(tooling-trusted-release) branch main updated: Fix more classes and reorder some styles
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 71c2b3e Fix more classes and reorder some styles
71c2b3e is described below
commit 71c2b3e74ddb7054d4dad58f1e70bfff5a4d68c1
Author: Sean B. Palmer <se...@miscoranda.com>
AuthorDate: Wed Apr 23 17:01:27 2025 +0100
Fix more classes and reorder some styles
---
atr/static/css/atr.css | 175 +++++++++++++++++++------------------
atr/templates/draft-evaluate.html | 6 --
atr/templates/index-committer.html | 4 +-
atr/templates/keys-upload.html | 9 +-
4 files changed, 97 insertions(+), 97 deletions(-)
diff --git a/atr/static/css/atr.css b/atr/static/css/atr.css
index 8d4c51a..33a9642 100644
--- a/atr/static/css/atr.css
+++ b/atr/static/css/atr.css
@@ -24,6 +24,10 @@
box-sizing: border-box;
}
+a {
+ font-weight: 450;
+}
+
body {
font-family: "Inter", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Open Sans", "Helvetica Neue", sans-serif;
-webkit-font-smoothing: antialiased;
@@ -33,16 +37,66 @@ body {
font-weight: 425;
}
-a {
- font-weight: 450;
+footer {
+ padding: 1rem;
+ background: #eeeeee;
+ font-size: 15px;
+ margin: 2rem;
+ color: #333333;
+ font-variation-settings: "opsz" 14;
+ border-radius: 0.5rem;
+ border: 2px solid #d1d2d3;
+ display: table;
+ text-align: center;
+}
+
+h1 {
+ margin-bottom: 2rem;
+}
+
+h2 {
+ border-bottom: 1px solid #d1d2d3;
+ padding-bottom: 0.5rem;
+ margin-top: 2.5rem;
+ margin-bottom: 1.5rem;
+}
+
+img {
+ max-width: 100%;
+ height: auto;
+}
+
+pre {
+ white-space: pre-wrap;
+
+ /* word-wrap: anywhere; */
+ word-break: break-all;
+}
+
+summary {
+ cursor: pointer;
+}
+
+
+textarea {
+ width: 100%;
+ min-height: 200px;
+}
+
+table {
+ border-collapse: collapse;
}
-input, textarea, select, option {
+ul {
+ padding-left: 1rem;
+}
+
+input, option, select, textarea {
font-size: 17px !important;
font-weight: 425 !important;
}
-input, textarea, button, select, option {
+button, input, option, select, textarea {
font-family: "Inter", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Open Sans", "Helvetica Neue", sans-serif;
font-size: 17px;
line-height: 24px;
@@ -63,11 +117,6 @@ textarea {
padding: 0.5rem;
}
-textarea {
- width: 100%;
- min-height: 200px;
-}
-
select, input[type="file"] {
padding: 6px 12px;
}
@@ -85,29 +134,10 @@ h1, h2, h3 {
font-family: "Jost", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Open Sans", "Helvetica Neue", sans-serif;
}
-h1 {
- margin-bottom: 2rem;
-}
-
-h2 {
- border-bottom: 1px solid #d1d2d3;
- padding-bottom: 0.5rem;
- margin-top: 2.5rem;
- margin-bottom: 1.5rem;
-}
-
h3, p, ul, form {
margin-bottom: 1rem;
}
-ul {
- padding-left: 1rem;
-}
-
-table {
- border-collapse: collapse;
-}
-
table th {
text-align: left;
}
@@ -145,27 +175,6 @@ aside h3 {
margin-bottom: 0.5rem;
}
-
-pre {
- white-space: pre-wrap;
-
- /* word-wrap: anywhere; */
- word-break: break-all;
-}
-
-footer {
- padding: 1rem;
- background: #eeeeee;
- font-size: 15px;
- margin: 2rem;
- color: #333333;
- font-variation-settings: "opsz" 14;
- border-radius: 0.5rem;
- border: 2px solid #d1d2d3;
- display: table;
- text-align: center;
-}
-
footer a {
color: #333333;
font-weight: 425;
@@ -180,10 +189,27 @@ footer p {
margin-bottom: 0;
}
-summary {
- cursor: pointer;
+h1 strong {
+ font-weight: 525;
}
+h1 em {
+ font-weight: 425;
+ font-style: normal;
+
+ /* font-variation-settings: "ital" 0.5; */
+ color: #555555;
+}
+
+/* h1 em:before {
+ content: "(";
+}
+
+h1 em:after {
+ content: ")";
+} */
+
+
form.atr-canary {
background-color: #ffffee;
border: 2px solid #ddddbb;
@@ -207,17 +233,6 @@ span.warning {
flex-direction: column;
}
-.atr-back-link {
- display: inline-block;
- margin-bottom: 1rem;
- color: #0000cc;
- text-decoration: none;
-}
-
-.atr-back-link:hover {
- text-decoration: underline;
-}
-
.ribbon {
height: 8px;
background: linear-gradient(90deg, #282661 0%, #662f8f 20%, #9e2165 40%, #cb2138 60%, #ea7826 80%, #f7ae18 100%);
@@ -383,6 +398,17 @@ span.warning {
border-color: gray;
}
+.atr-back-link {
+ display: inline-block;
+ margin-bottom: 1rem;
+ color: #0000cc;
+ text-decoration: none;
+}
+
+.atr-back-link:hover {
+ text-decoration: underline;
+}
+
.atr-border-dashed {
border-style: dashed !important;
}
@@ -391,11 +417,6 @@ span.warning {
border-color: gray;
}
-img {
- max-width: 100%;
- height: auto;
-}
-
.atr-breadcrumbs {
font-size: 1.2rem;
font-weight: 475;
@@ -407,26 +428,6 @@ img {
padding: 0 0.5rem;
}
-h1 strong {
- font-weight: 525;
-}
-
-h1 em {
- font-weight: 425;
- font-style: normal;
-
- /* font-variation-settings: "ital" 0.5; */
- color: #555555;
-}
-
-/* h1 em:before {
- content: "(";
-}
-
-h1 em:after {
- content: ")";
-} */
-
/* There is no equivalent in Bootstrap */
.atr-cursor-pointer {
cursor: pointer;
diff --git a/atr/templates/draft-evaluate.html b/atr/templates/draft-evaluate.html
index cd13eba..931438d 100644
--- a/atr/templates/draft-evaluate.html
+++ b/atr/templates/draft-evaluate.html
@@ -34,9 +34,6 @@
<strong>Project:</strong>
<a href="{{ as_url(routes.projects.view, name=release.project.name) }}">{{ release.project.display_name }}</a>
</p>
- <p>
- <strong>Version:</strong> {{ version_name }}
- </p>
<p>
<strong>Label:</strong> {{ release.name }}
</p>
@@ -47,9 +44,6 @@
{% endif %}
</div>
<div class="col-md-6">
- <p>
- <strong>Stage:</strong> <span class="badge bg-{% if release.stage == 'CURRENT' %}success{% elif release.stage == 'CANDIDATE' %}warning{% elif release.stage == 'BUILD' %}info{% else %}secondary{% endif %}">{{ release.stage.value.upper() }}</span>
- </p>
<p>
<strong>Phase:</strong> <span class="badge bg-info">{{ release.phase.value.upper() }}</span>
</p>
diff --git a/atr/templates/index-committer.html b/atr/templates/index-committer.html
index 67070dd..52fbe9e 100644
--- a/atr/templates/index-committer.html
+++ b/atr/templates/index-committer.html
@@ -98,7 +98,7 @@
{% for release in active_releases %}
{% set current_phase_index = phase_index_map.get(release.phase, -1) %}
<a href="{{ release_as_url(release) }}" class="text-decoration-none">
- <div class="card h-100 shadow-sm hover-lift atr-cursor-pointer page-card">
+ <div class="card h-100 shadow-sm atr-cursor-pointer page-card">
<div class="card-body text-center d-flex flex-column justify-content-center">
<div class="fw-semibold mb-3 fs-4 page-version">{{ release.version }}</div>
<div class="atr-phase-themed mb-2">
@@ -140,7 +140,7 @@
<a href="{{ as_url(routes.draft.start, project_name=project.name) }}"
class="text-decoration-none">
- <div class="card h-100 shadow-sm hover-lift atr-cursor-pointer page-card">
+ <div class="card h-100 shadow-sm atr-cursor-pointer page-card">
<div class="card-body d-flex justify-content-center align-items-center text-center text-secondary">
<div>
<i class="fas fa-plus me-2"></i>
diff --git a/atr/templates/keys-upload.html b/atr/templates/keys-upload.html
index 1620750..3bdd370 100644
--- a/atr/templates/keys-upload.html
+++ b/atr/templates/keys-upload.html
@@ -26,9 +26,14 @@
<p>The following keys were found in your KEYS file:</p>
{% for key_info in results %}
- <div class="my-3 p-3 rounded {% if key_info.status == 'success' %}bg-light{% else %}bg-danger-subtle{% endif %}">
+ {% if key_info.status == "success" %}
+ {% set bg_class = "bg-light" %}
+ {% else %}
+ {% set bg_class = "bg-danger-subtle" %}
+ {% endif %}
+ <div class="my-3 p-3 rounded {{ bg_class }}">
<h3 class="mt-0">
- {% if key_info.status == 'success' %}
+ {% if key_info.status == "success" %}
Success: Added Key
{% else %}
Error: Failed to add key
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tooling.apache.org
For additional commands, e-mail: commits-help@tooling.apache.org