Skip to content

Commit

Permalink
Prettier the Markdown and SCSS 💄
Browse files Browse the repository at this point in the history
  • Loading branch information
j-f1 committed Dec 12, 2017
1 parent adbffea commit 15e8fcf
Show file tree
Hide file tree
Showing 78 changed files with 1,574 additions and 1,094 deletions.
32 changes: 16 additions & 16 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
nationality, personal appearance, race, religion, or sexual identity and
orientation.
size, disability, ethnicity, gender identity and expression, level of
experience, nationality, personal appearance, race, religion, or sexual identity
and orientation.

## Our Standards

Expand All @@ -23,7 +23,7 @@ include:
Examples of unacceptable behavior by participants include:

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

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

## Scope

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

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

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

## Attribution

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

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
166 changes: 90 additions & 76 deletions CONTRIBUTING.md

Large diffs are not rendered by default.

50 changes: 28 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,19 @@ uses [React](https://facebook.github.io/react/).

Download the official installer for your operating system:

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

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

* Windows users can install using [Chocolatey](https://chocolatey.org/) package
manager: `c:\> choco install github-desktop`
* macOS users can install using [Homebrew](https://brew.sh/) package manager:
`$ brew cask install github`
* Arch Linux users can install the latest version from the
[AUR](https://aur.archlinux.org/packages/github-desktop/).

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

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

## I have a problem with GitHub Desktop

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

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

## How can I contribute to GitHub Desktop?

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

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

## More Resources

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

The MIT license grant is not for GitHub's trademarks, which include the logo
designs. GitHub reserves all trademark and copyright rights in and to all
GitHub trademarks. GitHub's logos include, for instance, the stylized
Invertocat designs that include "logo" in the file title in the following
folder: [logos](app/static/logos).
designs. GitHub reserves all trademark and copyright rights in and to all GitHub
trademarks. GitHub's logos include, for instance, the stylized Invertocat
designs that include "logo" in the file title in the following folder:
[logos](app/static/logos).

GitHub® and its stylized versions and the Invertocat mark are GitHub's
Trademarks or registered Trademarks. When using GitHub's logos, be sure to
Expand Down
1 change: 1 addition & 0 deletions app/styles/.prettierrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
singleQuote: false
16 changes: 12 additions & 4 deletions app/styles/_globals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ html {

// We never want the window to be scrollable, everything has to fit
// or be placed into a scrollable container.
html, body {
html,
body {
height: 100%;
width: 100%;
margin: 0;
Expand Down Expand Up @@ -58,7 +59,9 @@ body {
}

:not(input):not(textarea) {
&, &::after, &::before {
&,
&::after,
&::before {
-webkit-user-select: none;
user-select: none;
cursor: default;
Expand All @@ -81,9 +84,14 @@ img {
// margin for easier control within type scales as it avoids margin collapsing.
//
// From: https://github.com/twbs/bootstrap/blob/a0f10e6dcb9aef2d8e36e57f3c8b1b06034a8877/scss/_reboot.scss
h1, h2, h3, h4, h5, h6 {
h1,
h2,
h3,
h4,
h5,
h6 {
margin-top: 0;
margin-bottom: .5rem;
margin-bottom: 0.5rem;
}

// Regardless of platform behavior we never want buttons to be
Expand Down
8 changes: 4 additions & 4 deletions app/styles/_ui.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
@import "ui/terms-and-conditions";
@import "ui/ref";
@import "ui/monospaced";
@import 'ui/initialize-lfs';
@import 'ui/ci-status';
@import 'ui/pull-request-badge';
@import 'ui/no-branches';
@import "ui/initialize-lfs";
@import "ui/ci-status";
@import "ui/pull-request-badge";
@import "ui/no-branches";
9 changes: 6 additions & 3 deletions app/styles/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// This files contains CSS variables accessible to all selectors

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

:root {
--color-new: $green;
Expand Down Expand Up @@ -36,8 +36,11 @@
// Typography
//
// Font, line-height, and color for body text, headings, and more.
--font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif;
--font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
--font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI",
"Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans",
"Helvetica Neue", Arial, sans-serif;
--font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono",
"Courier New", monospace;

/**
* Font weight to use for semibold text
Expand Down
2 changes: 1 addition & 1 deletion app/styles/_vendor.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~react-virtualized/styles.css";
@import "~codemirror/lib/codemirror.css";
@import "~codemirror/theme/solarized.css";
@import "~codemirror/addon/scroll/simplescrollbars.css"
@import "~codemirror/addon/scroll/simplescrollbars.css";
2 changes: 1 addition & 1 deletion app/styles/desktop.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
@import "globals";
@import "type";

@import "ui"
@import "ui";
28 changes: 21 additions & 7 deletions app/styles/mixins/_octicon-status.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
@mixin octicon-status {
.status {
&-new { fill: var(--color-new); }
&-copied { fill: var(--color-new); }
&-modified { fill: var(--color-modified); }
&-renamed { fill: var(--color-renamed); }
&-deleted { fill: var(--color-deleted); }
&-conflicted { fill: var(--color-conflicted); }
&-new {
fill: var(--color-new);
}
&-copied {
fill: var(--color-new);
}
&-modified {
fill: var(--color-modified);
}
&-renamed {
fill: var(--color-renamed);
}
&-deleted {
fill: var(--color-deleted);
}
&-conflicted {
fill: var(--color-conflicted);
}
}

.line-endings { fill: var(--color-conflicted); }
.line-endings {
fill: var(--color-conflicted);
}
}
5 changes: 2 additions & 3 deletions app/styles/ui/_about.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
dialog#about {

.dialog-content {
.row-component {
justify-content: center;
}

p, h2 {
p,
h2 {
text-align: center;
}

Expand Down Expand Up @@ -40,7 +40,6 @@ dialog#about {
}

.update-status {

.octicon.spin {
// Make sure the spinner is aligned with the text.
align-self: center;
Expand Down
4 changes: 2 additions & 2 deletions app/styles/ui/_add-repository.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
padding: 0;

.row-component:not(:last-child) {
margin: 0;
}
margin: 0;
}
}

&.clone-generic-repository-content {
Expand Down
5 changes: 3 additions & 2 deletions app/styles/ui/_app-menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
}

&:not(:last-child) {

// We want list items in previous menus to behave as if they have focus
// even though they don't, ie we want the selected+focus state
// to be in effect for all parent selected menu items as well as
Expand Down Expand Up @@ -68,7 +67,9 @@
width: 100%;
min-width: 0;

&.disabled { opacity: 0.3; }
&.disabled {
opacity: 0.3;
}

.label {
flex-grow: 1;
Expand Down
3 changes: 1 addition & 2 deletions app/styles/ui/_app.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../mixins";

#desktop-app {

// This is just a dummy wrapper needed because react doesn't like
// being installed into <body>, see https://github.com/facebook/react/issues/3207
&-container {
Expand All @@ -23,6 +22,6 @@
&-contents {
display: flex;
flex-direction: column;
flex-grow: 1
flex-grow: 1;
}
}
19 changes: 11 additions & 8 deletions app/styles/ui/_autocompletion.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,21 @@
border-radius: var(--border-radius);
overflow: hidden; // To get those sweet rounded corners

&.emoji { width: 200px; }
&.user { width: 220px; }
&.issue { width: 300px; }
&.emoji {
width: 200px;
}
&.user {
width: 220px;
}
&.issue {
width: 300px;
}

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

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

.list-item
{
.list-item {
border-bottom: none;

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

& + .list-item {
border-top-color: var(--box-selected-active-background-color);
border-top-color: var(--box-selected-active-background-color);
}
}
}
}

.autocompletion-item {

flex-grow: 1;
height: 100%;
min-width: 0;
Expand All @@ -61,7 +65,6 @@
}

.emoji {

display: flex;
flex-grow: 1;

Expand Down
Loading

0 comments on commit 15e8fcf

Please sign in to comment.