Skip to content

Pull request: Show a scheduled merge as a merge box section #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
whereareiam merged 1 commit into from
Oct 4, 2026
Merged

Pull request: Show a scheduled merge as a merge box section #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion scripts/assembleForgejo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ for (const directory of ["common", "repository"]) {
}
}

for (const file of ["dashboard-lists.css", "organization.css", "profile-subpages.css", "user-profile.css"]) {
for (const file of [
"dashboard-lists.css",
"organization.css",
"profile-subpages.css",
"pull-request.css",
"user-profile.css",
]) {
cpSync(join(root, "styles", "pages", file), join(css, "components", "pages", file));
}
for (const file of readdirSync(join(root, "public"))) {
Expand Down
56 changes: 56 additions & 0 deletions styles/pages/pull-request.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/* Pull request page rules kept out of the theme files, which are at their size limit. */

/*
* A merge scheduled for when checks succeed. Forgejo prints a blue notice above the merge button;
* here it is one more section of the merge box, like the rows above it: a round status icon, the
* sentence, and the bar with the merge button and "Cancel" below.
*/
.github-pull-review .pull-merge-actions > #pull-request-merge-form:has(.ui.info.message) {
flex: 0 0 100%;
}

.github-pull-review .pull-merge-actions .ui.info.message {
position: relative;
display: block;
min-height: 64px;
margin: -16px -16px 16px;
padding: 20px 16px 20px 56px;
border: 0;
border-bottom: 1px solid color-mix(in srgb, var(--color-light-border) 70%, transparent);
border-radius: 0;
background: var(--color-body);
box-shadow: none;
color: var(--color-text);
font-size: 16px;
font-weight: 600;
line-height: 24px;
}

/* The status icon: a white clock on the accent colour. The notice itself carries no icon element. */
.github-pull-review .pull-merge-actions .ui.info.message::before {
content: "";
position: absolute;
top: 16px;
left: 16px;
width: 32px;
height: 32px;
border-radius: 50%;
background: var(--github-bgColor-accent-emphasis)
url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3E%3Cpath d='M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Zm7-3.25v2.992l2.028.812a.75.75 0 0 1-.557 1.392l-2.5-1A.751.751 0 0 1 7 8.25v-3.5a.75.75 0 0 1 1.5 0Z'/%3E%3C/svg%3E")
center / 16px no-repeat;
}

.github-pull-review .pull-merge-actions .ui.info.message relative-time {
color: var(--color-text-light-1);
font-weight: 400;
}

/* The buttons under the notice sit 8px apart. */
.github-pull-review .pull-merge-actions .tw-flex {
align-items: center;
gap: 8px;
}

.github-pull-review .pull-merge-actions .tw-flex > form {
margin: 0 !important;
}
1 change: 1 addition & 0 deletions templates/base/component_assets.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/components/pages/dashboard-lists.css">
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/components/pages/organization.css">
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/components/pages/profile-subpages.css">
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/components/pages/pull-request.css">
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/components/pages/user-profile.css">
Loading