Skip to content

Remove skeleton #833

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.

Sign up for GitHub

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 4 commits into from
Jul 30, 2019
Merged

Remove skeleton #833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c6aec7
Remove skeleton
skade May 29, 2019
436c201
Remove button-secondary--no-skeleton
skade Jul 29, 2019
e443711
Remove mention of skeleton from CONTRIBUTING
skade Jul 30, 2019
657db0a
Remove a last skeleton style
skade Jul 30, 2019
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
12 changes: 1 addition & 11 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,9 @@ feels about it. For the moment, large design changes are made exclusively by the
team (listed above). If you have concerns or thoughts for small changes, please
file an issue so that we can discuss it first!

### Design

The site currently uses two frameworks: [Tachyons] and [Skeleton].

The team is currently in the process of transitioning from Skeleton to Tachyons.
This is a somewhat complicated transition, so if you would like to update CSS,
please file an issue.

[@yoshuawuyts] and [@chriskrycho] are the current developers on this transition.
Please direct issues and questions to them!
The site currently uses [Tachyons].

[Tachyons]: http://tachyons.io/
[Skeleton]: http://getskeleton.com/

### Content

Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ lazy_static! {
static ref ASSETS: AssetFiles = {
let app_css_file = compile_sass("app");
let fonts_css_file = compile_sass("fonts");
let vendor_css_file = concat_vendor_css(vec!["skeleton", "tachyons"]);
let vendor_css_file = concat_vendor_css(vec!["tachyons"]);
let app_js_file = concat_app_js(vec!["tools-install"]);

AssetFiles {
Expand Down
9 changes: 0 additions & 9 deletions src/styles/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,6 @@ p {
font-size: 0.8em;
}

.button.button-secondary--no-skeleton {
margin-bottom: 0;
}

code.code-header {
background-color: rgba(127, 127, 127, 0.25);
font-size: 2rem;
Expand Down Expand Up @@ -212,11 +208,6 @@ section .container {
padding-top: 20px;
}

// TODO: remove when switching to Tachyons -- these are overrides for Skeleton.
ul.nav, ul.nav li {
margin-bottom: 0;
}

.nav a {
color: $gray;
}
Expand Down
1 change: 0 additions & 1 deletion static/styles/skeleton.css
View file
Open in desktop

This file was deleted.

24 changes: 11 additions & 13 deletions templates/learn/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,69 +43,67 @@
</h2>
<div class="highlight"></div>
</header>
<div class="row black">
<div>
<h3>{{text learn-doc-heading}}</h3>
<p>{{text learn-doc}}</p>

{{!-- TODO: Remove button-secondary--no-skeleton once Skeleton is completely removed. --}}

<section class="flex flex-column">
<div class="pt3 flex flex-column flex-row-l items-center-l mb4-l">
<a href="https://doc.rust-lang.org/std/index.html"
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">{{text learn-doc-std-button}}</a>
class="button button-secondary mw6-l w-100">{{text learn-doc-std-button}}</a>
<p class="pl4-l ma0-l mt1 mb3">
{{text learn-doc-std}}
</p>
</div>

<div class="pt4 pt3-l flex flex-column flex-row-l items-center-l mb4-l">
<a href="https://doc.rust-lang.org/edition-guide/index.html"
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">{{text learn-doc-edition-button}}</a>
class="button button-secondary mw6-l w-100">{{text learn-doc-edition-button}}</a>
<p class="pl4-l ma0-l mt1 mb3">
{{text learn-doc-edition}}
</p>
</div>

<div class="pt4 pt3-l flex flex-column flex-row-l items-center-l mb4-l">
<a href="https://doc.rust-lang.org/cargo/index.html"
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">{{text learn-doc-cargo-button}}</a>
class="button button-secondary mw6-l w-100">{{text learn-doc-cargo-button}}</a>
<p class="pl4-l ma0-l mt1 mb3">
{{text learn-doc-cargo}}
</p>
</div>

<div class="pt4 pt3-l flex flex-column flex-row-l items-center-l mb4-l">
<a href="https://doc.rust-lang.org/rustdoc/index.html"
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">{{text learn-doc-rustdoc-button}}</a>
class="button button-secondary mw6-l w-100">{{text learn-doc-rustdoc-button}}</a>
<p class="pl4-l ma0-l mt1 mb3">
{{text learn-doc-rustdoc}}
</p>
</div>

<div class="pt4 pt3-l flex flex-column flex-row-l items-center-l mb4-l">
<a href="https://doc.rust-lang.org/rustc/index.html"
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">{{text learn-doc-rustc-button}}</a>
class="button button-secondary mw6-l w-100">{{text learn-doc-rustc-button}}</a>
<p class="pl4-l ma0-l mt1 mb3">
{{text learn-doc-rustc}}
</p>
</div>

<div class="pt4 pt3-l flex flex-column flex-row-l items-center-l mb4-l">
<a href="https://doc.rust-lang.org/error-index.html"
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">{{text learn-doc-error-button}}</a>
class="button button-secondary mw6-l w-100">{{text learn-doc-error-button}}</a>
<p class="pl4-l mb0 mt1 ma0-l">
{{text learn-doc-error}}
</p>
</div>
</section>
</div>
<hr/>
<div class="row black">
<div>
<h3>{{text learn-domain}}</h3>
<section class="flex flex-column">
<div class="pt3 flex flex-column flex-row-l items-center-l mb4-l">
<a href="https://rust-lang-nursery.github.io/cli-wg/"
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">
class="button button-secondary mw6-l w-100">
{{text learn-domain-cli-button}}
</a>
<p class="pl4-l ma0-l mt1 mb3">
Expand All @@ -115,7 +113,7 @@

<div class="pt4 pt3-l flex flex-column flex-row-l items-center-l mb4-l">
<a href="https://rustwasm.github.io/docs/book/"
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">
class="button button-secondary mw6-l w-100">
{{text learn-domain-wasm-button}}
</a>
<p class="pl4-l ma0-l mt1 mb3">
Expand All @@ -125,7 +123,7 @@

<div class="pt4 pt3-l flex flex-column flex-row-l items-center-l mb4-l">
<a href="https://rust-embedded.github.io/book/"
class="button button-secondary button-secondary--no-skeleton mw6-l w-100">
class="button button-secondary mw6-l w-100">
{{text learn-domain-embedded-button}}
</a>
<p class="pl4-l mb0 mt1 ma0-l">
Expand Down