diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f7256ff34..07236aea2 100644 --- a/CONTRIBUTING.md +++ b/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 diff --git a/src/main.rs b/src/main.rs index 5e9f9b4f1..df1c659ae 100644 --- a/src/main.rs +++ b/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 { diff --git a/src/styles/app.scss b/src/styles/app.scss index 8a66630a7..9cf8b042e 100644 --- a/src/styles/app.scss +++ b/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; } diff --git a/static/styles/skeleton.css b/static/styles/skeleton.css deleted file mode 100644 index 3587ff116..000000000 --- a/static/styles/skeleton.css +++ /dev/null @@ -1 +0,0 @@ -.column,.columns,.container{width:100%;box-sizing:border-box}h1,h2,h3{letter-spacing:-.1rem}body,h6{line-height:1.6}.column,.columns,.container,.u-full-width,.u-max-full-width{box-sizing:border-box}.container{position:relative;max-width:960px;margin:0 auto;padding:0 20px}ol,p,ul{margin-top:0}.column,.columns{float:left}@media (min-width:400px){.container{width:85%;padding:0}}html{font-size:62.5%}body{font-size:1.5em;font-weight:400;font-family:Raleway,HelveticaNeue,"Helvetica Neue",Helvetica,Arial,sans-serif;color:#222}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:2rem;font-weight:300}h1{font-size:4rem;line-height:1.2}h2{font-size:3.6rem;line-height:1.25}h3{font-size:3rem;line-height:1.3}h4{font-size:2.4rem;line-height:1.35;letter-spacing:-.08rem}h5{font-size:1.8rem;line-height:1.5;letter-spacing:-.05rem}h6{font-size:1.5rem;letter-spacing:0}@media (min-width:550px){.container{width:80%}.column,.columns{margin-left:4%}.column:first-child,.columns:first-child{margin-left:0}.one.column,.one.columns{width:4.66666666667%}.two.columns{width:13.3333333333%}.three.columns{width:22%}.four.columns{width:30.6666666667%}.five.columns{width:39.3333333333%}.six.columns{width:48%}.seven.columns{width:56.6666666667%}.eight.columns{width:65.3333333333%}.nine.columns{width:74%}.ten.columns{width:82.6666666667%}.eleven.columns{width:91.3333333333%}.twelve.columns{width:100%;margin-left:0}.one-third.column{width:30.6666666667%}.two-thirds.column{width:65.3333333333%}.one-half.column{width:48%}.offset-by-one.column,.offset-by-one.columns{margin-left:8.66666666667%}.offset-by-two.column,.offset-by-two.columns{margin-left:17.3333333333%}.offset-by-three.column,.offset-by-three.columns{margin-left:26%}.offset-by-four.column,.offset-by-four.columns{margin-left:34.6666666667%}.offset-by-five.column,.offset-by-five.columns{margin-left:43.3333333333%}.offset-by-six.column,.offset-by-six.columns{margin-left:52%}.offset-by-seven.column,.offset-by-seven.columns{margin-left:60.6666666667%}.offset-by-eight.column,.offset-by-eight.columns{margin-left:69.3333333333%}.offset-by-nine.column,.offset-by-nine.columns{margin-left:78%}.offset-by-ten.column,.offset-by-ten.columns{margin-left:86.6666666667%}.offset-by-eleven.column,.offset-by-eleven.columns{margin-left:95.3333333333%}.offset-by-one-third.column,.offset-by-one-third.columns{margin-left:34.6666666667%}.offset-by-two-thirds.column,.offset-by-two-thirds.columns{margin-left:69.3333333333%}.offset-by-one-half.column,.offset-by-one-half.columns{margin-left:52%}h1{font-size:5rem}h2{font-size:4.2rem}h3{font-size:3.6rem}h4{font-size:3rem}h5{font-size:2.4rem}h6{font-size:1.5rem}}a{color:#1EAEDB}a:hover{color:#0FA0CE}input[type=email],input[type=number],input[type=search],input[type=text],input[type=tel],input[type=url],input[type=password],select,textarea{height:38px;padding:6px 10px;background-color:#fff;border:1px solid #D1D1D1;border-radius:4px;box-shadow:none;box-sizing:border-box}input[type=email],input[type=number],input[type=search],input[type=text],input[type=tel],input[type=url],input[type=password],textarea{-webkit-appearance:none;-moz-appearance:none;appearance:none}textarea{min-height:65px;padding-top:6px;padding-bottom:6px}input[type=email]:focus,input[type=number]:focus,input[type=search]:focus,input[type=text]:focus,input[type=tel]:focus,input[type=url]:focus,input[type=password]:focus,select:focus,textarea:focus{border:1px solid #33C3F0;outline:0}label,legend{display:block;margin-bottom:.5rem;font-weight:600}fieldset{padding:0;border-width:0}input[type=checkbox],input[type=radio]{display:inline}label>.label-body{display:inline-block;margin-left:.5rem;font-weight:400}ul{list-style:circle inside}ol{list-style:decimal inside}ol,ul{padding-left:0}ol ol,ol ul,ul ol,ul ul{margin:1.5rem 0 1.5rem 3rem;font-size:90%}.button,button,li{margin-bottom:1rem}code{padding:.2rem .5rem;margin:0 .2rem;font-size:90%;white-space:nowrap;background:#F1F1F1;border:1px solid #E1E1E1;border-radius:4px}pre>code{display:block;padding:1rem 1.5rem;white-space:pre}td,th{padding:12px 15px;text-align:left;border-bottom:1px solid #E1E1E1}td:first-child,th:first-child{padding-left:0}td:last-child,th:last-child{padding-right:0}fieldset,input,select,textarea{margin-bottom:1.5rem}blockquote,dl,figure,form,ol,p,pre,table,ul{margin-bottom:2.5rem}.u-full-width{width:100%}.u-max-full-width{max-width:100%}.u-pull-right{float:right}.u-pull-left{float:left}hr{margin-top:3rem;margin-bottom:3.5rem;border-width:0;border-top:1px solid #E1E1E1}.container:after,.row:after,.u-cf{content:"";display:table;clear:both} diff --git a/templates/learn/index.hbs b/templates/learn/index.hbs index 3a973131b..28ff063de 100644 --- a/templates/learn/index.hbs +++ b/templates/learn/index.hbs @@ -43,16 +43,14 @@
-
+

{{text learn-doc-heading}}

{{text learn-doc}}

-{{!-- TODO: Remove button-secondary--no-skeleton once Skeleton is completely removed. --}} -
{{text learn-doc-std-button}} + class="button button-secondary mw6-l w-100">{{text learn-doc-std-button}}

{{text learn-doc-std}}

@@ -60,7 +58,7 @@
{{text learn-doc-edition-button}} + class="button button-secondary mw6-l w-100">{{text learn-doc-edition-button}}

{{text learn-doc-edition}}

@@ -68,7 +66,7 @@
{{text learn-doc-cargo-button}} + class="button button-secondary mw6-l w-100">{{text learn-doc-cargo-button}}

{{text learn-doc-cargo}}

@@ -76,7 +74,7 @@
{{text learn-doc-rustdoc-button}} + class="button button-secondary mw6-l w-100">{{text learn-doc-rustdoc-button}}

{{text learn-doc-rustdoc}}

@@ -84,7 +82,7 @@
{{text learn-doc-rustc-button}} + class="button button-secondary mw6-l w-100">{{text learn-doc-rustc-button}}

{{text learn-doc-rustc}}

@@ -92,7 +90,7 @@
{{text learn-doc-error-button}} + class="button button-secondary mw6-l w-100">{{text learn-doc-error-button}}

{{text learn-doc-error}}

@@ -100,12 +98,12 @@

-
+

{{text learn-domain}}