Skip to content
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

Jump to bottom

Fix blink when main theme is selected #48831

Merged
merged 1 commit into from
Mar 14, 2018
Merged

Fix blink when main theme is selected #48831

merged 1 commit into from
Mar 14, 2018

Conversation

GuillaumeGomez
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 7, 2018
@bors
Copy link
Contributor

bors commented Mar 8, 2018

☔ The latest upstream changes (presumably #48806) made this pull request unmergeable. Please resolve the merge conflicts.

@QuietMisdreavus
Copy link
Member

So, i tried this by loading it on my server, and it doesn't have the blink affect i get on the current nightly docs. However, neither does the commit without it. >_> So i can't be sure it works until it makes it to doc.rlo. It's a useful change, though, so once you fix the merge conflict i can r+.

@pietroalbini pietroalbini added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 12, 2018
@GuillaumeGomez
Copy link
Member Author

Updated.

@QuietMisdreavus
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 12, 2018

📌 Commit 366ee85 has been approved by QuietMisdreavus

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 12, 2018
@kennytm kennytm mentioned this pull request Mar 14, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Mar 14, 2018
@kennytm
Rollup merge of rust-lang#48831 - GuillaumeGomez:fix-theme-blink, r=Q…
c65ee94 
…uietMisdreavus

Fix blink when main theme is selected

r? @QuietMisdreavus
bors added a commit that referenced this pull request Mar 14, 2018
@bors
Auto merge of #49008 - kennytm:rollup, r=kennytm
521d91c 
Rollup of 12 pull requests

- Successful merges: #48765, #48831, #48840, #48964, #48970, #48971, #48981, #48988, #48991, #48966, #48993, #48874
- Failed merges:
@bors bors merged commit 366ee85 into rust-lang:master Mar 14, 2018
@GuillaumeGomez GuillaumeGomez deleted the fix-theme-blink branch March 15, 2018 10:34
@pravic pravic mentioned this pull request Apr 5, 2018
Closed
@steveklabnik steveklabnik added beta-nominated Nominated for backporting to the compiler in the beta channel. I-nominated A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools labels Apr 5, 2018
@steveklabnik
Copy link
Member

Nominating for a beta backport at the next docs team meeting.

@steveklabnik
Copy link
Member

docs team says 👍 to backport

@steveklabnik steveklabnik added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed I-nominated beta-nominated Nominated for backporting to the compiler in the beta channel. labels Apr 10, 2018
@steveklabnik steveklabnik mentioned this pull request Apr 10, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@QuietMisdreavus QuietMisdreavus

Labels
A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@GuillaumeGomez @bors @QuietMisdreavus @steveklabnik @pietroalbini @rust-highfive