Skip to content

Revert rollup button style change, and move sync button and its warning message to bottom of page #232

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 10, 2025
Merged

Revert rollup button style change, and move sync button and its warning message to bottom of page #232

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f63138
Revert rollup button style change
jieyouxu May 10, 2025
2dfa7d2
Move sync and warning message to bottom of page
jieyouxu May 10, 2025
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
27 changes: 5 additions & 22 deletions homu/html/queue.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,25 +122,6 @@
color: #00f;
}

/* Make the rollup button vs sync button clear distinct, because sync requires some elaborate procedure. */
button#expand-rollup {
background-color: darkcyan;
border: 2px solid #000000;
border-radius: 4px;
box-shadow: rgba(0, 0, 0, .1) 0 2px 4px 0;
box-sizing: border-box;
color: #fff;
font-size: 16px;
font-weight: 400;
padding: 10px 25px;
text-align: center;
}

button#expand-rollup:hover {
box-shadow: rgba(0, 0, 0, .15) 0 3px 9px 0;
transform: translateY(-2px);
}

button#synch {
background-color: red;
border: 2px solid #000000;
Expand Down Expand Up @@ -169,11 +150,8 @@ <h1>Homu queue - {% if repo_url %}<a href="{{repo_url}}" target="_blank">{{repo_

<p>
<button type="button" id="expand-rollup">Create a rollup</button>
<button type="button" id="synch">Synchronize</button>
</p>

<p style="color: #ff6347">Caution: Synchronization has some caveats. Please follow the steps described in <a href="https://forge.rust-lang.org/infra/docs/bors/queue-resync.html"><i>Fixing inconsistencies in the bors queue</i></a>.</p>

<div id="actual-rollup" class="hide">
<p>This will create a new pull request consisting of <span id="checkbox-count">0</span> PRs.</p>
<p>A rollup is useful for shortening the queue, but jumping the queue is unfair to older PRs who have waited too long.</p>
Expand Down Expand Up @@ -249,6 +227,11 @@ <h1>Homu queue - {% if repo_url %}<a href="{{repo_url}}" target="_blank">{{repo_

<p><a href="../retry_log/{{repo_label}}">Open retry log</a></p>

<p>
<button type="button" id="synch">Synchronize</button>
</p>
<p style="color: #ff6347">Caution: Synchronization has some caveats. Please follow the steps described in <a href="https://forge.rust-lang.org/infra/docs/bors/queue-resync.html"><i>Fixing inconsistencies in the bors queue</i></a>.</p>

<script src="../assets/jquery.min.js"></script>
<script src="../assets/jquery.dataTables.min.js"></script>

Expand Down