Skip to content

Commit 55a00fe

Browse files
authored
Merge pull request #232 from jieyouxu/adjust-sync
Revert rollup button style change, and move sync button and its warning message to bottom of page
2 parents 595bef9 + 2dfa7d2 commit 55a00fe

File tree

1 file changed

+5
-22
lines changed

1 file changed

+5
-22
lines changed

homu/html/queue.html

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -122,25 +122,6 @@
122122
color: #00f;
123123
}
124124

125-
/* Make the rollup button vs sync button clear distinct, because sync requires some elaborate procedure. */
126-
button#expand-rollup {
127-
background-color: darkcyan;
128-
border: 2px solid #000000;
129-
border-radius: 4px;
130-
box-shadow: rgba(0, 0, 0, .1) 0 2px 4px 0;
131-
box-sizing: border-box;
132-
color: #fff;
133-
font-size: 16px;
134-
font-weight: 400;
135-
padding: 10px 25px;
136-
text-align: center;
137-
}
138-
139-
button#expand-rollup:hover {
140-
box-shadow: rgba(0, 0, 0, .15) 0 3px 9px 0;
141-
transform: translateY(-2px);
142-
}
143-
144125
button#synch {
145126
background-color: red;
146127
border: 2px solid #000000;
@@ -169,11 +150,8 @@ <h1>Homu queue - {% if repo_url %}<a href="{{repo_url}}" target="_blank">{{repo_
169150

170151
<p>
171152
<button type="button" id="expand-rollup">Create a rollup</button>
172-
<button type="button" id="synch">Synchronize</button>
173153
</p>
174154

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

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

230+
<p>
231+
<button type="button" id="synch">Synchronize</button>
232+
</p>
233+
<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>
234+
252235
<script src="../assets/jquery.min.js"></script>
253236
<script src="../assets/jquery.dataTables.min.js"></script>
254237

0 commit comments

Comments
 (0)