Skip to content

Commit 15e8fcf

Browse files
committed
Prettier the Markdown and SCSS 💄
1 parent adbffea commit 15e8fcf

Some content is hidden

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

78 files changed

+1574
-1094
lines changed

‎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 experience,
9-
nationality, personal appearance, race, religion, or sexual identity and
10-
orientation.
8+
size, disability, ethnicity, gender identity and expression, level of
9+
experience, nationality, personal appearance, race, religion, or sexual identity
10+
and 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
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.
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.
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
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.
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.
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], version 1.4,
71-
available at [http://contributor-covenant.org/version/1/4][version]
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]
7272

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

‎CONTRIBUTING.md

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

‎README.md

+28-22
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,19 @@ 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 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/).
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/).
2932

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

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)
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)
4447

4548
## I have a problem with GitHub Desktop
4649

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).
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).
5054

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.
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.
5458

5559
## How can I contribute to GitHub Desktop?
5660

5761
The [CONTRIBUTING.md](./CONTRIBUTING.md) document will help you get setup and
5862
familiar with the source. The [documentation](docs/) folder also contains more
5963
resources relevant to the project.
6064

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.
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.
6268

6369
## More Resources
6470

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

7278
The MIT license grant is not for GitHub's trademarks, which include the logo
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).
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).
7783

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

‎app/styles/.prettierrc.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
singleQuote: false

‎app/styles/_globals.scss

