Rearrange text file variables

This commit is contained in:
Adam Wathan 2017-08-04 16:46:01 -04:00
parent df5867079c
commit 06bc7d428d

View file

@ -15,6 +15,15 @@
@font-size-2xl: (30rem / 16rem); // 30px
@font-size-3xl: (40rem / 16rem); // 40px
@text-size-scale:
'xs' @font-size-xs,
'sm' @font-size-sm,
'base' @font-size-base,
'lg' @font-size-lg,
'xl' @font-size-xl,
'2xl' @font-size-2xl,
'3xl' @font-size-3xl,
;
// Weights
@font-weight-hairline: 200;
@ -23,6 +32,14 @@
@font-weight-medium: 600;
@font-weight-bold: 700;
@text-weight-scale:
'hairline' @font-weight-hairline,
'thin' @font-weight-thin,
'regular' @font-weight-regular,
'medium' @font-weight-medium,
'bold' @font-weight-bold,
;
// Colors
@text-light: hsl(0, 0%, 100%);
@text-light-soft: hsl(0, 0%, 60%);
@ -34,29 +51,6 @@
@text-dark-softer: hsl(0, 0%, 65%);
@text-dark-softest: hsl(0, 0%, 75%);
// Sizes
@text-size-scale:
'xs' @font-size-xs,
'sm' @font-size-sm,
'base' @font-size-base,
'lg' @font-size-lg,
'xl' @font-size-xl,
'2xl' @font-size-2xl,
'3xl' @font-size-3xl,
;
.define-text-sizes(@text-size-scale; @screens);
// Weights
@text-weight-scale:
'hairline' @font-weight-hairline,
'thin' @font-weight-thin,
'regular' @font-weight-regular,
'medium' @font-weight-medium,
'bold' @font-weight-bold,
;
.define-text-weights(@text-weight-scale; @screens);
// Colors
@text-colors:
'light' @text-light,
'light-soft' @text-light-soft,
@ -68,7 +62,6 @@
'dark-softer' @text-dark-softer,
'dark-softest' @text-dark-softest,
;
.define-text-colors(@text-colors; @screens);
// Line heights
@leading-scale:
@ -77,6 +70,10 @@
'normal' 1.5,
'loose' 2,
;
.define-text-sizes(@text-size-scale; @screens);
.define-text-weights(@text-weight-scale; @screens);
.define-text-colors(@text-colors; @screens);
.define-leading-utilities(@leading-scale; @screens);
// Horizontal alignment