squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Few fixes for multiple themes support feature

Browse source
This commit is contained in:
Guillaume Gomez 2018-01-23 22:10:16 +01:00
parent 3a39b2aa5a
commit e78f1392b7
5 changed files with 48 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/librustdoc/html/layout.rs
View file

@ -74,10 +74,12 @@ r##"<!DOCTYPE html>
{sidebar}
</nav>
<button id="theme-picker">
<img src="{root_path}brush.svg" width="18" alt="Pick another theme!">
<div class="theme-picker">
<button id="theme-picker" aria-label="Pick another theme!">
<img src="{root_path}brush.svg" width="18" alt="Pick another theme!">
</button>
<div id="theme-choices"></div>
</button>
</div>
<script src="{root_path}theme.js"></script>
<nav class="sub">
<form class="search-form js-only">

8
src/librustdoc/html/render.rs
View file

@ -918,12 +918,12 @@ themePicker.onclick = function() {{
}}
}};
[{}].forEach(function(item) {{
var div = document.createElement('div');
div.innerHTML = item;
div.onclick = function(el) {{
var but = document.createElement('button');
but.innerHTML = item;
but.onclick = function(el) {{
switchTheme(currentTheme, mainTheme, item);
}};
themes.appendChild(div);
themes.appendChild(but);
}});
"#, themes.iter()
.map(|s| format!("\"{}\"", s))

29
src/librustdoc/html/static/rustdoc.css
View file

@ -1141,13 +1141,19 @@ kbd {
border: solid 1px;
border-radius: 3px;
box-shadow: inset 0 -1px 0;
cursor: default;
}
.theme-picker {
position: absolute;
left: 211px;
top: 19px;
}
#theme-picker {
position: absolute;
left: 211px;
top: 17px;
padding: 4px;
width: 27px;
height: 29px;
border: 1px solid;
border-radius: 3px;
cursor: pointer;
@ -1156,21 +1162,28 @@ kbd {
#theme-choices {
display: none;
position: absolute;
left: -1px;
top: 30px;
left: 0;
top: 28px;
border: 1px solid;
border-radius: 3px;
z-index: 1;
cursor: pointer;
}
#theme-choices > div {
border-top: 1px solid;
#theme-choices > button {
border: none;
width: 100%;
padding: 4px;
text-align: center;
background: rgba(0,0,0,0);
}
#theme-choices > button:not(:first-child) {
border-top: 1px solid;
}
@media (max-width: 700px) {
#theme-picker {
.theme-picker {
left: 109px;
top: 7px;
z-index: 1;

14
src/librustdoc/html/static/themes/dark.css
View file

@ -197,7 +197,7 @@ a.test-arrow {
#help dt {
border-color: #bfbfbf;
background: #fff;
background: rgba(0,0,0,0);
color: black;
}
@ -352,7 +352,7 @@ pre.ignore:hover, .information:hover + pre.ignore {
}
kbd {
color: #444d56;
color: #000;
background-color: #fafbfc;
border-color: #d1d5da;
border-bottom-color: #c6cbd1;
@ -364,16 +364,20 @@ kbd {
background: #f0f0f0;
}
#theme-picker:hover, #theme-picker:focus {
border-color: #ffb900;
}
#theme-choices {
border-color: #e0e0e0;
background-color: #353535;
}
#theme-choices > div {
border-top: #e0e0e0;
#theme-choices > button:not(:first-child) {
border-top-color: #e0e0e0;
}
#theme-choices > div:hover {
#theme-choices > button:hover, #theme-choices > button:focus {
background-color: #444;
}

13
src/librustdoc/html/static/themes/main.css
View file

@ -345,7 +345,7 @@ pre.ignore:hover, .information:hover + pre.ignore {
}
kbd {
color: #444d56;
color: #000;
background-color: #fafbfc;
border-color: #d1d5da;
border-bottom-color: #c6cbd1;
@ -354,6 +354,11 @@ kbd {
#theme-picker {
border-color: #e0e0e0;
background-color: #fff;
}
#theme-picker:hover, #theme-picker:focus {
border-color: #717171;
}
#theme-choices {
@ -361,11 +366,11 @@ kbd {
background-color: #fff;
}
#theme-choices > div {
border-top: #e0e0e0;
#theme-choices > button:not(:first-child) {
border-top-color: #e0e0e0;
}
#theme-choices > div:hover {
#theme-choices > button:hover, #theme-choices > button:focus {
background-color: #eee;
}