-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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.
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
Improve the style of the sidebar in rustdoc output #40265
Conversation
(rust_highfive has picked a reviewer for you, use r? to override) |
@bors: r+ rollup thanks! |
📌 Commit 5bc2687 has been approved by |
🔒 Merge conflict |
5bc2687
to
7509f4f
Compare
@steveklabnik rebased |
As far as I can tell, the build orchestration tool (powering bors) is currently broken, which is causing everything to be incorrectly errored as a merge conflict. We'll need to wait for that to get fixed before approving it again. |
Thanks! I was a little confused why my local repo didn't report a merge
conflict.
…On Sat, Mar 4, 2017, 11:20 PM Corey Farwell ***@***.***> wrote:
As far as I can tell, the build orchestration tool (powering bors) is
currently broken, which is causing everything to be incorrectly errored as
a merge conflict. We'll need to wait for that to get fixed before approving
it again.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#40265 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAyu2LlKvHJRE0C0ZockUxaXwp9YsLg7ks5rijgdgaJpZM4MTLZI>
.
|
@@ -163,11 +163,17 @@ nav.sub { | |||
} | |||
|
|||
.sidebar { | |||
background-color: #F1F1F1; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
color changes shouldn't be in this file but in src/librustdoc/html/static/styles/main.css
.
} | ||
|
||
.sidebar .current { | ||
background-color: white; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same for this one.
@@ -185,11 +191,16 @@ nav.sub { | |||
} | |||
|
|||
.sidebar .location { | |||
border: black 1px solid; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same for this one.
@@ -38,7 +38,7 @@ pre { | |||
} | |||
|
|||
.sidebar .location { | |||
background: #e1e1e1; | |||
background-color: #fff; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good!
7509f4f
to
6ae283a
Compare
@GuillaumeGomez Fixed |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just one last change and it's good!
@@ -185,11 +189,17 @@ nav.sub { | |||
} | |||
|
|||
.sidebar .location { | |||
border-width: 1px; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could be just:
border: 1px solid;
Instead of:
border-width: 1px;
border-style: solid;
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! I didn't even know you could do that.
Makes the sidebar a light grey and highlights the currently viewed item in the sidebar more prominently. All visual design credit goes to @johnwhelchel (rust-lang#37856)
6ae283a
to
2bb2a29
Compare
@GuillaumeGomez Fixed |
Thanks! @bors: r+ rollup |
📌 Commit 2bb2a29 has been approved by |
…umeGomez Improve the style of the sidebar in rustdoc output Makes the sidebar a light grey and highlights the currently viewed item in the sidebar more prominently. All visual design credit goes to @johnwhelchel (rust-lang#37856) Sample screenshots: ![screen shot 2017-03-04 at 12 29 48 pm](https://cloud.githubusercontent.com/assets/831192/23580829/db6c26c2-00d6-11e7-8d89-822e25ba79f0.png) ![screen shot 2017-03-04 at 12 30 10 pm](https://cloud.githubusercontent.com/assets/831192/23580828/db69eeca-00d6-11e7-9f89-1e06fd3bf098.png) ![screen shot 2017-03-04 at 12 30 31 pm](https://cloud.githubusercontent.com/assets/831192/23580830/db6d00ce-00d6-11e7-89ca-cd03e148a121.png)
…umeGomez Improve the style of the sidebar in rustdoc output Makes the sidebar a light grey and highlights the currently viewed item in the sidebar more prominently. All visual design credit goes to @johnwhelchel (rust-lang#37856) Sample screenshots: ![screen shot 2017-03-04 at 12 29 48 pm](https://cloud.githubusercontent.com/assets/831192/23580829/db6c26c2-00d6-11e7-8d89-822e25ba79f0.png) ![screen shot 2017-03-04 at 12 30 10 pm](https://cloud.githubusercontent.com/assets/831192/23580828/db69eeca-00d6-11e7-9f89-1e06fd3bf098.png) ![screen shot 2017-03-04 at 12 30 31 pm](https://cloud.githubusercontent.com/assets/831192/23580830/db6d00ce-00d6-11e7-89ca-cd03e148a121.png)
…umeGomez Improve the style of the sidebar in rustdoc output Makes the sidebar a light grey and highlights the currently viewed item in the sidebar more prominently. All visual design credit goes to @johnwhelchel (rust-lang#37856) Sample screenshots: ![screen shot 2017-03-04 at 12 29 48 pm](https://cloud.githubusercontent.com/assets/831192/23580829/db6c26c2-00d6-11e7-8d89-822e25ba79f0.png) ![screen shot 2017-03-04 at 12 30 10 pm](https://cloud.githubusercontent.com/assets/831192/23580828/db69eeca-00d6-11e7-9f89-1e06fd3bf098.png) ![screen shot 2017-03-04 at 12 30 31 pm](https://cloud.githubusercontent.com/assets/831192/23580830/db6d00ce-00d6-11e7-89ca-cd03e148a121.png)
Makes the sidebar a light grey and highlights the currently viewed item in the sidebar more prominently.
All visual design credit goes to @johnwhelchel (#37856)
Sample screenshots: