Skip to content

Commit

Permalink
Merge pull request #17 in FFE/ffe-tables from master_ffe-186-add-tran…
Browse files Browse the repository at this point in the history
…sition-variables to master

* commit 'e860b8e07fc990e8ef362544f4541b4a0fc0b4a1':
  ffe-186 replace common transitions with variables from ffe-core
  • Loading branch information
antidecaf committed May 5, 2017
2 parents 3e41393 + 968e593 commit 76afee7
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## v.5.1.1

* Replaced hardcoded transition properties with variables from ffe-core

## v.5.1.0

* Added modifier `--text-left` that left-aligns the content of headings and cells. Use it with `.ffe-responsive-table`.
Expand Down
4 changes: 2 additions & 2 deletions less/expandable-row.less
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}

&--expanded {
transition: background-color .2s .1s;
transition: background-color @ffe-transition-duration .1s;
animation: slide-row .2s cubic-bezier(0.5, 0.015, 0.485, 1.445);
background-color: @ffe-blue-ice;
opacity: 1;
Expand All @@ -44,7 +44,7 @@
width: 17px;
height: 17px;
fill: @ffe-blue-azure;
transition: transform .2s;
transition: transform @ffe-transition-duration @ffe-ease-in-out-back;
position: absolute;
top: 10px;
right: 5px;
Expand Down
2 changes: 1 addition & 1 deletion less/sortable-table.less
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
vertical-align: middle;
fill: @ffe-blue-royal;
margin-left: 8px;
transition: transform .2s;
transition: transform @ffe-transition-duration @ffe-ease-in-out-back;

&--descending {
transform: rotate(180deg);
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffe-tables",
"version": "5.1.0",
"version": "5.1.1",
"main": "less/tables.less",
"scripts": {
"compile": "npm run lint && lessc example/example.less example/example.css && cp -R node_modules/ffe-core/fonts/ example/fonts/ && echo \"$(date +%T): Updated example\"",
Expand Down Expand Up @@ -29,7 +29,7 @@
}
],
"devDependencies": {
"ffe-core": "9.x",
"ffe-core": "^9.2.0",
"ffe-visual-tests-support": "2.1.1",
"less": "^2.7.2",
"nsp": "^2.6.3",
Expand All @@ -39,7 +39,7 @@
"watch": "^1.0.2"
},
"peerDependencies": {
"ffe-core": "9.x"
"ffe-core": "^9.2.0"
},
"publishConfig": {
"registry": "***REMOVED***"
Expand Down

0 comments on commit 76afee7

Please sign in to comment.