Skip to content

New button style #1027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 19, 2020
Merged

New button style #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02b648e
Use $border-radius variable
simurai Feb 14, 2020
81e04b8
Update $border-color-button
simurai Feb 14, 2020
dfcafd7
Update buttons
simurai Feb 18, 2020
25244d7
Add focus ring when hovering to inverse buttons
simurai Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions docs/content/components/buttons.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,37 @@ When using the `octicon-x` icon for a close button, add `.close-button` to remov
</button>
```

## Button with icons

Icons can be added to any button.

```html live
<button class="btn mr-2" type="button">
<!-- <%= octicon "search" %> -->
<svg class="octicon octicon-search" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M15.7 13.3l-3.81-3.83A5.93 5.93 0 0013 6c0-3.31-2.69-6-6-6S1 2.69 1 6s2.69 6 6 6c1.3 0 2.48-.41 3.47-1.11l3.83 3.81c.19.2.45.3.7.3.25 0 .52-.09.7-.3a.996.996 0 000-1.41v.01zM7 10.7c-2.59 0-4.7-2.11-4.7-4.7 0-2.59 2.11-4.7 4.7-4.7 2.59 0 4.7 2.11 4.7 4.7 0 2.59-2.11 4.7-4.7 4.7z"></path></svg>
<span>Find file</span>
</button>

<button class="btn btn-primary mr-2" type="button">
<!-- <%= octicon "cloud-download" %> -->
<svg class="octicon octicon-cloud-download" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M9 12h2l-3 3-3-3h2V7h2v5zm3-8c0-.44-.91-3-4.5-3C5.08 1 3 2.92 3 5 1.02 5 0 6.52 0 8c0 1.53 1 3 3 3h3V9.7H3C1.38 9.7 1.3 8.28 1.3 8c0-.17.05-1.7 1.7-1.7h1.3V5c0-1.39 1.56-2.7 3.2-2.7 2.55 0 3.13 1.55 3.2 1.8v1.2H12c.81 0 2.7.22 2.7 2.2 0 2.09-2.25 2.2-2.7 2.2h-2V11h2c2.08 0 4-1.16 4-3.5C16 5.06 14.08 4 12 4z"></path></svg>
<span>Clone</span>
<span class="dropdown-caret"></span>
</button>

<button class="btn btn-danger mr-2" type="button">
<!-- <%= octicon "trashcan" %> -->
<svg class="octicon octicon-trashcan" viewBox="0 0 12 16" version="1.1" width="12" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M11 2H9c0-.55-.45-1-1-1H5c-.55 0-1 .45-1 1H2c-.55 0-1 .45-1 1v1c0 .55.45 1 1 1v9c0 .55.45 1 1 1h7c.55 0 1-.45 1-1V5c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm-1 12H3V5h1v8h1V5h1v8h1V5h1v8h1V5h1v9zm1-10H2V3h9v1z"></path></svg>
<span>Delete</span>
</button>

