Skip to content

Commit

Permalink
Add explicit <hr>-tags and download page header
Browse files Browse the repository at this point in the history
  • Loading branch information
fredericmarx committed Mar 30, 2016
1 parent d5a9ba5 commit 7ca5d95
Show file tree
Hide file tree
Showing 6 changed files with 98 additions and 26 deletions.
17 changes: 16 additions & 1 deletion community.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ care about making the community a safe space for you.
[mod_team]: https://www.rust-lang.org/team.html#Moderation
[mod_team_email]: mailto:rust-mods@rust-lang.org

---

This comment has been minimized.

Copy link
@fredericmarx

fredericmarx Mar 30, 2016

Author Owner

Add explicit hr-tags


## Getting Started

The most important community resources for those new to Rust are:
Expand All @@ -37,6 +39,8 @@ You may also find help on the question and answer site, [Stack Overflow][stack_o

[stack_overflow]: https://stackoverflow.com/questions/tagged/rust

---

## News

[This Week in Rust][twir] collects the latest news, upcoming events
Expand All @@ -53,6 +57,8 @@ We also have a [Twitter][twitter] account.
[reddit_coc]: https://www.reddit.com/r/rust/comments/2rvrzx/our_code_of_conduct_please_read/
[twitter]: https://twitter.com/rustlang

---

## IRC Channels

Rustaceans maintain a number of friendly, high-traffic [IRC] channels on Mozilla's IRC network.
Expand Down Expand Up @@ -89,7 +95,7 @@ Rust's developers coordinate in [#rust-internals][internals_irc]. It is for real

[IRC]: https://en.wikipedia.org/wiki/Internet_Relay_Chat
[rust_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust
[rustc_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rustc
[rustc_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rustc
[libs_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-libs
[tools_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-tools
[lang_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-lang
Expand All @@ -106,6 +112,8 @@ Rust's developers coordinate in [#rust-internals][internals_irc]. It is for real
[beginners_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-beginners
[networking_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-networking

---

## Discussion Forums

We have two forums for asynchronous discussion:
Expand All @@ -120,6 +128,8 @@ We have two forums for asynchronous discussion:
[users_forum]: https://users.rust-lang.org/
[internals_forum]: https://internals.rust-lang.org/

---

## User Groups and Meetups

There are more than 50 [Rust User Groups][user_group] worldwide in over 20
Expand All @@ -134,6 +144,8 @@ Contact the [community team][community_team] to add your own.
[user_group]: ./user-groups.html
[calendar]: https://www.google.com/calendar/embed?src=apd9vmbc22egenmtu5l6c5jbfc@group.calendar.google.com

---

## The Rust Team

Rust has a community-driven development process where most decisions are made
Expand Down Expand Up @@ -180,7 +192,10 @@ help get you started.
[community_team]: https://www.rust-lang.org/team.html#Community
[mod_team]: https://www.rust-lang.org/team.html#Moderation

---

<a name="rust-development"></a>

## Rust Development

Rust has had over [1,200 different contributors][authors], a number that grows
Expand Down
6 changes: 5 additions & 1 deletion conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ title: The Rust Code of Conduct &middot; The Rust Programming Language

# The Rust Code of Conduct

---

## Conduct

**Contact**: [rust-mods@rust-lang.org](mailto:rust-mods@rust-lang.org)
Expand All @@ -18,6 +20,8 @@ title: The Rust Code of Conduct &middot; The Rust Programming Language
* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the [Rust moderation team](/team.html#Moderation) immediately. Whether you're a regular contributor or a newcomer, we care about making this community a safe place for you and we've got your back.
* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome.

---

## Moderation


Expand All @@ -38,4 +42,4 @@ And if someone takes issue with something you said or did, resist the urge to be

The enforcement policies listed above apply to all official Rust venues; including official IRC channels (#rust, #rust-internals, #rust-tools, #rust-libs, #rustc, #rust-beginners, #rust-docs, #rust-community, #rust-lang, and #cargo); GitHub repositories under rust-lang, rust-lang-nursery, and rust-lang-deprecated; and all forums under rust-lang.org (users.rust-lang.org, internals.rust-lang.org). For other projects adopting the Rust Code of Conduct, please contact the maintainers of those projects for enforcement. If you wish to use this code of conduct for your own project, consider explicitly mentioning your moderation policy or making a copy with your own moderation policy so as to avoid confusion.

*Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) as well as the [Contributor Covenant v1.3.0](http://contributor-covenant.org/version/1/3/0/).*
*Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) as well as the [Contributor Covenant v1.3.0](http://contributor-covenant.org/version/1/3/0/).*
40 changes: 19 additions & 21 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,6 @@ h3 {
font-weight: 500;
}

.side-header h2 {
font-weight: 500;
font-size: 18.5px;
line-height: 24px;
margin-top: 7px;
}

.side-header h3 {
font-size: 1em;
margin-top: 0px;
}

.side-header p {
color: #777;
}

This comment has been minimized.

Copy link
@fredericmarx

fredericmarx Mar 30, 2016

Author Owner

Move these styles down for latter application in the cascade

.table-features {
width: 100%;
margin-bottom: 18px;
Expand Down Expand Up @@ -201,7 +185,7 @@ p.pitch a {

hr {
margin-top: 2em;
margin-bottom: 3em;
margin-bottom: 1em;
border-top: 2px solid #dedede;
}

Expand Down Expand Up @@ -412,17 +396,31 @@ ul.laundry-list {
.content h2 {
font-size: 2em;
line-height: 1.5em;
margin: 3rem 0 1rem;
margin: 1rem 0;
font-weight: 400;
border-top: 2px solid #dedede;

This comment has been minimized.

Copy link
@fredericmarx

fredericmarx Mar 30, 2016

Author Owner

Remove vertical rule styles from h2

padding-top: 1rem;
}

.content h3 {
font-size: 1em;
line-height: 1.5em;
font-weight: 500;
margin: 2rem 0 .5rem;
margin: .5rem 0;
}

.side-header h2 {
font-weight: 500;
font-size: 18.5px;
line-height: 24px;
margin-top: 7px;
}

.side-header h3 {
font-size: 1em;
margin-top: 0px;
}

.side-header p {
color: #777;
}

@media screen and (min-width: 820px) {
Expand Down
10 changes: 10 additions & 0 deletions documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ show you how to install it, and explain its syntax and concepts. Upon
completing the book, you'll be an intermediate Rust developer, and
will have a good grasp of the fundamental ideas behind Rust.

---

## Learning Rust

[The Rust Programming Language][book]. Also known as "The Book",
Expand All @@ -37,6 +39,8 @@ for learning Rust.
[nomicon]: https://doc.rust-lang.org/nomicon/
[rust-learning]: https://github.com/ctjhoa/rust-learning

---

## References

[Standard Library API Reference][api]. Documentation for the
Expand All @@ -62,6 +66,8 @@ the errors produced by the Rust compiler.
[cargo]: http://doc.crates.io/guide.html
[err]: https://doc.rust-lang.org/error-index.html

---

## Project policies

[Rust security policy][security]. The project's policies for
Expand All @@ -75,6 +81,8 @@ trademarks are described here.
[security]: security.html
[legal]: legal.html

---

## Nightly and beta documentation

Much of the official Rust documentation is also available for the
Expand All @@ -84,6 +92,8 @@ linked above.
[nightly]: http://doc.rust-lang.org/nightly/
[beta]: http://doc.rust-lang.org/beta/

---

## Non-english resources

For resources in languages other than English, see the
Expand Down
10 changes: 7 additions & 3 deletions downloads.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
layout: basic
title: Downloads &middot; The Rust Programming Language
---
<div class="content">
<h1>Downloads</h1>

<hr>

<div class="row install">
<div class="col-md-4 side-header">
Expand Down Expand Up @@ -55,7 +59,7 @@ <h3>{{ site.stable_date }}</h3>

<hr/>

<div class="row">
<div class="row install">
<div class="col-md-4 side-header">
<h2 id="beta">Beta&nbsp; ({{ site.beta }})</h2>
<p>
Expand Down Expand Up @@ -104,7 +108,7 @@ <h2 id="beta">Beta&nbsp; ({{ site.beta }})</h2>

<hr/>

<div class="row">
<div class="row install">
<div class="col-md-4 side-header">
<h2 id="nightly">Nightly&nbsp; ({{ site.nightly }})</h2>
<p>
Expand Down Expand Up @@ -194,4 +198,4 @@ <h2 id="nightly">Nightly&nbsp; ({{ site.nightly }})</h2>
</p>
</div>
</div>

</div>
Loading

0 comments on commit 7ca5d95

Please sign in to comment.