+12-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ 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, body {
32+
html,
33+
body {
3334
height: 100%;
3435
width: 100%;
3536
margin: 0;
@@ -58,7 +59,9 @@ body {
5859
}
5960

6061
:not(input):not(textarea) {
61-
&, &::after, &::before {
62+
&,
63+
&::after,
64+
&::before {
6265
-webkit-user-select: none;
6366
user-select: none;
6467
cursor: default;
@@ -81,9 +84,14 @@ img {
8184
// margin for easier control within type scales as it avoids margin collapsing.
8285
//
8386
// From: https://github.com/twbs/bootstrap/blob/a0f10e6dcb9aef2d8e36e57f3c8b1b06034a8877/scss/_reboot.scss
84-
h1, h2, h3, h4, h5, h6 {
87+
h1,
88+
h2,
89+
h3,
90+
h4,
91+
h5,
92+
h6 {
8593
margin-top: 0;
86-
margin-bottom: .5rem;
94+
margin-bottom: 0.5rem;
8795
}
8896

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

‎app/styles/_ui.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
@import "ui/terms-and-conditions";
5757
@import "ui/ref";
5858
@import "ui/monospaced";
59-
@import 'ui/initialize-lfs';
60-
@import 'ui/ci-status';
61-
@import 'ui/pull-request-badge';
62-
@import 'ui/no-branches';
59+
@import "ui/initialize-lfs";
60+
@import "ui/ci-status";
61+
@import "ui/pull-request-badge";
62+
@import "ui/no-branches";

‎app/styles/_variables.scss

+6-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// This files contains CSS variables accessible to all selectors
44

55
// Primer colors, see https://github.com/primer/primer-css/blob/master/modules/primer-support/lib/variables/color-system.scss
6-
@import '~primer-support/lib/variables/color-system.scss';
6+
@import "~primer-support/lib/variables/color-system.scss";
77

88
:root {
99
--color-new: $green;
@@ -36,8 +36,11 @@
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", "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;
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;
4144

4245
/**
4346
* Font weight to use for semibold text

‎app/styles/_vendor.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@import "~react-virtualized/styles.css";
22
@import "~codemirror/lib/codemirror.css";
33
@import "~codemirror/theme/solarized.css";
4-
@import "~codemirror/addon/scroll/simplescrollbars.css"
4+
@import "~codemirror/addon/scroll/simplescrollbars.css";

‎app/styles/desktop.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
@import "globals";
77
@import "type";
88

9-
@import "ui"
9+
@import "ui";
+21-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,26 @@
11
@mixin octicon-status {
22
.status {
3-
&-new { fill: var(--color-new); }
4-
&-copied { fill: var(--color-new); }
5-
&-modified { fill: var(--color-modified); }
6-
&-renamed { fill: var(--color-renamed); }
7-
&-deleted { fill: var(--color-deleted); }
8-
&-conflicted { fill: var(--color-conflicted); }
3+
&-new {
4+
fill: var(--color-new);
5+
}
6+
&-copied {
7+
fill: var(--color-new);
8+
}
9+
&-modified {
10+
fill: var(--color-modified);
11+
}
12+
&-renamed {
13+
fill: var(--color-renamed);
14+
}
15+
&-deleted {
16+
fill: var(--color-deleted);
17+
}
18+
&-conflicted {
19+
fill: var(--color-conflicted);
20+
}
921
}
1022

11-
.line-endings { fill: var(--color-conflicted); }
23+
.line-endings {
24+
fill: var(--color-conflicted);
25+
}
1226
}

‎app/styles/ui/_about.scss

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
dialog#about {
2-
32
.dialog-content {
43
.row-component {
54
justify-content: center;
65
}
76

8-
p, h2 {
7+
p,
8+
h2 {
99
text-align: center;
1010
}
1111

@@ -40,7 +40,6 @@ dialog#about {
4040
}
4141

4242
.update-status {
43-
4443
.octicon.spin {
4544
// Make sure the spinner is aligned with the text.
4645
align-self: center;

‎app/styles/ui/_add-repository.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
padding: 0;
4747

4848
.row-component:not(:last-child) {
49-
margin: 0;
50-
}
49+
margin: 0;
50+
}
5151
}
5252

5353
&.clone-generic-repository-content {

‎app/styles/ui/_app-menu.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
}
3838

3939
&:not(:last-child) {
40-
4140
// We want list items in previous menus to behave as if they have focus
4241
// even though they don't, ie we want the selected+focus state
4342
// to be in effect for all parent selected menu items as well as
@@ -68,7 +67,9 @@
6867
width: 100%;
6968
min-width: 0;
7069

71-
&.disabled { opacity: 0.3; }
70+
&.disabled {
71+
opacity: 0.3;
72+
}
7273

7374
.label {
7475
flex-grow: 1;

‎app/styles/ui/_app.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@import "../mixins";
22

33
#desktop-app {
4-
54
// This is just a dummy wrapper needed because react doesn't like
65
// being installed into <body>, see https://github.com/facebook/react/issues/3207
76
&-container {
@@ -23,6 +22,6 @@
2322
&-contents {
2423
display: flex;
2524
flex-direction: column;
26-
flex-grow: 1
25+
flex-grow: 1;
2726
}
2827
}

‎app/styles/ui/_autocompletion.scss

+11-8
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,21 @@
1515
border-radius: var(--border-radius);
1616
overflow: hidden; // To get those sweet rounded corners
1717

18-
&.emoji { width: 200px; }
19-
&.user { width: 220px; }
20-
&.issue { width: 300px; }
18+
&.emoji {
19+
width: 200px;
20+
}
21+
&.user {
22+
width: 220px;
23+
}
24+
&.issue {
25+
width: 300px;
26+
}
2127

2228
background-color: var(--background-color);
2329

2430
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.3);
2531

26-
.list-item
27-
{
32+
.list-item {
2833
border-bottom: none;
2934

3035
&:not(:first-child) {
@@ -40,14 +45,13 @@
4045
border-top-color: var(--box-selected-active-background-color);
4146

4247
& + .list-item {
43-
border-top-color: var(--box-selected-active-background-color);
48+
border-top-color: var(--box-selected-active-background-color);
4449
}
4550
}
4651
}
4752
}
4853

4954
.autocompletion-item {
50-
5155
flex-grow: 1;
5256
height: 100%;
5357
min-width: 0;
@@ -61,7 +65,6 @@
6165
}
6266

6367
.emoji {
64-
6568
display: flex;
6669
flex-grow: 1;
6770

0 commit comments

Comments
 (0)