Skip to content

adds no-select() and adjusts the color tolerance of buttons #223

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
jescalan merged 1 commit into from
Sep 30, 2015
Merged

adds no-select() and adjusts the color tolerance of buttons #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions axis/buttons.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
button($color = $default-color, $size = "medium", $text-color = null)

// color detection and changes
$text-color = (light($color) ? #494949 : #fff) unless $text-color
$text-color = (light(darken($color, 22%)) ? rgba(#000, .7) : #fff) unless $text-color
$parsed-size = -parse($size)

// now that we've got numbers, let's work some proportions
Expand All @@ -68,7 +68,9 @@ button($color = $default-color, $size = "medium", $text-color = null)
text-align: center
text-decoration: none
display: inline-block
border none
border: none
no-select()

&:hover, &:focus
background-color: darken($color, 5%)
color: darken($text-color, 3%)
Expand Down Expand Up @@ -103,8 +105,8 @@ glossy-button($color = $default-color, $size = "medium", $text-color = null, $sh
if $text-color
$dark-text = light($text-color) ? true : false
else
$dark-text = light($color) ? false : true
$text-color = $dark-text ? white : #494949
$dark-text = light(darken($color, 22%)) ? false : true
$text-color = $dark-text ? white : rgba(#000, .7)

$shadow-color = $dark-text ? rgba(#000,.1) : rgba(#fff,.3) unless $shadow-color
$hover-color = $dark-text ? rgba(#000,.2) : rgba(#fff,.5) unless $hover-color
Expand Down Expand Up @@ -135,6 +137,7 @@ glossy-button($color = $default-color, $size = "medium", $text-color = null, $sh
text-align: center
text-decoration: none
display: inline-block
no-select()

&:hover, &:focus
background-position: 0 unit($height * -1, 'px')
Expand Down
10 changes: 10 additions & 0 deletions test/fixtures/additive/framework.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,11 @@ textarea.error:focus {
text-decoration: none;
display: inline-block;
border: none;
-webkit-touch-callout: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.btn:hover,
.btn:focus {
Expand Down Expand Up @@ -422,6 +427,11 @@ textarea.error:focus {
text-align: center;
text-decoration: none;
display: inline-block;
-webkit-touch-callout: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.btn-fancy:hover,
.btn-fancy:focus {
Expand Down
5 changes: 5 additions & 0 deletions test/fixtures/buttons/button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
text-decoration: none;
display: inline-block;
border: none;
-webkit-touch-callout: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.button:hover,
.button:focus {
Expand Down
5 changes: 5 additions & 0 deletions test/fixtures/buttons/glossy-button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
text-align: center;
text-decoration: none;
display: inline-block;
-webkit-touch-callout: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.glossy-button:hover,
.glossy-button:focus {
Expand Down