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

Rollup of 5 pull requests #46574

Merged
merged 12 commits into from
Dec 8, 2017
Merged

Rollup of 5 pull requests #46574

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9e281cc
doc: macro `cfg!` evaluating at compile-time
liigo Dec 1, 2017
dddf183
Move colors to main.css
GuillaumeGomez Dec 2, 2017
77faf79
Do not automatically merge Cargo.lock
oli-obk Dec 6, 2017
9307917
Adds language to the documentation for `Option` and `Result` suggesting
Dec 7, 2017
5847d0b
adds links to methods, removes trailing whitespace
Dec 7, 2017
71b70fe
Greatly improve sidebar when width < 700px
GuillaumeGomez Dec 5, 2017
423e5ac
Fix JS errors
GuillaumeGomez Dec 7, 2017
912def3
Rollup merge of #46416 - liigo:cfg-macro, r=steveklabnik
GuillaumeGomez Dec 7, 2017
14f2bc0
Rollup merge of #46444 - GuillaumeGomez:css-cleanup, r=QuietMisdreavus
GuillaumeGomez Dec 7, 2017
1b7ea6d
Rollup merge of #46526 - GuillaumeGomez:mobile-sidebar, r=QuietMisdre…
GuillaumeGomez Dec 7, 2017
655303c
Rollup merge of #46539 - oli-obk:cargo_lock, r=alexcrichton
GuillaumeGomez Dec 7, 2017
0b47f02
Rollup merge of #46548 - jonathanstrong:master, r=dtolnay
GuillaumeGomez Dec 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move colors to main.css
  • Loading branch information
