Skip to content

Deploy #1733

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

Merged
merged 15 commits into from
Oct 25, 2022
Merged

Deploy #1733

Show file tree
Hide file tree
Changes from all commits
Commits
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
1,522 changes: 726 additions & 796 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion RustConfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION=nightly-2021-04-15
VERSION=nightly-2022-10-21
3 changes: 2 additions & 1 deletion locales/en-US/learn.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ learn-rbe-button = Check out Rust by Example!
translated-rbe = {""}
translated-rbe-button = {""}

learn-use = Grow with Rust
learn-use = Documentation

learn-doc-heading = Read the core documentation
learn-doc = All of this documentation is also available locally using the <code>rustup doc</code> command, which will open up these resources for you in your browser without requiring a network connection!
Expand Down Expand Up @@ -119,6 +119,7 @@ learn-dependencies-steps = <p>Let’s add a dependency to our application. You c
<p>In this project, we’ll use a crate called <a href="https://crates.io/crates/ferris-says"><code>ferris-says</code></a>.
<p>In our <code>Cargo.toml</code> file we’ll add this information (that we got from the crate page):</p>
{ $cargotoml }
<p>We can also do this by running <code>cargo add [email protected]</code>.</p>
<p>Now we can run:</p>
<p><code>cargo build</code></p>
<p>...and Cargo will install our dependency for us.</p>
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2021-04-15
nightly-2022-10-21
5 changes: 0 additions & 5 deletions src/data/users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,6 @@
url: http://calyptech.com
logo: calyptech.png
how: "Used for high performance embedded system components as an alternative to C."
-
name: Cambridge Consultants
url: http://www.cambridgeconsultants.com/
logo: cambridge-consultants.png
how: "<a href='http://blog.cambridgeconsultants.com/wireless-product-development/presentation-mozillas-rust-and-why-we-love-it/'>We are writing and shipping Rust code on projects to our clients</a>."
-
name: Canonical
url: http://www.canonical.com
Expand Down
30 changes: 30 additions & 0 deletions src/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -624,3 +624,33 @@ blockquote::before {
/* Tachyons is missing this class */
max-height: 10rem;
}

.select {
display: inline-block;
position: relative;
}

.select select {
appearance: none;
-webkit-appearance: none;
-moz-appearance: none;
font-size: 1.25rem;
border: $gray 1px solid;
background-color: white;
padding: 2px 6px;
color: $gray;
box-sizing: border-box;
}

.select:after {
content: "";
position: absolute;
top: 50%;
right: 8px;
width: 0;
height: 0;
margin-top: -2px;
border-top: 5px solid $gray;
border-right: 5px solid transparent;
border-left: 5px solid transparent;
}
1 change: 1 addition & 0 deletions src/teams.rs
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ mod tests {
weight: 0,
}),
github: None,
discord: vec![],
}
}

Expand Down
4 changes: 3 additions & 1 deletion templates/components/footer.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
<li><a href="https://users.rust-lang.org">{{fluent "footer-ask"}}</a></li>
</ul>
<div class="languages">
<div class="select">
<label for="language-footer" class="hidden">{{fluent "choose-language"}}</label>
<select id="language-footer">
{{> components/languages-dropdown}}
{{> components/languages-dropdown}}
</select>
</div>
</div>
</div>
<div class="flex flex-column mw8 w-100 measure-wide-l pv2 pv5-m pv2-ns ph4-m ph4-l">
Expand Down
10 changes: 6 additions & 4 deletions templates/components/nav.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@
</ul>

<div class=" w-100 w-auto-l flex-none flex justify-center pv4 pv-0-l languages">
<label for="language-nav" class="hidden">{{fluent "choose-language"}}</label>
<select id="language-nav" data-current-lang="{{lang}}">
{{> components/languages-dropdown}}
</select>
<div class="select">
<label for="language-nav" class="hidden">{{fluent "choose-language"}}</label>
<select id="language-nav" data-current-lang="{{lang}}">
{{> components/languages-dropdown}}
</select>
</div>
</div>

</nav>
6 changes: 3 additions & 3 deletions templates/learn/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="highlight"></div>
</header>
<section class="flex flex-column flex-row-l pv0-l">
<div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb6-ns ph4-l">
<div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb0-ns ph4-l">
<div class="v-top pl4 pl0-l pt3-l measure-wide-l flex-l flex-column-l flex-auto-l">
<p class="flex-grow-1">{{fluent "learn-book"}}</p>
<div class="buttons">
Expand All @@ -22,15 +22,15 @@
</div>
</div>
</div>
<div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb6-ns ph4-l">
<div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb0-ns ph4-l">
<div class="v-top pl4 pl0-l pt3-l measure-wide-l flex-l flex-column-l flex-auto-l">
<p class="flex-grow-1">{{fluent "learn-rustlings"}}</p>
<div class="buttons">
<a class="button button-secondary" href="https://github.com/rust-lang/rustlings/">{{fluent "learn-rustlings-button"}}</a>
</div>
</div>
</div>
<div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb6-ns ph4-l">
<div class="flex flex-row flex-column-l justify-between-l mw8 measure-wide-l pb4 pb5-m pb0-ns ph4-l">
<div class="v-top pl4 pl0-l pt3-l measure-wide-l flex-l flex-column-l flex-auto-l">
<p class="flex-grow-1">{{fluent "learn-rbe"}}</p>
<div class="buttons">
Expand Down