From ee39eb34910a5c025dca71ec3d35827397d5f232 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 24 Feb 2016 12:01:34 +0100 Subject: [PATCH 1/9] add first commit --- src/fonts/cartoIcon.eot | Bin 19808 -> 19808 bytes src/fonts/cartoIcon.ttf | Bin 19636 -> 19636 bytes src/fonts/cartoIcon.woff | Bin 12424 -> 12424 bytes src/scss/cdb-components/tags.scss | 18 +++++++++++++++++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 24a7919ed93c008db4aae7f544384aa46d3fbc14..e2ab33d7b8202c3173c2000e7453fb186aca4646 100644 GIT binary patch delta 52 zcmaDbi}ArM#tAk|vKkZZHZYwRoA_axl!k0Pzs*+$ZpL2>Kyc}kyBLh#ynyk5HvsZ4 B5-b1! delta 52 zcmaDbi}ArM#tAk|bIT{%ZD3j+Hu1wWsq(q;{5D@1xEX&j0KuhC#%3^j^8&^L-T*O0 B6Z!xE diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 0983811406dbafe16084f78b3b5a05981569e390..1e375d4710b63503ebacbcf66a8bf7a594482e43 100644 GIT binary patch delta 45 ucmdlolX1&T#tBYL=fx(vOq0@(jpw)d%D~O|ivb8OeR3Cr(Hp-U@CE>3BM-L# delta 45 ucmdlolX1&T#tBYL%flwROp_{~8_#d^m4Tb_7XuJn`ebYdqc?sz;0*wLwGg%d diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 3b22183b33fce5c755fa035a4668dff4e25856bb..cd9dcf88acfe474b2aa2a0fd513c9d26a31950cc 100644 GIT binary patch delta 59 zcmV-B0L1@@VTfUndIHZDv3$xXD1hIl@%%Pl8MqmL0Yw-teR3Cr(QnHCf9Hx|`~&22 RFff5c0b-dAUbAi~8V4@+8MOca delta 59 zcmV-B0L1@@VTfUndIG0bv3$xXC_t~R@%%Pl8MqmL0Yw-teKIzK(QnHCf9Hx|`~&22 RFff5c0bAM)Mzd}y8V4Sr8D#(f diff --git a/src/scss/cdb-components/tags.scss b/src/scss/cdb-components/tags.scss index 3df5a0b..ec60e43 100644 --- a/src/scss/cdb-components/tags.scss +++ b/src/scss/cdb-components/tags.scss @@ -2,7 +2,7 @@ // ---------------------------------------------- /* SG -# Tags +# Tags / Privacy ``` + +``` +*/ + +.CDB-Metadata { + border-radius: $baseSize / 2; + background: #FF5500; +} From f34ceb15755c2444f1215113306d995ed2a7066d Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 24 Feb 2016 18:47:18 +0100 Subject: [PATCH 2/9] add metadata --- src/fonts/cartoIcon.eot | Bin 19808 -> 19808 bytes src/fonts/cartoIcon.ttf | Bin 19636 -> 19636 bytes src/fonts/cartoIcon.woff | Bin 12424 -> 12424 bytes src/scss/cdb-components/tags.scss | 46 ++++++++++++++++++++++++++---- 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index e2ab33d7b8202c3173c2000e7453fb186aca4646..fad800695177b85b46522be1717bc227aefc6871 100644 GIT binary patch delta 55 zcmaDbi}ArM#tAmeAD8+}v|q=3b%M^s4^yRmmVS)qxB1Gz&G?G}2rhkIz7R%lUch+3 F8vv}i7wZ53 delta 55 zcmaDbi}ArM#tAmevKm1X?bk71IxjZy!&K=Y4cT~po39MqjK3Iw;L;~|F&Mph0pkI0 E06h2;qW}N^ diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 1e375d4710b63503ebacbcf66a8bf7a594482e43..b40f494864f50d9891952a522413fe738fee209c 100644 GIT binary patch delta 47 wcmdlolX1&T#tDwhS10I9beSscv-D#;zs*+$ZpL2>Kyc~v@`W&Z80L4NR*Z=?k delta 47 wcmdlolX1&T#tDwhm(Gh#beSq0q#+y6Z}XLboADO|5M27?E(W7FemUR`0F#Fh+W-In diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index cd9dcf88acfe474b2aa2a0fd513c9d26a31950cc..4aea4a369eb50e0a80b8251fd2bcc84019e0277e 100644 GIT binary patch delta 68 zcmV-K0K5N)VTfUna|ts5001`o)sQT)e90&(BkxMicz&C&4BU*rfFcZ+J}+Mgqu-SO a|IQV`_y@@4U|<4?0swC)4ui9ADH#X-dL0%3 delta 68 zcmV-K0K5N)VTfUna|tp4001`o($5yLe90&(qk!M0@%%Pl8MqmL0Yw-teR3Cr(QnHC af9Hx|`~&22Fff5c0b-dAUI4RiDH#X*a2$>R diff --git a/src/scss/cdb-components/tags.scss b/src/scss/cdb-components/tags.scss index ec60e43..90b409a 100644 --- a/src/scss/cdb-components/tags.scss +++ b/src/scss/cdb-components/tags.scss @@ -20,6 +20,7 @@ ``` */ +@import '../cdb-utilities/mixins'; @import '../cdb-variables/sizes'; @import '../cdb-variables/colors'; @@ -50,14 +51,47 @@ # Tags / Metadata ``` - +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
``` */ -.CDB-Metadata { - border-radius: $baseSize / 2; - background: #FF5500; +.CDB-ListMetadata { + @include display-flex(); +} + +.CDB-ListMetadata-item { + margin-right: $baseSize; +} + +.CDB-Metadata { + @include display-flex(); + padding: $baseSize / 2 $baseSize / 2 $baseSize / 2 $baseSize; + border-radius: $baseSize / 2; + background: rgba($cBlue, 0.16); } From 0120c5921b510c8a63af4c30c070457f054e04bb Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 24 Feb 2016 19:08:31 +0100 Subject: [PATCH 3/9] add data type --- src/scss/cdb-components/tags.scss | 47 +++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/src/scss/cdb-components/tags.scss b/src/scss/cdb-components/tags.scss index 90b409a..4b66dc4 100644 --- a/src/scss/cdb-components/tags.scss +++ b/src/scss/cdb-components/tags.scss @@ -53,7 +53,7 @@ ```
  • -
  • -
  • - +
    • +
  • + +
    • +
  • + +
    • +