@GuillaumeGomez
GuillaumeGomez committed Dec 2, 2017
commit dddf1833335ecdbec5f7e0f9a2362a8b3bdf3907
44 changes: 11 additions & 33 deletions src/librustdoc/html/static/rustdoc.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ nav.sub {
.sidebar .version {
font-size: 15px;
text-align: center;
border-bottom: #DDDDDD 1px solid;
border-bottom: 1px solid;
overflow-wrap: break-word;
word-wrap: break-word; /* deprecated */
word-break: break-word; /* Chrome, non-standard */
Expand Down Expand Up @@ -247,8 +247,8 @@ nav.sub {
}

.sidebar-title {
border-top: 1px solid #777;
border-bottom: 1px solid #777;
border-top: 1px solid;
border-bottom: 1px solid;
text-align: center;
font-size: 17px;
margin-bottom: 5px;
Expand Down Expand Up @@ -354,7 +354,6 @@ h4 > code, h3 > code, .invisible > code {
}

.invisible {
background: rgba(0, 0, 0, 0);
width: 100%;
display: inline-block;
}
Expand Down Expand Up @@ -434,7 +433,6 @@ h4 > code, h3 > code, .invisible > code {
.content .fn .where,
.content .where.fmt-newline {
display: block;
color: #4E4C4C;
font-size: 0.8em;
}

Expand Down Expand Up @@ -528,7 +526,6 @@ a {
}

.search-input:focus {
border-color: #66afe9;
border-radius: 2px;
border: 0;
outline: 0;
Expand All @@ -550,7 +547,8 @@ a {
.content .search-results td:first-child a { padding-right: 10px; }

tr.result span.primitive::after {
content: ' (primitive type)'; font-style: italic; color: black;
content: ' (primitive type)';
font-style: italic;
}

body.blur > :not(#help) {
Expand Down Expand Up @@ -687,7 +685,6 @@ a.test-arrow:hover{
font-weight: 300;
position: absolute;
left: -23px;
color: #999;
top: 0;
}

Expand Down Expand Up @@ -894,8 +891,6 @@ span.since {
.tooltip .tooltiptext {
width: 120px;
display: none;
background-color: black;
color: #fff;
text-align: center;
padding: 5px 3px;
border-radius: 6px;
Expand All @@ -917,13 +912,10 @@ span.since {
margin-top: -5px;
border-width: 5px;
border-style: solid;
border-color: transparent black transparent transparent;
}

.important-traits .tooltip .tooltiptext {
background-color: white;
color: black;
border: 1px solid #000;
border: 1px solid;
}

pre.rust {
Expand All @@ -943,22 +935,21 @@ pre.rust {
float: left;
width: 33.3%;
text-align: center;
border-bottom: 1px solid #ccc;
border-bottom: 1px solid;
font-size: 18px;
cursor: pointer;
}

#titles > div.selected {
border-bottom: 3px solid #0078ee;
border-bottom: 3px solid;
}

#titles > div:hover {
border-bottom: 3px solid #0089ff;
border-bottom: 3px solid;
}

#titles > div > div.count {
display: inline-block;
color: #888;
font-size: 16px;
}

Expand All @@ -977,7 +968,6 @@ h4 > .important-traits {
position: fixed;
width: 100vw;
height: 100vh;
background-color: rgba(0,0,0,0.3);
z-index: 10000;
top: 0;
left: 0;
Expand All @@ -987,13 +977,12 @@ h4 > .important-traits {
display: block;
max-width: 60%;
min-width: 200px;
background-color: #eee;
padding: 8px;
top: 40%;
position: absolute;
left: 50%;
transform: translate(-50%, -40%);
border: 1px solid #999;
border: 1px solid;
border-radius: 4px;
border-top-right-radius: 0;
}
Expand All @@ -1020,35 +1009,24 @@ h3.important {
right: -25px;
top: -1px;
font-size: 18px;
background-color: #eee;
width: 25px;
padding-right: 2px;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
text-align: center;
border: 1px solid #999;
border: 1px solid;
border-right: 0;
cursor: pointer;
}

.modal-content > .close:hover {
background-color: #ff1f1f;
color: white;
}

.modal-content > .whiter {
height: 25px;
position: absolute;
width: 3px;
background-color: #eee;
right: -2px;
top: 0px;
}

.modal-content > .close:hover + .whiter {
background-color: #ff1f1f;
}

#main > div.important-traits {
position: absolute;
left: -24px;
Expand Down
89 changes: 89 additions & 0 deletions src/librustdoc/html/static/styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ h2, h3:not(.impl):not(.method):not(.type):not(.tymethod), h4:not(.method):not(.t
background-color: white;
}

.invisible {
background: rgba(0, 0, 0, 0);
}

.docblock code, .docblock-short code {
background-color: #F5F5F5;
}
Expand All @@ -56,6 +60,15 @@ pre {
color: #333;
}

.sidebar .version {
border-bottom-color: #DDD;
}

.sidebar-title {
border-top-color: #777;
border-bottom-color: #777;
}

.block a:hover {
background: #F5F5F5;
}
Expand Down Expand Up @@ -89,6 +102,12 @@ pre {
background: #FDFFD3;
}

.content .method .where,
.content .fn .where,
.content .where.fmt-newline {
color: #4E4C4C;
}

.content .highlighted {
color: #000 !important;
background-color: #ccc;
Expand Down Expand Up @@ -152,12 +171,20 @@ a.test-arrow {
color: #f5f5f5;
}

.collapse-toggle {
color: #999;
}

.search-input {
color: #555;
box-shadow: 0 0 0 1px #e0e0e0, 0 0 0 2px transparent;
background-color: white;
}

.search-input:focus {
border-color: #66afe9;
}

.stab.unstable { background: #FFF5D6; border-color: #FFC600; }
.stab.deprecated { background: #F3DFFF; border-color: #7F0087; }
.stab.portability { background: #C4ECFF; border-color: #7BA5DB; }
Expand All @@ -176,6 +203,10 @@ a.test-arrow {
color: grey;
}

tr.result span.primitive::after {
color: black;
}

.line-numbers :target { background-color: transparent; }

/* Code highlighting */
Expand Down Expand Up @@ -241,3 +272,61 @@ pre.ignore:hover, .information:hover + pre.ignore {
.search-failed > a {
color: #0089ff;
}

.tooltip .tooltiptext {
background-color: black;
color: #fff;
}

.tooltip .tooltiptext::after {
border-color: transparent black transparent transparent;
}

.important-traits .tooltip .tooltiptext {
background-color: white;
color: black;
border-color: black;
}

#titles > div {
border-bottom-color: #ccc;
}

#titles > div.selected {
border-bottom-color: #0078ee;
}

#titles > div:hover {
border-bottom-color: #0089ff;
}

#titles > div > div.count {
color: #888;
}

.modal {
background-color: rgba(0,0,0,0.3);
}

.modal-content {
background-color: #eee;
border-color: #999;
}

.modal-content > .close {
background-color: #eee;
border-color: #999;
}

.modal-content > .close:hover {
background-color: #ff1f1f;
color: white;
}

.modal-content > .whiter {
background-color: #eee;
}

.modal-content > .close:hover + .whiter {
background-color: #ff1f1f;
}