Skip to content
This repository has been archived by the owner on Nov 26, 2021. It is now read-only.

Commit

Permalink
Update to latest o-colors, o-loading, and o-typography (#105)
Browse files Browse the repository at this point in the history
  • Loading branch information
JakeChampion authored Jun 8, 2017
1 parent 453eaa2 commit b19a708
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 11 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ Requires Firefox (v38.0.0 to test with polyfills and mirror CircleCI)

## Migration Guide

Migrating from 3.0 to 4.0
-------------------------

Version 4 introduces the new majors of o-colors, o-loading, and o-typography. Updating to this new version will mean updating any other components that you have which are using o-colors, o-loading, or o-typography. There are no other breaking changes in this release.

Migrating from 2.0 to 3.0
-------------------------

Expand Down
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
],
"dependencies": {
"o-icons": ">=4.4.2 <6",
"o-colors": "^3.3.0",
"o-colors": "^4",
"o-fetch-jsonp": "^2.0.0",
"o-loading": "^1.0.0",
"o-typography": "^4.3.1",
"o-loading": "^2",
"o-typography": "^5",
"o-viewport": "^3.0.1"
}
}
2 changes: 1 addition & 1 deletion origami.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"demosDefaults": {
"sass": "demos/src/main.scss",
"js": "demos/src/demo.js",
"dependencies": "o-fonts@^2.1.0"
"dependencies": "o-fonts@^3"
},
"demos": [
{
Expand Down
14 changes: 7 additions & 7 deletions src/scss/_info.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
display: none;
}
.o-video__info-title {
@include oTypographySansBold(s);
@include oTypographySansBold(-2);
margin: 6px 0;
}
}
Expand All @@ -25,13 +25,13 @@
}

.o-video__info-title {
@include oTypographySansBold(l);
@include oTypographySansBold(2);
font-size: 28px;
line-height: 30px;
}

.o-video__info-description {
@include oTypographySans(m);
@include oTypographySans(-1);
line-height: 20px;
display: block;
}
Expand All @@ -57,20 +57,20 @@
}

.o-video__info-brand {
@include oTypographyLinkTopic;
@include oTypographyLink;
line-height: 15px;
display: inline-block;
padding: 2px 10px 3px;
text-transform: capitalize;
background-color: oColorsGetPaletteColor('claret-1');
color: white;
background-color: oColorsGetPaletteColor('claret');
color: oColorsGetPaletteColor('white');
&:empty {
display: none !important;
}
}

.o-video__info-title {
@include oTypographySansBold(m);
@include oTypographySansBold(-1);
line-height: 18px;
}

Expand Down

0 comments on commit b19a708

Please sign in to comment.