Skip to content

Commit

Permalink
Merge pull request #25 in FFE/ffe-buttons from master_FFE-140-color-a…
Browse files Browse the repository at this point in the history
…djustments to master

* commit '8787a5acc82cbc46ea74f3ff89dec72b5468e523':
  FFE-140 change primary button background color to reflect design guidelines
  • Loading branch information
antidecaf committed Mar 9, 2017
2 parents 38cc0c1 + 2bdc7c0 commit 33da3f9
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 8 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## v2.5.6
* Changed primary button background color to @ffe-blue-royal-light-wcag

## v2.5.5
* According to Bodil Egge, icons in buttons are 14x14 px in "verktøykassa", not 18x18 px. This change only affects the size of the icon, the button's outer dimensions are not changed.

Expand Down
8 changes: 4 additions & 4 deletions less/primary-button.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.ffe-primary-button {
background-color: @ffe-blue-flat;
background-color: @ffe-blue-royal-light-wcag;
border: 2px solid transparent;
border-radius: 4px;
color: @ffe-white;
Expand All @@ -20,18 +20,18 @@
width: 100%;

&:focus {
background-color: darken(@ffe-blue-flat, 5%);
background-color: darken(@ffe-blue-royal-light-wcag, 5%);
box-shadow: 0 0 0 2px @ffe-blue-focus;
outline: 0;
}

&:hover {
background-color: darken(@ffe-blue-flat, 5%);
background-color: darken(@ffe-blue-royal-light-wcag, 5%);
.ffe-buttons-shadow-hover();
}

&:active {
background-color: darken(@ffe-blue-flat, 10%);
background-color: darken(@ffe-blue-royal-light-wcag, 10%);
.ffe-buttons-shadow-active();
}

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffe-buttons",
"version": "2.5.5",
"version": "2.5.6",
"main": "less/buttons.less",
"scripts": {
"compile": "npm run lint && lessc example/example.less example/example.css && cp -R node_modules/ffe-core/fonts/ example/ && echo \"$(date +%T): Updated example\"",
Expand Down Expand Up @@ -29,8 +29,8 @@
}
],
"devDependencies": {
"ffe-core": "^8.1.2",
"ffe-visual-tests-support": "2.0.0",
"ffe-core": "^8.2.4",
"ffe-visual-tests-support": "2.1.0",
"less": "^2.7.1",
"nsp": "^2.2.0",
"opn-cli": "^3.1.0",
Expand All @@ -39,7 +39,7 @@
"watch": "^0.19.2"
},
"peerDependencies": {
"ffe-core": "^8.0.2"
"ffe-core": "^8.2.4"
},
"publishConfig": {
"registry": "***REMOVED***"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visual-tests/baseline-screenshots/example/plain/firefox-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 33da3f9

Please sign in to comment.