+ +``` +*/ + +.CDB-ListDataType { + @include display-flex(); +} + +.CDB-ListDataType-item { + margin-right: $baseSize; +} + +.CDB-DataType { + padding: $baseSize / 4 $baseSize / 2; + border-radius: $baseSize / 4; + background: $cThirdBackground; + text-transform: uppercase; +} + From 9a4f2bc265d84255ca41d26ec8d07d3126ce7763 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Fri, 26 Feb 2016 10:23:53 +0100 Subject: [PATCH 4/9] fix PR --- src/fonts/cartoIcon.eot | Bin 19808 -> 19808 bytes src/fonts/cartoIcon.ttf | Bin 19636 -> 19636 bytes src/fonts/cartoIcon.woff | Bin 12424 -> 12424 bytes src/scss/cdb-components/tags.scss | 6 +++--- src/scss/cdb-variables/_sizes.scss | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index fad800695177b85b46522be1717bc227aefc6871..60395bd08a68c4496daaa89d8aa47d87a534b833 100644 GIT binary patch delta 55 zcmaDbi}ArM#tAmes?VJ#+OK22`F_&G4^yR`pR306+k9o`MGL5zs*+$ZpL2>Kyc~n^$-}n@yh{k0MGan*Z=?k delta 47 wcmdlolX1&T#tDwhS10I9beSscv-D#;zs*+$ZpL2>Kyc~v@`W&Z80L4NR*Z=?k diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 4aea4a369eb50e0a80b8251fd2bcc84019e0277e..7fe2d582efed965bf69847de33b3cc5a29321986 100644 GIT binary patch delta 61 zcmV-D0K)%>VTfUnc>~$+lCgZsC@H61w(VTfUnc>~puEU|pbC@Jqs&Uk*CuMFIbzknhPmp(6F2&3PW|NqVv!T1Nr T Date: Fri, 26 Feb 2016 10:29:40 +0100 Subject: [PATCH 5/9] fix hound --- src/scss/cdb-variables/_sizes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-variables/_sizes.scss b/src/scss/cdb-variables/_sizes.scss index a0a6185..640ecb8 100644 --- a/src/scss/cdb-variables/_sizes.scss +++ b/src/scss/cdb-variables/_sizes.scss @@ -7,7 +7,7 @@ $mobileLayout: 280px; //Base $baseSize: 8px; -$halfSize: $baseSize / 2; +$halfSize: $baseSize / 2; // Margins $sMargin-section: 24px; // To separate main section From babf7636900a0d6d30f160c5a33b5d685e35c29f Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Fri, 26 Feb 2016 10:42:01 +0100 Subject: [PATCH 6/9] change var name --- src/scss/cdb-variables/_sizes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-variables/_sizes.scss b/src/scss/cdb-variables/_sizes.scss index 640ecb8..ebb911a 100644 --- a/src/scss/cdb-variables/_sizes.scss +++ b/src/scss/cdb-variables/_sizes.scss @@ -7,7 +7,7 @@ $mobileLayout: 280px; //Base $baseSize: 8px; -$halfSize: $baseSize / 2; +$halfBaseSize: $baseSize / 2; // Margins $sMargin-section: 24px; // To separate main section From 1487846b73321becce3d1d5dbaf3a774e0c2fdb9 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Fri, 26 Feb 2016 11:00:29 +0100 Subject: [PATCH 7/9] change markup --- src/scss/cdb-components/tags.scss | 51 +++++++++++++------------------ 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/src/scss/cdb-components/tags.scss b/src/scss/cdb-components/tags.scss index 7312821..2067985 100644 --- a/src/scss/cdb-components/tags.scss +++ b/src/scss/cdb-components/tags.scss @@ -51,25 +51,25 @@ # Tags / Metadata ``` -
    -
  • -
    • -
  • -
    • -
  • -
    • -
  • -
    • -
  • -
    • @@ -120,17 +120,10 @@ ``` */ + -.CDB-ListDataType { - @include display-flex(); -} - -.CDB-ListDataType-item { - margin-right: $baseSize; -} - -.CDB-DataType { - padding: $baseSize / 4 $halfSize; +.CDB-Tag.CDB-Tag--opaque { + padding: $baseSize / 4 $halfBaseSize; border-radius: $baseSize / 4; background: $cThirdBackground; text-transform: uppercase; From 98ee2aa195224adfbf826ce66f9afd5870647dea Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Fri, 26 Feb 2016 11:03:28 +0100 Subject: [PATCH 8/9] fix hound --- src/scss/cdb-components/tags.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/scss/cdb-components/tags.scss b/src/scss/cdb-components/tags.scss index 2067985..aa95c26 100644 --- a/src/scss/cdb-components/tags.scss +++ b/src/scss/cdb-components/tags.scss @@ -120,7 +120,6 @@ ``` */ - .CDB-Tag.CDB-Tag--opaque { padding: $baseSize / 4 $halfBaseSize; From 1bc85827ecd37bb0d832b50d3799d22572cf5074 Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Fri, 26 Feb 2016 11:17:54 +0100 Subject: [PATCH 9/9] Fixed typo --- src/scss/cdb-components/tags.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scss/cdb-components/tags.scss b/src/scss/cdb-components/tags.scss index aa95c26..bd41170 100644 --- a/src/scss/cdb-components/tags.scss +++ b/src/scss/cdb-components/tags.scss @@ -53,7 +53,7 @@ ```
    • -
    • -
    • -