Skip to content

Commit c8e2c67

Browse files
Revert "Run Prettier on All The Things"
1 parent bf14e59 commit c8e2c67

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1231
-1808
lines changed

.eslintrc.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ rules:
7171
###########
7272
prettier/prettier:
7373
- error
74-
- parser: typescript
74+
- singleQuote: true
75+
trailingComma: es5
76+
semi: false
77+
parser: typescript
7578
no-restricted-syntax:
7679
- error
7780
# no-default-export

.prettierignore

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,2 @@
1-
out/
2-
dist/
3-
node_modules/
4-
npm-debug.log
5-
yarn-error.log
6-
app/node_modules/
7-
.DS_Store
8-
.awcache
9-
.idea/
10-
.eslintcache
11-
12-
app/static/common
13-
app/test/fixtures
14-
gemoji
151
*.json
2+
*.md

.prettierrc.yml

-4
This file was deleted.

.travis.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ install:
5757
- yarn install --force
5858

5959
script:
60-
- yarn lint && yarn build:prod && yarn test:setup && yarn test
60+
- yarn lint
61+
- yarn build:prod
62+
- yarn test:setup
63+
- yarn test
6164

6265
after_failure:
6366
- yarn test:review

CODE_OF_CONDUCT.md

+16-16
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
In the interest of fostering an open and welcoming environment, we as
66
contributors and maintainers pledge to making participation in our project and
77
our community a harassment-free experience for everyone, regardless of age, body
8-
size, disability, ethnicity, gender identity and expression, level of
9-
experience, nationality, personal appearance, race, religion, or sexual identity
10-
and orientation.
8+
size, disability, ethnicity, gender identity and expression, level of experience,
9+
nationality, personal appearance, race, religion, or sexual identity and
10+
orientation.
1111

1212
## Our Standards
1313

@@ -23,7 +23,7 @@ include:
2323
Examples of unacceptable behavior by participants include:
2424

2525
* The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
26+
advances
2727
* Trolling, insulting/derogatory comments, and personal or political attacks
2828
* Public or private harassment
2929
* Publishing others' private information, such as a physical or electronic
@@ -37,11 +37,11 @@ Project maintainers are responsible for clarifying the standards of acceptable
3737
behavior and are expected to take appropriate and fair corrective action in
3838
response to any instances of unacceptable behavior.
3939

40-
Project maintainers have the right and responsibility to remove, edit, or reject
41-
comments, commits, code, wiki edits, issues, and other contributions that are
42-
not aligned to this Code of Conduct, or to ban temporarily or permanently any
43-
contributor for other behaviors that they deem inappropriate, threatening,
44-
offensive, or harmful.
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
4545

4646
## Scope
4747

@@ -55,20 +55,20 @@ further defined and clarified by project maintainers.
5555
## Enforcement
5656

5757
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at opensource@github.com. All complaints
59-
will be reviewed and investigated and will result in a response that is deemed
60-
necessary and appropriate to the circumstances. The project team is obligated to
61-
maintain confidentiality with regard to the reporter of an incident. Further
62-
details of specific enforcement policies may be posted separately.
58+
reported by contacting the project team at opensource@github.com. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
6363

6464
Project maintainers who do not follow or enforce the Code of Conduct in good
6565
faith may face temporary or permanent repercussions as determined by other
6666
members of the project's leadership.
6767

6868
## Attribution
6969

