Skip to content
This repository has been archived by the owner on Mar 25, 2021. It is now read-only.

Commit

Permalink
Upgrade prettier and run over all files
Browse files Browse the repository at this point in the history
This:
* Upgrades Prettier to  1.14 whic adds yml support.
* Turns on `trailing commas = all` as that seems to be what most of the code is doing.
* Runs prettier over everything

This also has the bonus of making future PRs much smaller.
  • Loading branch information
Andrew Boyton committed Oct 9, 2018
1 parent 237fd90 commit d09452f
Show file tree
Hide file tree
Showing 28 changed files with 1,840 additions and 972 deletions.
3 changes: 2 additions & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"tabWidth": 4,
"printWidth": 100
"printWidth": 100,
"trailingComma": "all"
}
12 changes: 6 additions & 6 deletions docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
title: TSLint
email: your-email@domain.com
description: > # this means to ignore newlines until "baseurl:"
TSLint documentation. A linter for the TypeScript language.
TSLint documentation. A linter for the TypeScript language.
baseurl: "/tslint" # the subpath of your site, e.g. /blog/
url: "https://palantir.github.io/" # the base hostname & protocol for your site
twitter_username: PalantirTech
github_username: palantir/tslint
github_username: palantir/tslint

# Build settings
markdown: kramdown
markdown_ext: md
exclude: [vendor]

page_gen:
- data: rules
template: rule
name: ruleName
dir: rules
- data: rules
template: rule
name: ruleName
dir: rules
92 changes: 54 additions & 38 deletions docs/_sass/_base.scss
Original file line number Diff line number Diff line change
@@ -1,27 +1,46 @@
/**
* Reset some basic elements
*/
body, h1, h2, h3, h4, h5, h6,
p, blockquote, pre, hr,
dl, dd, ol, ul, figure {
body,
h1,
h2,
h3,
h4,
h5,
h6,
p,
blockquote,
pre,
hr,
dl,
dd,
ol,
ul,
figure {
margin: 0;
padding: 0;
}



/**
* Set `margin-bottom` to maintain vertical rhythm
*/
h1, h2, h3, h4, h5, h6,
p, blockquote, pre,
ul, ol, dl, figure,
h1,
h2,
h3,
h4,
h5,
h6,
p,
blockquote,
pre,
ul,
ol,
dl,
figure,
%vertical-rhythm {
margin-bottom: 1rem;
}



/**
* Images
*/
Expand All @@ -30,8 +49,6 @@ img {
vertical-align: middle;
}



/**
* Figures
*/
Expand All @@ -58,7 +75,6 @@ figcaption {
* Icons
*/
.icon {

> svg {
display: inline-block;
width: 16px;
Expand All @@ -71,46 +87,45 @@ figcaption {
}
}


/**
* Rules & Feature Badges
*/
.rules-list {
.rules-list {
list-style: none;
margin: 0 !important; //need to override the `main-content ul` selector

> li {
&:nth-child(odd) {
a {
background-color: rgba(0, 0, 0, .03);
background-color: rgba(0, 0, 0, 0.03);
}
}

a {
display: block;
border-left: 3px solid transparent;
text-decoration: none;
padding: .75rem;
padding: 0.75rem;

&:hover {
background-color: rgba(0, 0, 0,.075);
background-color: rgba(0, 0, 0, 0.075);
border-left-color: #159957;
}
}
}
}
}

.rule-features {
//This is the container for a list of feature badges
.rule-features {
//This is the container for a list of feature badges
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
}
}

.feature {
//This is the setup for the a feature badge
.feature {
//This is the setup for the a feature badge
display: inline-block;
margin-right: 2px;
padding: 2px 4px;
Expand All @@ -120,7 +135,7 @@ figcaption {
white-space: nowrap;
vertical-align: baseline;
border: 1px solid transparent;
border-radius: .25rem;
border-radius: 0.25rem;
cursor: help;

&:before {
Expand All @@ -137,9 +152,9 @@ figcaption {

&.feature-ts-only {
//This feature badge is added to rules that are "TypeScript Only"
background-color: #FCF8E3;
border-color: #FAF2CC;
color: #8A6D3B;
background-color: #fcf8e3;
border-color: #faf2cc;
color: #8a6d3b;

&:before {
content: "\1F4C4"; //"page facing up" icon - http://www.fileformat.info/info/unicode/char/1F4C4/index.htm
Expand All @@ -148,9 +163,9 @@ figcaption {

&.feature-fixer {
//This feature badge is added to rules that have an auto-fixer
background-color: #DFF0D8;
border-color: #D0E9C6;
color: #3C763D;
background-color: #dff0d8;
border-color: #d0e9c6;
color: #3c763d;

&:before {
content: "\1f527"; //"wrench" icon - http://www.fileformat.info/info/unicode/char/1f527/index.htm
Expand All @@ -159,20 +174,20 @@ figcaption {

&.feature-requires-type-info {
//This feature badge is added to rules that require type information
background-color: #F2DEDE;
border-color: #EBCCCC;
color: #A94442;
background-color: #f2dede;
border-color: #ebcccc;
color: #a94442;

&:before {
content: "\2139"; //"information source" icon - http://www.fileformat.info/info/unicode/char/2139/index.htm
//Surround it with a blue circle
border-radius: 50%;
background: #0078D7;
color: #FFF;
background: #0078d7;
color: #fff;
width: 1em;
}
}
}
}

.wrapper__code-example {
margin-bottom: 64px;
Expand All @@ -195,7 +210,8 @@ figcaption {
background-color: #fff5f5;
}

pre, .highlight {
pre,
.highlight {
background: transparent;
}
}
Expand Down
Loading

0 comments on commit d09452f

Please sign in to comment.