Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update typography letterSpacing defaults to pixels #153

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/atoms/bodyStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ export class BodyStyles extends Atom {
super("Body Styles", false, atoms);
this.addDependency(atoms.colorThemes);
const fs = atoms.fontsSettings;
this.body1 = new TypographyStyling("Body 1", this, true, fs, 16, 500, 160, 2);
this.body1Bold = new TypographyStyling("Body 1 - Bold", this, true, fs, 16, 700, 160, 2);
this.body2 = new TypographyStyling("Body 2", this, true, fs, 14, 600, 160, 1.75);
this.body2Bold = new TypographyStyling("Body 2 - Bold", this, true, fs, 14, 700, 160, 1.75);
this.body3 = new TypographyStyling("Body 3", this, true, fs, 18, 500, 160, 2.25);
this.body3Bold = new TypographyStyling("Body 3 - Bold", this, true, fs, 18, 700, 160, 2.25);
this.body1 = new TypographyStyling("Body 1", this, true, fs, 16, 500, 160, 0.02*16);
this.body1Bold = new TypographyStyling("Body 1 - Bold", this, true, fs, 16, 700, 160, 0.02*16);
this.body2 = new TypographyStyling("Body 2", this, true, fs, 14, 600, 160, 0.0175*14);
this.body2Bold = new TypographyStyling("Body 2 - Bold", this, true, fs, 14, 700, 160, 0.0175*14);
this.body3 = new TypographyStyling("Body 3", this, true, fs, 18, 500, 160, 0.0225*18);
this.body3Bold = new TypographyStyling("Body 3 - Bold", this, true, fs, 18, 700, 160, 0.0225*18);
}

public deserialize(obj: any) {
Expand Down
2 changes: 1 addition & 1 deletion src/atoms/inputBackground.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export interface InputBackgroundVariables {
const log = new Logger("ib");

/**
* The input backbround atom.
* The input background atom.
* @category Atoms
*/
export class InputBackground extends Atom implements IInputBackground {
Expand Down
32 changes: 16 additions & 16 deletions src/atoms/smallTextStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,22 @@ export class SmallTextStyles extends Atom {
super("Small Text Styles", false, atoms);
this.addDependency(atoms.colorThemes);
const fs = atoms.fontsSettings;
this.subtitle1 = new TypographyStyling("Subtitle 1", this, true, fs, 16, 600, 110, 2);
this.subtitle2 = new TypographyStyling("Subtitle 2", this, true, fs, 14, 700, 110, 1.75);
this.caption = new TypographyStyling("Caption", this, true, fs, 12, 600, 110, 1.5);
this.captionBold = new TypographyStyling("Caption Bold", this, true, fs, 12, 700, 110, 1.5);
this.overline = new TypographyStyling("Overline", this, true, fs, 10, 600, 110, 0.12);
this.overlineLarge = new TypographyStyling("Overline Large", this, true, fs, 14, 600, 110, 1.75);
this.overlineExtraLarge = new TypographyStyling("Overline Extra Large", this, true, fs, 16, 700, 110, 2);
this.label1 = new TypographyStyling("Label 1", this, true, fs, 14, 700, 110, 1.75);
this.label1AllCaps = new TypographyStyling("LABEL 1 ALL CAPS", this, true, fs, 14, 700, 110, 1.75);
this.label2 = new TypographyStyling("Label 2", this, true, fs, 12, 700, 110, 1.5);
this.label2AllCaps = new TypographyStyling("LABEL 2 ALL CAPS", this, true, fs, 12, 700, 110, 1.5);
this.labelSmall = new TypographyStyling("Label Small", this, true, fs, 10, 700, 110, 0.12);
this.callToAction = new TypographyStyling("Call To Action", this, true, fs, 16, 500, 110, 2);
this.callToActionSmall = new TypographyStyling("Call To Action Small", this, true, fs, 14, 600, 110, 1.75);
this.small = new TypographyStyling("Small", this, true, fs, 10.8, 500, 110, 0.13);
this.smallSemibold = new TypographyStyling("Small Semibold", this, true, fs, 10.8, 700, 110, 0.13);
this.subtitle1 = new TypographyStyling("Subtitle 1", this, true, fs, 16, 600, 110, 0.02*16);
this.subtitle2 = new TypographyStyling("Subtitle 2", this, true, fs, 14, 700, 110, 0.0175*16);
this.caption = new TypographyStyling("Caption", this, true, fs, 12, 600, 110, 0.015*12);
this.captionBold = new TypographyStyling("Caption Bold", this, true, fs, 12, 700, 110, 0.015*12);
this.overline = new TypographyStyling("Overline", this, true, fs, 10, 600, 110, 0.012*10);
this.overlineLarge = new TypographyStyling("Overline Large", this, true, fs, 14, 600, 110, 0.0175*14);
this.overlineExtraLarge = new TypographyStyling("Overline Extra Large", this, true, fs, 16, 700, 110, 0.02*16);
this.label1 = new TypographyStyling("Label 1", this, true, fs, 14, 700, 110, 0.0175*14);
this.label1AllCaps = new TypographyStyling("LABEL 1 ALL CAPS", this, true, fs, 14, 700, 110, 0.0175*14);
this.label2 = new TypographyStyling("Label 2", this, true, fs, 12, 700, 110, 0.015*12);
this.label2AllCaps = new TypographyStyling("LABEL 2 ALL CAPS", this, true, fs, 12, 700, 110, 0.015*12);
this.labelSmall = new TypographyStyling("Label Small", this, true, fs, 10, 700, 110, 0.012*10);
this.callToAction = new TypographyStyling("Call To Action", this, true, fs, 16, 500, 110, 0.012*16);
this.callToActionSmall = new TypographyStyling("Call To Action Small", this, true, fs, 14, 600, 110, 0.0175*14);
this.small = new TypographyStyling("Small", this, true, fs, 10.8, 500, 110, 0.013*10.8);
this.smallSemibold = new TypographyStyling("Small Semibold", this, true, fs, 10.8, 700, 110, 0.013*10.8);
}

public deserialize(obj: any) {
Expand Down
2 changes: 1 addition & 1 deletion src/atoms/statStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class StatStyles extends Atom {
constructor(atoms: IAtoms) {
super("Stat Styles", false, atoms);
this.addDependency(atoms.colorThemes);
this.stat = new TypographyStyling("Stat", this, true, atoms.fontsSettings, 48, 700, 110, 6);
this.stat = new TypographyStyling("Stat", this, true, atoms.fontsSettings, 48, 700, 110, 0.013*48);
}

public deserialize(obj: any) {
Expand Down