Skip to content

Commit

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

* commit '218894a49aad1f8826d9b6b9dddf1ed961ea0863':
  ffe-186 replace common transitions with variables from ffe-core
  • Loading branch information
antidecaf committed Apr 28, 2017
2 parents d7f0b21 + 290d34d commit fa329bc
Show file tree
Hide file tree
Showing 3 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

## Version 8.0.2

Replaced hardcoded transition properties with variables from ffe-core

## Version 8.0.1

Since buttons are no longer part of ffe-core, ffe-buttons was added as a peer dependency
Expand Down
8 changes: 4 additions & 4 deletions less/ffe-header.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.ffe-header {
margin-bottom: 30px;
transition: top 0.2s ease-in-out 0.6s;
transition: top @ffe-transition-duration @ffe-ease 0.6s;
width: 100%;
background: @ffe-white;
text-align: center;
Expand Down Expand Up @@ -68,7 +68,7 @@
display: table;
width: 100%;
padding: 30px 20px;
transition: padding 0.2s ease-in-out;
transition: padding @ffe-transition-duration @ffe-ease;
}
}

Expand All @@ -89,7 +89,7 @@
&__logo {
height: 40px;
margin: 0;
transition: all .2s ease-in-out;
transition: all @ffe-transition-duration @ffe-ease;

&--sm {
height: 26px;
Expand All @@ -102,7 +102,7 @@
font-family: MuseoSans-500, arial, sans-serif;
font-weight: normal;
line-height: 30px;
transition: font-size .2s ease-in-out;
transition: font-size @ffe-transition-duration @ffe-ease;
margin: 0;

&--sm {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffe-header",
"version": "8.0.1",
"version": "8.0.2",
"description": "Felles header for SpareBank 1",
"main": "index.js",
"scripts": {
Expand All @@ -21,7 +21,7 @@
"license": "ISC",
"peerDependencies": {
"ffe-buttons": "4.x",
"ffe-core": "9.x"
"ffe-core": "^9.2.0"
},
"devDependencies": {
"ffe-buttons": "^4.0.1",
Expand Down

0 comments on commit fa329bc

Please sign in to comment.