70-
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
71-
version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at [http://contributor-covenant.org/version/1/4][version]
7272

7373
[homepage]: http://contributor-covenant.org
7474
[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

+76-90
Large diffs are not rendered by default.

README.md

+22-28
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,16 @@ uses [React](https://facebook.github.io/react/).
1616

1717
Download the official installer for your operating system:
1818

19-
* [macOS](https://central.github.com/deployments/desktop/desktop/latest/darwin)
20-
* [Windows](https://central.github.com/deployments/desktop/desktop/latest/win32)
21-
* [Windows machine-wide install](https://central.github.com/deployments/desktop/desktop/latest/win32?format=msi)
19+
- [macOS](https://central.github.com/deployments/desktop/desktop/latest/darwin)
20+
- [Windows](https://central.github.com/deployments/desktop/desktop/latest/win32)
21+
- [Windows machine-wide install](https://central.github.com/deployments/desktop/desktop/latest/win32?format=msi)
2222

23-
There are several community-supported package managers that can be used to
24-
install Github Desktop.
25-
26-
* Windows users can install using [Chocolatey](https://chocolatey.org/) package
27-
manager: `c:\> choco install github-desktop`
28-
* macOS users can install using [Homebrew](https://brew.sh/) package manager:
29-
`$ brew cask install github`
30-
* Arch Linux users can install the latest version from the
31-
[AUR](https://aur.archlinux.org/packages/github-desktop/).
23+
There are several community-supported package managers that can be used to install Github Desktop.
24+
- Windows users can install using [Chocolatey](https://chocolatey.org/) package manager:
25+
`c:\> choco install github-desktop`
26+
- macOS users can install using [Homebrew](https://brew.sh/) package manager:
27+
`$ brew cask install github`
28+
- Arch Linux users can install the latest version from the [AUR](https://aur.archlinux.org/packages/github-desktop/).
3229

3330
You can install this alongside your existing GitHub Desktop for Mac or GitHub
3431
Desktop for Windows application.
@@ -42,29 +39,26 @@ from disk onto the application to get started.
4239
Want to test out new features and get fixes before everyone else? Install the
4340
beta channel to get access to early builds of Desktop:
4441

45-
* [macOS](https://central.github.com/deployments/desktop/desktop/latest/darwin?env=beta)
46-
* [Windows](https://central.github.com/deployments/desktop/desktop/latest/win32?env=beta)
42+
- [macOS](https://central.github.com/deployments/desktop/desktop/latest/darwin?env=beta)
43+
- [Windows](https://central.github.com/deployments/desktop/desktop/latest/win32?env=beta)
4744

4845
## I have a problem with GitHub Desktop
4946

50-
First, please search the
51-
[open issues](https://github.com/desktop/desktop/issues?q=is%3Aopen) and
52-
[closed issues](https://github.com/desktop/desktop/issues?q=is%3Aclosed) to see
53-
if your issue hasn't already been reported (it may also be fixed).
47+
First, please search the [open issues](https://github.com/desktop/desktop/issues?q=is%3Aopen)
48+
and [closed issues](https://github.com/desktop/desktop/issues?q=is%3Aclosed)
49+
to see if your issue hasn't already been reported (it may also be fixed).
5450

55-
If you can't find an issue that matches what you're seeing, open a
56-
[new issue](https://github.com/desktop/desktop/issues/new) and fill out the
57-
template to provide us with enough information to investigate further.
51+
If you can't find an issue that matches what you're seeing, open a [new issue](https://github.com/desktop/desktop/issues/new)
52+
and fill out the template to provide us with enough information to investigate
53+
further.
5854

5955
## How can I contribute to GitHub Desktop?
6056

6157
The [CONTRIBUTING.md](./CONTRIBUTING.md) document will help you get setup and
6258
familiar with the source. The [documentation](docs/) folder also contains more
6359
resources relevant to the project.
6460

65-
If you're looking for something to work on, check out the
66-
[help wanted](https://github.com/desktop/desktop/issues?q=is%3Aissue+is%3Aopen+label%3A%22help%20wanted%22)
67-
label.
61+
If you're looking for something to work on, check out the [help wanted](https://github.com/desktop/desktop/issues?q=is%3Aissue+is%3Aopen+label%3A%22help%20wanted%22) label.
6862

6963
## More Resources
7064

@@ -76,10 +70,10 @@ information about GitHub Desktop.
7670
**[MIT](LICENSE)**
7771

7872
The MIT license grant is not for GitHub's trademarks, which include the logo
79-
designs. GitHub reserves all trademark and copyright rights in and to all GitHub
80-
trademarks. GitHub's logos include, for instance, the stylized Invertocat
81-
designs that include "logo" in the file title in the following folder:
82-
[logos](app/static/logos).
73+
designs. GitHub reserves all trademark and copyright rights in and to all
74+
GitHub trademarks. GitHub's logos include, for instance, the stylized
75+
Invertocat designs that include "logo" in the file title in the following
76+
folder: [logos](app/static/logos).
8377

8478
GitHub® and its stylized versions and the Invertocat mark are GitHub's
8579
Trademarks or registered Trademarks. When using GitHub's logos, be sure to

app/src/crash/styles/crash.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
@import '../../../styles/ui/button';
66
@import '../../../styles/ui/scroll';
77

8-
#desktop-crash-container,
9-
#crash-app {
8+
#desktop-crash-container, #crash-app {
109
height: 100%;
1110
}
1211

@@ -36,6 +35,7 @@ pre.error {
3635
}
3736

3837
header {
38+
3939
margin-bottom: var(--spacing-double);
4040
display: flex;
4141
flex: none;

app/styles/_globals.scss

+4-12
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ html {
2929

3030
// We never want the window to be scrollable, everything has to fit
3131
// or be placed into a scrollable container.
32-
html,
33-
body {
32+
html, body {
3433
height: 100%;
3534
width: 100%;
3635
margin: 0;
@@ -59,9 +58,7 @@ body {
5958
}
6059

6160
:not(input):not(textarea) {
62-
&,
63-
&::after,
64-
&::before {
61+
&, &::after, &::before {
6562
-webkit-user-select: none;
6663
user-select: none;
6764
cursor: default;
@@ -84,14 +81,9 @@ img {
8481
// margin for easier control within type scales as it avoids margin collapsing.
8582
//
8683
// From: https://github.com/twbs/bootstrap/blob/a0f10e6dcb9aef2d8e36e57f3c8b1b06034a8877/scss/_reboot.scss
87-
h1,
88-
h2,
89-
h3,
90-
h4,
91-
h5,
92-
h6 {
84+
h1, h2, h3, h4, h5, h6 {
9385
margin-top: 0;
94-
margin-bottom: 0.5rem;
86+
margin-bottom: .5rem;
9587
}
9688

9789
// Regardless of platform behavior we never want buttons to be

app/styles/_mixins.scss

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import 'mixins/platform';
2-
@import 'mixins/ellipsis';
3-
@import 'mixins/octicon-status';
4-
@import 'mixins/textboxish';
5-
@import 'mixins/checkboard-background';
1+
@import "mixins/platform";
2+
@import "mixins/ellipsis";
3+
@import "mixins/octicon-status";
4+
@import "mixins/textboxish";
5+
@import "mixins/checkboard-background";

app/styles/_ui.scss

+58-58
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
1-
@import 'ui/app';
2-
@import 'ui/app-menu';
3-
@import 'ui/scroll';
4-
@import 'ui/window/title-bar';
5-
@import 'ui/window/app-menu-bar';
6-
@import 'ui/window/focus';
7-
@import 'ui/window/zoom-info';
8-
@import 'ui/window/toast-notification';
9-
@import 'ui/file-list';
10-
@import 'ui/octicons';
11-
@import 'ui/list';
12-
@import 'ui/repository-list';
13-
@import 'ui/changes';
14-
@import 'ui/cloning-repository-view';
15-
@import 'ui/diff';
16-
@import 'ui/history';
17-
@import 'ui/repository';
18-
@import 'ui/resizable';
19-
@import 'ui/toolbar/toolbar';
20-
@import 'ui/toolbar/button';
21-
@import 'ui/toolbar/dropdown';
22-
@import 'ui/tab-bar';
23-
@import 'ui/panel';
24-
@import 'ui/popup';
25-
@import 'ui/progress';
26-
@import 'ui/branches';
27-
@import 'ui/emoji';
28-
@import 'ui/ui-view';
29-
@import 'ui/autocompletion';
30-
@import 'ui/welcome';
31-
@import 'ui/foldout';
32-
@import 'ui/preferences';
33-
@import 'ui/path-text';
34-
@import 'ui/configure-git-user';
35-
@import 'ui/form';
36-
@import 'ui/text-box';
37-
@import 'ui/button';
38-
@import 'ui/select';
39-
@import 'ui/row';
40-
@import 'ui/text-area';
41-
@import 'ui/checkbox';
42-
@import 'ui/errors';
43-
@import 'ui/dialog';
44-
@import 'ui/add-repository';
45-
@import 'ui/discard-changes';
46-
@import 'ui/filter-list';
47-
@import 'ui/missing-repository-view';
48-
@import 'ui/horizontal-rule';
49-
@import 'ui/about';
50-
@import 'ui/avatar';
51-
@import 'ui/call-to-action';
52-
@import 'ui/acknowledgements';
53-
@import 'ui/update-notification';
54-
@import 'ui/vertical-segmented-control';
55-
@import 'ui/blank-slate';
56-
@import 'ui/terms-and-conditions';
57-
@import 'ui/ref';
58-
@import 'ui/monospaced';
1+
@import "ui/app";
2+
@import "ui/app-menu";
3+
@import "ui/scroll";
4+
@import "ui/window/title-bar";
5+
@import "ui/window/app-menu-bar";
6+
@import "ui/window/focus";
7+
@import "ui/window/zoom-info";
8+
@import "ui/window/toast-notification";
9+
@import "ui/file-list";
10+
@import "ui/octicons";
11+
@import "ui/list";
12+
@import "ui/repository-list";
13+
@import "ui/changes";
14+
@import "ui/cloning-repository-view";
15+
@import "ui/diff";
16+
@import "ui/history";
17+
@import "ui/repository";
18+
@import "ui/resizable";
19+
@import "ui/toolbar/toolbar";
20+
@import "ui/toolbar/button";
21+
@import "ui/toolbar/dropdown";
22+
@import "ui/tab-bar";
23+
@import "ui/panel";
24+
@import "ui/popup";
25+
@import "ui/progress";
26+
@import "ui/branches";
27+
@import "ui/emoji";
28+
@import "ui/ui-view";
29+
@import "ui/autocompletion";
30+
@import "ui/welcome";
31+
@import "ui/foldout";
32+
@import "ui/preferences";
33+
@import "ui/path-text";
34+
@import "ui/configure-git-user";
35+
@import "ui/form";
36+
@import "ui/text-box";
37+
@import "ui/button";
38+
@import "ui/select";
39+
@import "ui/row";
40+
@import "ui/text-area";
41+
@import "ui/checkbox";
42+
@import "ui/errors";
43+
@import "ui/dialog";
44+
@import "ui/add-repository";
45+
@import "ui/discard-changes";
46+
@import "ui/filter-list";
47+
@import "ui/missing-repository-view";
48+
@import "ui/horizontal-rule";
49+
@import "ui/about";
50+
@import "ui/avatar";
51+
@import "ui/call-to-action";
52+
@import "ui/acknowledgements";
53+
@import "ui/update-notification";
54+
@import "ui/vertical-segmented-control";
55+
@import "ui/blank-slate";
56+
@import "ui/terms-and-conditions";
57+
@import "ui/ref";
58+
@import "ui/monospaced";
5959
@import 'ui/initialize-lfs';
6060
@import 'ui/ci-status';
6161
@import 'ui/pull-request-badge';

app/styles/_variables.scss

+2-5
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,8 @@
3636
// Typography
3737
//
3838
// Font, line-height, and color for body text, headings, and more.
39-
--font-family-sans-serif: -apple-system, BlinkMacSystemFont, 'Segoe UI',
40-
'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans',
41-
'Helvetica Neue', Arial, sans-serif;
42-
--font-family-monospace: Menlo, Monaco, Consolas, 'Liberation Mono',
43-
'Courier New', monospace;
39+
--font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif;
40+
--font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
4441

4542
/**
4643
* Font weight to use for semibold text

0 commit comments

Comments
 (0)