From 4534fb719dc2f670e33d8c53eb1392fa71184877 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 26 Jan 2016 17:40:56 +0100 Subject: [PATCH 1/2] fix typography names --- src/scss/cdb-components/buttons.scss | 32 ++++++++++++------------- src/scss/cdb-components/typography.scss | 22 ++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/scss/cdb-components/buttons.scss b/src/scss/cdb-components/buttons.scss index d2cf5e5..adb1478 100644 --- a/src/scss/cdb-components/buttons.scss +++ b/src/scss/cdb-components/buttons.scss @@ -9,19 +9,19 @@ Layout Component: ```
@@ -30,19 +30,19 @@ Layout Component:
@@ -103,19 +103,19 @@ Layout Component: ```
@@ -124,19 +124,19 @@ Layout Component:
diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index 3d65171..838bbfc 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -5,18 +5,18 @@ # Typography ``` -

Open Sans 26/34 Regular

-

Open Sans 16/22 Regular

-

Open Sans 12/16 Semibold

-

Open Sans 12/16 Semibold

-

Open Sans 10/14 Semibold

-

Open Sans 10/14 Regular

+

Open Sans 26/34 Regular

+

Open Sans 16/22 Regular

+

Open Sans 12/16 Semibold

+

Open Sans 12/16 Semibold

+

Open Sans 10/14 Semibold

+

Open Sans 10/14 Regular

``` */ @import '../cdb-variables/sizes'; -.Text { +.CDB-Text { font-family: 'Open Sans'; $sFontWeight-normal: 400; @@ -28,22 +28,22 @@ } } -.Size-huge { +.CDB-Size-huge { font-size: $sFontSize-huge; line-height: $sLineHeight-huge; } -.Size-large { +.CDB-Size-large { font-size: $sFontSize-large; line-height: $sLineHeight-large; } -.Size-medium { +.CDB-Size-medium { font-size: $sFontSize-medium; line-height: $sLineHeight-medium; } -.Size-small { +.CDB-Size-small { font-size: $sFontSize-small; line-height: $sLineHeight-small; } From a274de714c0b14f8f7ccdf15d5acfdd78955a959 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 26 Jan 2016 18:00:58 +0100 Subject: [PATCH 2/2] fix example --- src/scss/cdb-components/typography.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index 838bbfc..d9ec4aa 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -8,7 +8,7 @@

Open Sans 26/34 Regular

Open Sans 16/22 Regular

Open Sans 12/16 Semibold

-

Open Sans 12/16 Semibold

+

Open Sans 12/16 Regular

Open Sans 10/14 Semibold

Open Sans 10/14 Regular

```