Skip to content

Commit

Permalink
Merge pull request #8 in FFE/ffe-accordion from FFE-126-small-redesig…
Browse files Browse the repository at this point in the history
…n to master

* commit '722a98d5cf4133c719ffed5ae55a156574a407b3':
  FFE-126. Update visual baselines
  FFE-126. Bump version and fix npm start
  FFE-126. Update design
  • Loading branch information
Kristofer Selbekk committed Nov 29, 2016
2 parents 8da1e76 + e221f33 commit 3c48aed
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 15 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#CHANGELOG
# CHANGELOG

## Version 1.3.1
* Design changes, including normalizing content and title padding, removing text-decoration and correcting colors

## Version 1.3.0
* Add visual tests and examples
Expand Down
22 changes: 10 additions & 12 deletions less/ffe-accordion.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,18 @@
}

.ffe-accordion-item {
margin-bottom: 10px;
position: relative;
list-style: none;

&--white {
border-top: solid @ffe-grey-light 1px;

&:last-of-type {
border-bottom: solid #d8d8d8 1px;
border-bottom: solid @ffe-grey-light 1px;
}
}

&--blue {
margin-bottom: 10px;
}

&--open {
margin-bottom: 20px;
}
Expand All @@ -37,7 +34,7 @@
transition: transform .3s, fill .3s;

&--white {
fill: @ffe-grey-light;
fill: @ffe-blue-royal-light-wcag;
}

&--blue {
Expand All @@ -54,18 +51,20 @@
}

&__content {
padding-right: 40px;
padding: 10px 25px 0px;

&--blue {
padding: 10px 25px 0px;
&--white {
padding-top: 0;
}
}

&__toggler {
cursor: pointer;
display: inline-block;
width: 100%;
padding: 20px 40px 20px 0;
padding: 20px 40px 20px 20px;
text-decoration: none;
transition: background-color .3s,color .3s;
width: 100%;

&--white {
color: @ffe-blue-royal-light-wcag;
Expand All @@ -82,7 +81,6 @@
&--blue {
color: @ffe-blue-royal;
background-color: @ffe-blue-royal-light-20;
padding-left: 20px;
border-radius: 3px;

&:hover, &:focus {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "ffe-accordion",
"version": "1.3.0",
"version": "1.3.1",
"description": "Accordion component for FFE.",
"main": "index.js",
"scripts": {
"compile": "npm run lint && lessc examples/examples.less examples/examples.css && cp -R node_modules/ffe-core/fonts/ examples/fonts/ && echo \"$(date +%T): Updated example\"",
"lint": "lessc --lint examples/examples.less",
"start": "opn examples/example.html & watch \"npm run -s compile\" less/",
"start": "opn examples/accordion.html & watch \"npm run -s compile\" less/",
"test:nsp": "nsp check",
"test": "npm run lint && npm run test:nsp",
"has-published": "npm show . versions -s | grep -q ${npm_package_version}",
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/accordion/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 3c48aed

Please sign in to comment.