Merge pull request #833 from skade/remove-skeleton-css

Remove skeleton

Author: skade

CONTRIBUTING.md

@@ -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
 

src/main.rs

@@ -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 {

src/styles/app.scss

@@ -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;
@@ -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;
 }

static/styles/skeleton.css

@@ -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">
@@ -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">
@@ -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">