<button class="btn btn-outline" type="button">
<!-- <%= octicon "device-desktop" %> -->
<svg class="octicon octicon-device-desktop" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M15 2H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h5.34c-.25.61-.86 1.39-2.34 2h8c-1.48-.61-2.09-1.39-2.34-2H15c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm0 9H1V3h14v8z"></path></svg>
<span>Open in Desktop</span>
</button>
```

## Button with counts

You can easily append a count to a **small button**. Add the `.with-count` class to the `.btn-sm` and then add the `.social-count` after the button.
Expand Down
245 changes: 213 additions & 32 deletions src/buttons/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,79 +5,259 @@
position: relative;
display: inline-block;
// stylelint-disable-next-line primer/spacing
padding: 6px 12px;
padding: 6px $spacer-3;
font-size: $body-font-size;
font-weight: $font-weight-bold;
// stylelint-disable-next-line primer/typography
font-weight: 500;
// stylelint-disable-next-line primer/typography
line-height: 20px; // Specifically not inherit our `<body>` default
white-space: nowrap;
vertical-align: middle;
cursor: pointer;
user-select: none;
background-repeat: repeat-x;
background-position: -1px -1px;
background-size: 110% 110%;
border: $border-width $border-style $border-color-button;
// stylelint-disable-next-line primer/borders
border-radius: 0.25em;
border: $border-width $border-style;
border-radius: $border-radius;
appearance: none; // Corrects inability to style clickable `input` types in iOS.

&:hover {
text-decoration: none;
}

&:focus {
outline: 0;
}

&:disabled,
&.disabled,
&[aria-disabled=true] {
cursor: default;
}

i {
font-style: normal;
font-weight: $font-weight-semibold;
opacity: 0.75;
}

.octicon {
vertical-align: text-top;
margin-right: $spacer-1;
color: $text-gray-light;
vertical-align: text-bottom;
}

// Darken for just a tad more contrast against the button background
.Counter {
// stylelint-disable-next-line primer/spacing
margin-left: 2px;
color: $text-gray;
text-shadow: none;
// stylelint-disable-next-line primer/colors
background-color: rgba($black, 0.1);
}

&:hover {
text-decoration: none;
background-repeat: repeat-x;
.dropdown-caret {
margin-left: $spacer-1;
opacity: 0.6;
}
}

&:focus {
outline: 0;
// Default button

.btn {
$bg-hover: #f3f4f6; // custom gray

color: $text-gray-dark;
background-color: $bg-gray-light;
border-color: $border-color-button;
// stylelint-disable-next-line primer/box-shadow
box-shadow: 0 1px 0 rgba($gray-400, 0.1), inset 0 1px 0 rgba($white, 0.25);

&:focus,
&.focus {
border-color: transparent;
box-shadow: $btn-input-focus-shadow;
}

&:hover,
&.hover {
background-color: $bg-hover;
}

&:active,
&.selected,
&[aria-selected=true],
[open] > & {
background-color: $bg-hover;
border-color: $border-gray-dark;
box-shadow: none;
}

&:disabled,
&.disabled,
&[aria-disabled=true] {
cursor: default;
// Repeat `background-position` because `:hover`
background-position: 0 0;
// stylelint-disable-next-line primer/colors
color: $gray-400;
background-color: $bg-hover;
border-color: $border-color-button;
}
}

// Primary button

.btn-primary {
$bg: #159739; // custom green
$border-color: $green-600;
$shadow: $green-900;
$box-shadow: 0 1px 0 rgba($shadow, 0.1), inset 0 1px 0 rgba($white, 0.03);

$bg-hover: #138934; // custom green
$border-hover: $green-700;
$bg-disabled: #94d3a2; // custom green

color: $text-white;
// stylelint-disable-next-line primer/colors
background-color: $bg;
border-color: $border-color;
box-shadow: $box-shadow;

&:focus,
&.focus {
// stylelint-disable-next-line primer/colors
background-color: $bg;
border-color: transparent;
// stylelint-disable-next-line primer/box-shadow
box-shadow: 0 0 0 3px rgba($bg, 0.4);
}

&:hover,
&.hover {
background-color: $bg-hover;
border-color: $border-hover;
}

&:active,
&.selected,
&[aria-selected=true] {
background-image: none;
&[aria-selected=true],
[open] > & {
background-color: $bg-hover;
border-color: $border-color;
// stylelint-disable-next-line primer/box-shadow
box-shadow: inset 0 1px 0 rgba($shadow, 0.2);
}

&:disabled,
&.disabled,
&[aria-disabled=true] {
// stylelint-disable-next-line primer/colors
color: rgba($text-white, 0.5);
background-color: $bg-disabled;
// stylelint-disable-next-line primer/borders
border-color: rgba($green-600, 0.1);
box-shadow: $box-shadow;
}

.Counter {
// stylelint-disable-next-line primer/colors
color: darken($bg, 6%);
background-color: $bg-white;
}

.octicon {
color: inherit;
}
}

// Mixin: btn-inverse-on-hover
//
// Args: $color, $bg, $border
@mixin btn-inverse-on-hover( $color, $bg, $border, $shadow ) {
color: $color;

&:focus {
border-color: transparent;
box-shadow: 0 0 0 3px rgba($bg, 0.4);
}

&:hover {
color: $text-white;
background-color: $bg;
border-color: $border;
box-shadow: 0 1px 0 rgba($shadow, 0.1), inset 0 1px 0 rgba($white, 0.03);

&:focus {
box-shadow: 0 0 0 3px rgba($bg, 0.4);
}

.Counter {
background-color: darken($bg, 12%);
}

.octicon {
color: inherit;
}
}

&:active,
&.selected,
&[aria-selected=true],
[open] > & {
color: $text-white;
background-color: $bg;
border-color: $border;
box-shadow: inset 0 1px 0 rgba($shadow, 0.2);
}

&:disabled,
&.disabled,
&[aria-disabled=true] {
color: rgba($color, 0.5);
background-color: #f3f4f6;
border-color: $border-color-button;
box-shadow: 0 1px 0 rgba($gray-400, 0.1), inset 0 1px 0 rgba($white, 0.25);
}

.Counter {
color: inherit;
background-color: rgba($color, 0.1);
}
}

.btn { @include btn-solid($text-gray-dark, $gray-000, darken($gray-100, 2%)); }
.btn-primary { @include btn-solid($text-white, $green-400, $green-500); }
.btn-blue { @include btn-solid($text-white, lighten($blue-500, 8%), darken($blue-500, 2%)); }
.btn-danger { @include btn-inverse($red-600, $gray-000, darken($gray-100, 2%)); }
// Danger button

.btn-danger {
@include btn-inverse-on-hover(
$color: $text-red,
$bg: $red-600,
$border: $red-700,
$shadow: $red-900
);
}

// Outline button
//
// For when we need a linky-action that's not too heavy in busier
// areas like conversation timelines.

.btn-outline {
@include btn-outline($text-blue);
@include btn-inverse-on-hover(
$color: $blue-600,
$bg: $blue-500,
$border: $blue-600,
$shadow: $blue-900
);
}

// Solid buttons TODO: Deprecate?
//
//
.btn-blue {
@include btn-solid(
$text-white,
lighten($blue-500, 8%),
darken($blue-500, 2%)
);
}

// Social button count
// TODO: Deprecate? Use BtnGroup instead?

.btn-with-count {
float: left;
border-top-right-radius: 0;
Expand All @@ -89,18 +269,18 @@
// Tweak `line-height` to make them smaller.
.btn-sm {
// stylelint-disable-next-line primer/spacing
padding: 3px 10px;
padding: 3px 12px;
font-size: $font-size-small;
// stylelint-disable-next-line primer/typography
line-height: 20px;
}

// Large button adds more padding around text. Use font-size utils to increase font-size.. e.g, <p class="text-gamma"><button class="btn btn-large btn-primary" type="button">Big green button</button></p>
.btn-large {
padding: $em-spacer-6 1.25em;
padding: $em-spacer-6 1.5em;
font-size: inherit;
// stylelint-disable-next-line primer/borders
border-radius: 6px;
border-radius: 0.5em;
}

// Full-width button
Expand Down Expand Up @@ -148,9 +328,10 @@
// Typically used as a "cancel" button next to a .btn
.btn-invisible {
color: $text-blue;
background-color: $bg-white; // Reset default gradient backgrounds and colors
background-image: none;
background-color: transparent; // Reset default gradient backgrounds and colors
border: 0;
border-radius: 0;
box-shadow: none;

&:hover,
&:active,
Expand Down
4 changes: 3 additions & 1 deletion src/buttons/misc.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
.social-count {
float: left;
// stylelint-disable-next-line primer/spacing
padding: 3px 10px;
padding: 3px 12px;
font-size: $font-size-small;
font-weight: $font-weight-bold;
// stylelint-disable-next-line primer/typography
Expand All @@ -77,6 +77,8 @@
border-left: 0;
border-top-right-radius: $border-radius;
border-bottom-right-radius: $border-radius;
// stylelint-disable-next-line primer/box-shadow
box-shadow: 0 1px 0 rgba($gray-400, 0.1), inset 0 1px 0 rgba($white, 0.25);

&:hover,
&:active {
Expand Down
5 changes: 5 additions & 0 deletions src/support/mixins/buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@

// TODO: See if the mixins below can be deprecated
// Might still be needed for .btn-blue
// ------------------------------------------------------------------

// Button color generator for primary and themed buttons

// New button hotness
Expand Down
Loading