Skip to content

Button edge-case refinements #84

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

Closed
wants to merge 13 commits into from
Closed

Button edge-case refinements #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1a89187
Focused button hover border
Mar 30, 2015
08608c0
Selected hover state
Mar 30, 2015
ee5ad06
Primary Button disabled active state
Mar 30, 2015
1971918
Primary Button disabled contrast
Mar 30, 2015
4698263
Primary Button text-shadow contrast
Mar 30, 2015
838660d
Primary Button text shadows
Mar 30, 2015
eb5b91d
Primary Button readbility
Mar 31, 2015
446db56
Primary Button disabled state
Mar 31, 2015
ccecd78
Darken overall green color
Mar 31, 2015
ea29d32
Primary Button focus overrides
Mar 31, 2015
3c4a807
Button group focus state z-order
Mar 31, 2015
89ff9fb
Generated CSS / Stats
Mar 31, 2015
6aee669
Selected hover states
Mar 31, 2015
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
18 changes: 9 additions & 9 deletions css/.primer-stats.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
### css/primer.css

- **Total Stylesheets:** 1
- **Total Stylesheet Size:** 30697
- **Total Stylesheet Size:** 30878
- **Total Media Queries:** 1
- **Total Rules:** 405
- **Selectors Per Rule:** 1.4419753086419753
- **Total Selectors:** 584
- **Identifiers Per Selector:** 2.1455479452054793
- **Specificity Per Selector:** 16.690068493150687
- **Total Rules:** 412
- **Selectors Per Rule:** 1.4344660194174756
- **Total Selectors:** 591
- **Identifiers Per Selector:** 2.1539763113367174
- **Specificity Per Selector:** 16.830795262267344
- **Top Selector Specificity:** 50
- **Top Selector Specificity Selector:** .fullscreen-overlay-enabled.dark-theme .tooltipped .tooltipped-s:before
- **Total Id Selectors:** 0
- **Total Identifiers:** 1253
- **Total Declarations:** 997
- **Total Unique Colors:** 78
- **Total Identifiers:** 1273
- **Total Declarations:** 1001
- **Total Unique Colors:** 81
- **Total Important Keywords:** 1
2 changes: 1 addition & 1 deletion css/primer.css
View file
Open in desktop

Large diffs are not rendered by default.

60 changes: 42 additions & 18 deletions scss/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
border-color: #51a7e8;
outline: none;
box-shadow: 0 0 5px rgba(81, 167, 232, 0.5);

&:hover {
border-color: #51a7e8;
}
}

&:hover,
Expand All @@ -46,14 +50,17 @@

&:active,
&.selected,
&.selected:hover,
&.zeroclipboard-is-active {
background-color: #dcdcdc;
background-image: none;
border-color: #b5b5b5;
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15);
}

&.selected:hover {
background-color: darken(#dcdcdc, 5%);
}

&:disabled,
&.disabled {
&,
Expand All @@ -71,34 +78,41 @@
// Green primary button
.btn-primary {
color: #fff;
text-shadow: 0 -1px 0 rgba(0,0,0,0.15);
background-color: #60b044;
background-image: linear-gradient(#8add6d, #60b044);
border-color: darken(#60b044, 2%);
background-color: #63b346;
background-image: linear-gradient(#68b74b, #51a136);
border-color: darken(#51a136, 2%);

&:hover {
color: #fff;
background-color: darken(#60b044, 5%);
background-image: linear-gradient(darken(#8add6d, 5%), darken(#60b044, 5%));
border-color: #4a993e;
background-color: darken(#51a136, 5%);
background-image: linear-gradient(darken(#68b74b, 5%), darken(#51a136, 5%));
border-color: #438e2b;
}

&:active,
&.selected {
text-shadow: 0 1px 0 rgba(0,0,0,0.15);
background-color: darken(#60b044, 5%);
background-color: darken(#51a136, 5%);
background-image: none;
border-color: darken(#4a993e, 5%);
border-color: darken(#438e2b, 5%);
}

&.selected:hover {
background-color: darken(#51a136, 10%);
}

&:focus,
&:focus:hover {
border-color: #157bca;
}

&:disabled,
&.disabled {
&,
&:hover {
color: #fefefe;
background-color: #add39f;
background-image: linear-gradient(#c3ecb4, #add39f);
border-color: #b9dcac #b9dcac #a7c89b;
&:hover,
&:active {
color: #fff;
background-color: #b1d9a3;
border-color: #a6cc99;
}
}
}
Expand All @@ -122,6 +136,10 @@
border-color: darken(#cd504a, 15%);
}

&.selected:hover {
background-color: darken(#b33630, 5%);
}

&:disabled,
&.disabled {
&,
Expand All @@ -147,7 +165,6 @@
&:hover,
&:active,
&.selected,
&.selected:hover,
&.zeroclipboard-is-hover,
&.zeroclipboard-is-active {
color: #fff;
Expand All @@ -156,6 +173,10 @@
border-color: $brand-blue;
}

&.selected:hover {
background-color: darken($brand-blue, 5%);
}

&:disabled,
&.disabled {
&,
Expand Down Expand Up @@ -309,11 +330,14 @@

// Bring any button into forefront for proper borders given negative margin below
&:hover,
&:focus,
&:active,
&.selected {
z-index: 2;
}

&:focus {
z-index: 3;
}
}

// Tuck buttons into one another to prevent double border
Expand Down
2 changes: 1 addition & 1 deletion scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $brand-blue: #4183c4 !default;
$brand-gray-light: #999 !default;
$brand-gray: #666 !default;
$brand-gray-dark: #333 !default;
$brand-green: #6cc644 !default;
$brand-green: #63b346 !default;
$brand-red: #bd2c00 !default;
$brand-orange: #f93 !default;
$brand-purple: #6e5494 !default;
Expand Down