-
Additional installation options.
+
-
- Need help?
Ask on #rust-beginners.
+
+ Need help? Ask on #rust-beginners.
- rustup is an official Rust project.
- Read more about it.
+ 
+ rustup is an official Rust project.
+
+ other installation options
+ ·
+ about rustup
diff --git a/www/rustup.css b/www/rustup.css
index 97c625e0d00..5d6c2f5e3a2 100644
--- a/www/rustup.css
+++ b/www/rustup.css
@@ -1,98 +1,120 @@
-@import url(https://fonts.googleapis.com/css?family=Cutive+Mono:400);
+@import url(https://fonts.googleapis.com/css?family=Fira+Sans:300);
+@import url(https://fonts.googleapis.com/css?family=Fira+Sans:400);
+@import url(https://fonts.googleapis.com/css?family=Fira+Sans:500);
+@import url(https://fonts.googleapis.com/css?family=Work+Sans:500);
@import url(https://fonts.googleapis.com/css?family=Work+Sans:700);
-@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:500);
+@import url(https://fonts.googleapis.com/css?family=Inconsolata:400);
body {
- margin-top: 3em;
- background-color: #343838;
- color: white;
- font-family: "Cutive Mono", monospace;
- font-weight: 400;
- font-size: 20pt;
+ margin-top: 2em;
+ background-color: white;
+ color: #515151;
+ font-family: "Fira Sans","Helvetica Neue",Helvetica,Arial,sans-serif;
+ font-weight: 300;
+ font-size: 25px;
}
pre {
- font-family: "Source Code Pro", monospace;
- font-weight: 500;
-}
-
-body#idx p {
- text-shadow: 2px 2px #242828;
+ font-family: Inconsolata,Menlo,Monaco,Consolas,"Courier New",monospace;
+ font-weight: 400;
}
body#idx #pitch > a {
- margin-top: 0.3em;
- margin-bottom: 0.3em;
- display: block;
- font-family: "Work Sans", monospace;
- font-variant: small-caps;
- font-size: 300%;
- font-weight: 700;
- text-shadow: 4px 3px #242828;
- text-transform: lowercase;
- letter-spacing: 0.2em;
+ font-weight: 500;
+ line-height: 2em;
}
a {
- color: #70EFFC;
+ color: #428bca;
text-decoration: none;
}
-body#idx a {
- text-shadow: 2px 2px #242828;
+a:hover {
+ color: rgb(42, 100, 150);
}
body#idx > * {
margin-left: auto;
margin-right: auto;
text-align: center;
- width: 25em;;
+ width: 25em;
}
body#idx > #pitch {
width: 30em;
}
+#pitch em {
+ font-style: normal;
+ font-weight: 400;
+}
+
body#idx p {
margin-top: 2em;
margin-bottom: 2em;
}
-body#idx > #platform-instructions-unix {
+.instructions {
+ background-color: rgb(250, 250, 250);
margin-left: auto;
margin-right: auto;
- padding-bottom: 1em;
width: 30em;
+ text-align: center;
+ border-radius: 3px;
+ border: 1px solid rgb(204, 204, 204);
+ box-shadow: 0px 1px 4px 0px rgb(204, 204, 204);
}
-#platform-instructions-unix > * {
+.instructions > * {
+ width: 22em;
margin-left: auto;
margin-right: auto;
- width: 25em;;
}
-#platform-instructions-unix > pre {
+hr {
+ margin-top: 2em;
+ margin-bottom: 2em;
+}
+
+#platform-instructions-unix > pre,
+#platform-instructions-default > div > pre {
+ background-color: #515151;
+ color: white;
margin-left: auto;
margin-right: auto;
padding-top: 1em;
padding-bottom: 1em;
- width: 30em;
- background-color: #D0FFFF;
- color: #002F3B;
text-align: center;
border-radius: 3px;
- box-shadow: inset 0px 0px 10px 0px #70EFFC;
+ box-shadow: inset 0px 0px 20px 0px #333333;
}
-#platform-instructions-win a {
+#platform-instructions-win a,
+#platform-instructions-default a {
display: block;
padding-top: 0.4em;
padding-bottom: 0.6em;
- font-family: "Source Code Pro", monospace;
+ font-family: "Work Sans", "Fira Sans","Helvetica Neue",Helvetica,Arial,sans-serif;
+ font-weight: 500;
+ letter-spacing: 0.1em;
+}
+
+#about {
+ font-size: 16px;
+ line-height: 2em;
}
-#warning {
- color: red;
- font-family: "Work Sans", monospace;
+#about > img {
+ width: 30px;
+ height: 30px;
+ transform: translateY(11px);
}
+#platform-button {
+ background-color: #515151;
+ color: white;
+ width: 10em;
+ margin-left: auto;
+ margin-right: auto;
+ padding: 1em;
+}
diff --git a/www/rustup.js b/www/rustup.js
index 557a83bf29b..548890b0253 100644
--- a/www/rustup.js
+++ b/www/rustup.js
@@ -1,5 +1,12 @@
+var platform_override = null;
+
function detect_platform() {
"use strict";
+
+ if (platform_override) {
+ return platform_override;
+ }
+
var os = "unknown";
if (navigator.platform == "Linux x86_64") {os = "unix";}
@@ -25,23 +32,76 @@ function detect_platform() {
return os;
}
-(function () {
+function adjust_for_platform() {
"use strict";
+
var platform = detect_platform();
var unix_div = document.getElementById("platform-instructions-unix");
var win_div = document.getElementById("platform-instructions-win");
var android_div = document.getElementById("platform-instructions-android");
var unknown_div = document.getElementById("platform-instructions-unknown");
+ var default_div = document.getElementById("platform-instructions-default");
+
+ unix_div.style.display = "none";
+ win_div.style.display = "none";
+ android_div.style.display = "none";
+ unknown_div.style.display = "none";
+ default_div.style.display = "none";
if (platform == "unix") {
unix_div.style.display = "block";
- unknown_div.style.display = "none";
} else if (platform == "win") {
win_div.style.display = "block";
- unknown_div.style.display = "none";
} else if (platform == "android") {
android_div.style.display = "block";
- unknown_div.style.display = "none";
+ } else if (platform == "unknown") {
+ unknown_div.style.display = "block";
+ } else {
+ default_div.style.display = "block";
+ }
+}
+
+function cycle_platform() {
+ if (platform_override == null) {
+ platform_override = "default";
+ } else if (platform_override == "default") {
+ platform_override = "unknown";
+ } else if (platform_override == "unknown") {
+ platform_override = "win";
+ } else if (platform_override == "win") {
+ platform_override = "unix";
+ } else if (platform_override == "unix") {
+ platform_override = "android";
+ } else if (platform_override == "android") {
+ platform_override = "default";
}
+ adjust_for_platform();
+}
+
+function set_up_cycle_button() {
+ var cycle_button = document.getElementById("platform-button");
+ cycle_button.onclick = cycle_platform;
+
+ var key="test";
+ var idx=0;
+
+ document.onkeypress = function(event) {
+ if (event.key == key[idx]) {
+ idx += 1;
+
+ if (idx == key.length) {
+ cycle_button.style.display = "block";
+ }
+ } else if (event.key == key[0]) {
+ idx = 1;
+ } else {
+ idx = 0;
+ }
+ };
+}
+
+(function () {
+ adjust_for_platform();
+ set_up_cycle_button();
}());