Skip to content

Commit

Permalink
Release/4.0.18 (#563)
Browse files Browse the repository at this point in the history
* Replace formatLineHeight with new method (#561)
  • Loading branch information
majaklajic authored Dec 17, 2020
1 parent c6c59fd commit 2ec3645
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shoutem/ui",
"version": "4.0.17",
"version": "4.0.18",
"description": "Styleable set of components for React Native applications",
"dependencies": {
"@shoutem/animation": "~0.12.4",
Expand Down
12 changes: 6 additions & 6 deletions theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ export default (variables = defaultThemeVariables) => ({
'shoutem.ui.Heading': {
[INCLUDE]: ['text'],

lineHeight: formatLineHeight(variables.heading.fontSize),
lineHeight: calculateLineHeight(variables.heading.fontSize),
...variables.heading,
fontFamily: resolveFontFamily(
variables.heading.fontFamily,
Expand All @@ -454,7 +454,7 @@ export default (variables = defaultThemeVariables) => ({
'shoutem.ui.Title': {
[INCLUDE]: ['text'],

lineHeight: formatLineHeight(variables.title.fontSize),
lineHeight: calculateLineHeight(variables.title.fontSize),
...variables.title,
fontFamily: resolveFontFamily(
variables.title.fontFamily,
Expand All @@ -468,7 +468,7 @@ export default (variables = defaultThemeVariables) => ({
'shoutem.ui.Subtitle': {
[INCLUDE]: ['text'],

lineHeight: formatLineHeight(variables.subtitle.fontSize),
lineHeight: calculateLineHeight(variables.subtitle.fontSize),
...variables.subtitle,
fontFamily: resolveFontFamily(
variables.subtitle.fontFamily,
Expand All @@ -482,7 +482,7 @@ export default (variables = defaultThemeVariables) => ({
'shoutem.ui.Caption': {
[INCLUDE]: ['text'],

lineHeight: formatLineHeight(variables.caption.fontSize),
lineHeight: calculateLineHeight(variables.caption.fontSize),
letterSpacing: 0.5,
...variables.caption,
fontFamily: resolveFontFamily(
Expand Down Expand Up @@ -1613,7 +1613,7 @@ export default (variables = defaultThemeVariables) => ({
},

color: variables.navBarText.color,
lineHeight: formatLineHeight(variables.navBarText.fontSize),
lineHeight: calculateLineHeight(variables.navBarText.fontSize),
...variables.navBarText,
fontFamily: resolveFontFamily(
variables.navBarText.fontFamily,
Expand Down Expand Up @@ -1756,7 +1756,7 @@ export default (variables = defaultThemeVariables) => ({

flex: 1,
textAlign: 'center',
lineHeight: formatLineHeight(variables.navBarText.fontSize),
lineHeight: calculateLineHeight(variables.navBarText.fontSize),
...variables.navBarText,
fontFamily: resolveFontFamily(
variables.navBarText.fontFamily,
Expand Down

0 comments on commit 2ec3645

Please sign in to comment.