Skip to content

Commit 2e2915f

Browse files
committed
queue: make the rollup/sync buttons more distinct, and point to sync docs
Currently, it's not obvious that "synchronize" is a dangerous operation, and there's no indication for the contributors how to properly perform a sync. Make this more clear by making the buttons larger and color-coded, and include a backlink to sync procedure.
1 parent d9ed287 commit 2e2915f

File tree

1 file changed

+39
-0
lines changed

1 file changed

+39
-0
lines changed

homu/html/queue.html

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,43 @@
121121
#announcement a:visited {
122122
color: #00f;
123123
}
124+
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+
144+
button#synch {
145+
background-color: red;
146+
border: 2px solid #000000;
147+
border-radius: 4px;
148+
box-shadow: rgba(0, 0, 0, .1) 0 2px 4px 0;
149+
box-sizing: border-box;
150+
color: #fff;
151+
font-size: 16px;
152+
font-weight: 400;
153+
padding: 10px 25px;
154+
text-align: center;
155+
}
156+
157+
button#synch:hover {
158+
box-shadow: rgba(0, 0, 0, .15) 0 3px 9px 0;
159+
transform: translateY(-2px);
160+
}
124161
</style>
125162
</head>
126163
<body>
@@ -135,6 +172,8 @@ <h1>Homu queue - {% if repo_url %}<a href="{{repo_url}}" target="_blank">{{repo_
135172
<button type="button" id="synch">Synchronize</button>
136173
</p>
137174

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+
138177
<div id="actual-rollup" class="hide">
139178
<p>This will create a new pull request consisting of <span id="checkbox-count">0</span> PRs.</p>
140179
<p>A rollup is useful for shortening the queue, but jumping the queue is unfair to older PRs who have waited too long.</p>

0 commit comments

Comments
 (0)