From 0591e25d0e79f69ab2b607405700acd5f7421730 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 24 Feb 2016 14:21:53 +0100 Subject: [PATCH 1/2] add list widgets --- package.json | 2 +- 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/lists.scss | 84 +++++++++++++++++++++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b190d05..2bb1a58 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.27", + "version": "0.1.28", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "CartoDB", diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 390f86692ab1cdee0c0a518f0d338639784fb9d9..b798a0b3e9580988843092c75a26e47a40a830d1 100644 GIT binary patch delta 55 zcmaDbi}ArM#tAmezR!Ip+OK22^1g23hpEy)UOd0eR|amzUkpHS>2tUjjNZI}@qjk~ DoDLR? delta 55 zcmaDbi}ArM#tAmePxXQ(+OK22bb8ao4^yRs^q$7^+k9o0LMrY*#H0l delta 47 wcmdlolX1&T#tDwhmrie*=rUD0NbhMpzs*+$ZpL2>Kyc}kYYL3s_~n2%0L7CM*#H0l diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index d2d97062da3096028ed56eb8243eeef56b97cfcf..1b178a0c50efff96a92a780abde43b1139c75476 100644 GIT binary patch delta 61 zcmV-D0K)%>VTfUnc>~n%ezAPXC@CYKU8(W>HeVUI8Givq7%qJd_kz)H%Kv}oieUT$ T`DfkXjoQw`IzZYdfEgex0| delta 61 zcmV-D0K)%>VTfUnc>~hRvax*0C@G^r#=r6WHeVUI8Givq7%qKsO@YyG%Kv}oieUT$ T`DfkXjk3Jt}xZYdfEn8zEF diff --git a/src/scss/cdb-components/lists.scss b/src/scss/cdb-components/lists.scss index d85ff29..59defd8 100644 --- a/src/scss/cdb-components/lists.scss +++ b/src/scss/cdb-components/lists.scss @@ -25,3 +25,87 @@ display: block; padding: 12px 16px; } + + +/* SG +# Lists/Lists Widgets + + +``` +
    +
  • +
    +
    +
    +
    +

    Stadiums Affected Stadiums Affected Stadiums AffectedStadiums Affected Stadiums Affected Stadiums Affected Stadiums Affected

    +
    + +
    +
    +

    NBA Fans, fans_num

    +
    +
  • +
  • +
    +
    +
    +
    +

    Stadiums Affected Stadiums Affected Stadiums AffectedStadiums Affected Stadiums Affected Stadiums Affected Stadiums Affected

    +
    + +
    +
    +

    NBA Fans, fans_num

    +
    +
  • +
+``` +*/ + +@import '../cdb-utilities/mixins'; +@import '../cdb-variables/sizes'; +@import '../cdb-variables/colors'; + + +.CDB-BlockList-item { + @include display-flex(); + margin-bottom: 8px; + padding: 16px; + border: 1px solid $cSecondaryLine; + border-radius: $baseSize; + + &:last-child { + margin-bottom: 0; + } +} + +.CDB-BlockList-inner { + @include flex(1); +} + +.CDB-BlockList-Title { + @include display-flex(); + @include align-items(center); +} + +.CDB-BlockList-TitleText { + @include flex(1); + width: 0; + padding-right: 16px; +} + +.CDB-BlockList-media { + width: 40px; + height: 40px; + border: 1px solid $cSecondaryLine; + border-radius: 4px; + background: $cThirdBackground; +} + + + From 7a8ff5a5b016f62ddf7273af5959167d8614f332 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 24 Feb 2016 14:23:17 +0100 Subject: [PATCH 2/2] add vars --- src/scss/cdb-components/lists.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/scss/cdb-components/lists.scss b/src/scss/cdb-components/lists.scss index 59defd8..14414db 100644 --- a/src/scss/cdb-components/lists.scss +++ b/src/scss/cdb-components/lists.scss @@ -74,10 +74,10 @@ .CDB-BlockList-item { @include display-flex(); - margin-bottom: 8px; - padding: 16px; + margin-bottom: $baseSize; + padding: $baseSize * 2; border: 1px solid $cSecondaryLine; - border-radius: $baseSize; + border-radius: $baseSize / 2; &:last-child { margin-bottom: 0; @@ -96,14 +96,14 @@ .CDB-BlockList-TitleText { @include flex(1); width: 0; - padding-right: 16px; + padding-right: $baseSize * 2; } .CDB-BlockList-media { width: 40px; height: 40px; border: 1px solid $cSecondaryLine; - border-radius: 4px; + border-radius: $baseSize / 2; background: $cThirdBackground; }