Skip to content

Fix blink when main theme is selected - #48831

Merged
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:fix-theme-blink
Mar 14, 2018
Merged

Fix blink when main theme is selected#48831
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:fix-theme-blink

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Mar 7, 2018

Copy link
Copy Markdown
Member

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

bors commented Mar 8, 2018

Copy link
Copy Markdown
Collaborator

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

@QuietMisdreavus

QuietMisdreavus commented Mar 8, 2018

Copy link
Copy Markdown
Contributor

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+.

@emilyalbiniemilyalbini 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

GuillaumeGomez commented Mar 12, 2018

Copy link
Copy Markdown
MemberAuthor

Updated.

@QuietMisdreavus

QuietMisdreavus commented Mar 12, 2018

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Mar 12, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 366ee85 has been approved by QuietMisdreavus

@borsbors 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
@kennytmkennytm 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 ofrust-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:masterMar 14, 2018
@GuillaumeGomez
GuillaumeGomez deleted the fix-theme-blink branch March 15, 2018 10:34
@pravicpravic mentioned this pull request Apr 5, 2018
Closed
@steveklabniksteveklabnik 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

steveklabnik commented Apr 5, 2018

Copy link
Copy Markdown
Contributor

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

@steveklabnik

steveklabnik commented Apr 10, 2018

Copy link
Copy Markdown
Contributor

docs team says 👍 to backport

@steveklabniksteveklabnik 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
@steveklabniksteveklabnik mentioned this pull request Apr 10, 2018
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@QuietMisdreavusQuietMisdreavus

Labels

A-docsArea: Documentation for any part of the project, including the compiler, standard library, and toolsbeta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: 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@emilyalbini@rust-highfive