Skip to content

Commit

Permalink
FFE-80. Update typography sizes and colors
Browse files Browse the repository at this point in the history
This commit changes the size of a few headers on desktop.
In addition, the color of the .ffe-sub-lead-paragraph is now black.

Changes was done in coordination with the designer Adrian Dick, so
you know it's good.
  • Loading branch information
Kristofer Selbekk committed Sep 30, 2016
1 parent e2d269f commit 02bdbc7
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 7 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## v.8.1.2

This release changes the font size and / or line-height for h2, h4 and h6 for
**desktop** users. In addition, the color of `.ffe-sub-lead-paragraph` has
changed from `@ffe-blue-royal` to `@ffe-black`.

**Visual diff**

Consumers of `.ffe-h2`, `.ffe-h4`, `.ffe-h6` and `.ffe-sub-lead-paragraph`
will have to update their visual baseline images. Since the actual changes will
be small and have a very small chance of actually breaking a design, this
change was introduced as a patch.

## v.8.1.1

This release changes `@ffe-sand` from `#E1D5AF` to `#F8F5EB`
Expand Down
4 changes: 2 additions & 2 deletions less/font-sizes.less
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
});

.ffe-fontsize(@breakpoint-md, {
font-size: 36px;
font-size: 32px;
});
}

Expand Down Expand Up @@ -74,4 +74,4 @@
.ffe-fontsize(@breakpoint-md, {
font-size: 16px;
});
}
}
9 changes: 5 additions & 4 deletions less/typography.less
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,17 @@

.ffe-lead-paragraph, .ffe-sub-lead-paragraph {
margin-top: 0;
color: @ffe-blue-royal;
font-family: "MuseoSans-500", arial, sans-serif;
}

.ffe-lead-paragraph {
color: @ffe-blue-royal;
font-size: 18px;
line-height: 28px;
}

.ffe-sub-lead-paragraph {
color: @ffe-black;
font-size: 16px;
line-height: 26px;
}
Expand Down Expand Up @@ -240,23 +241,23 @@
}

.ffe-h2 {
line-height: 50px;
line-height: 44px;
}

.ffe-h3 {
line-height: 38px;
}

.ffe-h4 {
line-height: 28px;
line-height: 24px;
}

.ffe-h5 {
line-height: 24px;
}

.ffe-h6 {
line-height: 24px;
line-height: 22px;
}

.ffe-lead-paragraph {
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-core",
"version": "8.1.1",
"version": "8.1.2",
"description": "Rammeverk for Felles Front End",
"less": "ffe.less",
"main": "index.js",
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.
Binary file modified visual-tests/baseline-screenshots/typo/plain/firefox-large.png
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/typo/plain/firefox-medium.png
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/typo/plain/firefox-small.png
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 02bdbc7

Please sign in to comment.