Move colors to main.css

diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index 7efe7e1ae3eb30792f5a56fcfcae10b3bafd4ffc..d2b7bfd9625701c5a37b7ff6d10da1cc6037ec60 100644 (file)
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -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 */
@@ -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;
@@ -354,7 +354,6 @@ h4 > code, h3 > code, .invisible > code {
 }
 
 .invisible {
-       background: rgba(0, 0, 0, 0);
        width: 100%;
        display: inline-block;
 }
@@ -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;
 }
 
@@ -528,7 +526,6 @@ a {
 }
 
 .search-input:focus {
-       border-color: #66afe9;
        border-radius: 2px;
        border: 0;
        outline: 0;
@@ -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) {
@@ -687,7 +685,6 @@ a.test-arrow:hover{
        font-weight: 300;
        position: absolute;
        left: -23px;
-       color: #999;
        top: 0;
 }
 
@@ -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;
@@ -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 {
@@ -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;
 }
 
@@ -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;
@@ -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;
 }
@@ -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;

diff --git a/src/librustdoc/html/static/styles/main.css b/src/librustdoc/html/static/styles/main.css
index cb19034bf0612d19952e8932df5a73fdfc91791f..5cace837a5557eab7ca296c728a8a86a28ecd3c3 100644 (file)
--- a/src/librustdoc/html/static/styles/main.css
+++ b/src/librustdoc/html/static/styles/main.css
@@ -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;
 }
@@ -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;
 }
@@ -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;
@@ -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; }
@@ -176,6 +203,10 @@ a.test-arrow {
        color: grey;
 }
 
+tr.result span.primitive::after {
+       color: black;
+}
+
 .line-numbers :target { background-color: transparent; }
 
 /* Code highlighting */
@@ -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;
+}