From 0c08695652ea818c130b23eb9cdebf4b4123eab9 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 3 Feb 2016 19:19:42 +0100 Subject: [PATCH 1/4] add first infoBoxes --- src/scss/cdb-components/boxes.scss | 61 ++++++++++++++++++++++++++++ src/scss/cdb-components/buttons.scss | 1 - src/scss/cdb-utilities/helpers.scss | 3 ++ src/scss/cdb-variables/_colors.scss | 1 + 4 files changed, 65 insertions(+), 1 deletion(-) diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/boxes.scss index 3c104b4..8a60bec 100644 --- a/src/scss/cdb-components/boxes.scss +++ b/src/scss/cdb-components/boxes.scss @@ -10,6 +10,7 @@ ``` */ +@import '../cdb-utilities/mixins'; @import '../cdb-variables/sizes'; @import '../cdb-variables/colors'; @@ -19,3 +20,63 @@ background: $cWhite; box-shadow: 0 $baseSize $baseSize * 2 0 rgba(0, 0, 0, 0.16); } + +/* SG +# Boxes/Info Boxes + + +``` +
+

ABOUT PREVIEW MODE

+

He's a queer man, Captain Ahab—so some thinkbut a good one. Oh, thou'lt like him well enough; no fear, no fear

+ +
+
+
+
+
+

ABOUT PREVIEW MODE

+

He's a queer man, Captain Ahab—so some thinkbut a good one. Oh, thou'lt like him well enough; no fear, no fear

+ +
+``` +*/ + +.CDB-InfoBox { + padding: 12px 16px; + border-radius: 4px; + background: $cThirdBackground; + &.is-alert { + background: rgba($cHighlightYellow, 0.60); + } +} + +.CDB-InfoBox-footer { + @include display-flex(); + @include align-items(center); +} + +.CDB-InfoBox-footerItem { + @include flex(1); + &.is-right { + text-align: right; + } +} diff --git a/src/scss/cdb-components/buttons.scss b/src/scss/cdb-components/buttons.scss index adb1478..0ecc069 100644 --- a/src/scss/cdb-components/buttons.scss +++ b/src/scss/cdb-components/buttons.scss @@ -146,7 +146,6 @@ Layout Component: .CDB-Button--secondary { border: 1px solid $cBlue; - background: $cWhite; color: $cBlue; &:hover { diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index cee8ce7..13b03a0 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -27,6 +27,9 @@ .u-lSpace--xl { margin-left: 12px; } +.u-bSpace--m { + margin-bottom: 8px; +} .u-iBlock { @include inline-block(); } diff --git a/src/scss/cdb-variables/_colors.scss b/src/scss/cdb-variables/_colors.scss index 7c7ff2d..fc0bc81 100644 --- a/src/scss/cdb-variables/_colors.scss +++ b/src/scss/cdb-variables/_colors.scss @@ -29,3 +29,4 @@ $cPublic: #9BC63B; $cLink: #FEB100; $cPassword: #FB7B23; $cError: #F15743; +$cHighlightYellow: #FFFFC0; From 5c5f41de31ddceda43c51e38dd18fa56226a814b Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 3 Feb 2016 22:49:13 +0100 Subject: [PATCH 2/4] change modify --- src/scss/cdb-components/boxes.scss | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/boxes.scss index 8a60bec..4211c1d 100644 --- a/src/scss/cdb-components/boxes.scss +++ b/src/scss/cdb-components/boxes.scss @@ -29,16 +29,7 @@

ABOUT PREVIEW MODE

He's a queer man, Captain Ahab—so some thinkbut a good one. Oh, thou'lt like him well enough; no fear, no fear

-
    -
  • -

    CLOSE

    -
    • -
  • - -
    • -
+

CLOSE



@@ -50,7 +41,7 @@

  • CLOSE

    • -
  • +
  • @@ -76,7 +67,8 @@ .CDB-InfoBox-footerItem { @include flex(1); - &.is-right { - text-align: right; - } +} + +.CDB-InfoBox-footerItem--right { + text-align: right; } From 1545b89d68e6d56a9d92235418abb78497e2f9c5 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 3 Feb 2016 22:56:37 +0100 Subject: [PATCH 3/4] fix bad merge --- src/scss/cdb-utilities/helpers.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index 73e391a..1cb8a7b 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -30,11 +30,6 @@ .u-lSpace--xl { margin-left: 12px; } -<<<<<<< HEAD -.u-bSpace--m { - margin-bottom: 8px; -} -======= .u-bSpace { margin-bottom: 4px; } @@ -42,7 +37,6 @@ margin-bottom: 8px; } ->>>>>>> ece198db8f1ecfae1a76ecaf706f2afebec3e0d9 .u-iBlock { @include inline-block(); } From cc648bb24262b99681f0dfaadaf5b038243d0712 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Thu, 4 Feb 2016 09:56:03 +0100 Subject: [PATCH 4/4] fix hound --- src/scss/cdb-components/boxes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/boxes.scss index 4211c1d..77f6653 100644 --- a/src/scss/cdb-components/boxes.scss +++ b/src/scss/cdb-components/boxes.scss @@ -56,7 +56,7 @@ border-radius: 4px; background: $cThirdBackground; &.is-alert { - background: rgba($cHighlightYellow, 0.60); + background: rgba($cHighlightYellow, 0.6); } }