Skip to content

Commit

Permalink
FFE-126. Fix mess from 1.3.1
Browse files Browse the repository at this point in the history
This commit fixes a visual bug introduced (by yours truly) in 1.3.1,
where the white accordion items got taller than they needed to be.

This fix retains the original intent of the change in 1.3.1 by giving
the expanded content some extra bottom padding, but doesn't affect
the un-expanded look and feel in the same way.

Sorry, my bad.
  • Loading branch information
Kristofer Selbekk committed Nov 29, 2016
1 parent 3c48aed commit dd36302
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# CHANGELOG

## Version 1.3.2
* Remove .accordion-item bottom margin for white accordions that was introduced in 1.3.1.

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

Expand Down
8 changes: 6 additions & 2 deletions less/ffe-accordion.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,22 @@
}

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

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

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

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

&--open {
margin-bottom: 20px;
}
Expand Down Expand Up @@ -54,7 +58,7 @@
padding: 10px 25px 0px;

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

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffe-accordion",
"version": "1.3.1",
"version": "1.3.2",
"description": "Accordion component for FFE.",
"main": "index.js",
"scripts": {
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 dd36302

Please sign in to comment.