From fdc9b62cb55995da9e8162c537f2638f94d41c0b Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Tue, 23 Feb 2016 10:15:22 +0100 Subject: [PATCH 1/7] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 489ae06..9875bc6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.25", + "version": "0.1.26", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "CartoDB", From 78829e693cf95b5e8646e2917ddb4ff404fc63a4 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 23 Feb 2016 13:48:27 +0100 Subject: [PATCH 2/7] use flexbox for forms --- 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/forms/inputs.scss | 1 + src/scss/cdb-components/forms/legends.scss | 34 +++++++++++++-------- 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 4f461cd8bf57861cb8fba6b79bb5a4455f2f77b4..7c041fd67c9dc3d89dfb7223bf3145e2c23f7714 100644 GIT binary patch delta 55 zcmaDbi}ArM#tAmeE5m{(+OK22WPV}dhpE!RVJqYLZN4&aGyY-#f=eHN7sKey3m6Z0 F0|1Y57h3=T delta 55 zcmaDbi}ArM#tAmewRPbW?bk71P<}S?!&K?;y4rYto39MqjK3Iw;L?YWbufDK0>%U0 E0FOc!TL1t6 diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index c23969acb99ae6bb4560fb8edfa35a32938ec3bb..5c1ab9f2b8af39cd35faeb0156097d9c67ab847a 100644 GIT binary patch delta 47 wcmdlolX1&T#tDwhm&`9rbeSq09JVr^-{va=H{&k`Ah`7LcQK6K_~n2%0Ku9Q*Z=?k delta 47 wcmdlolX1&T#tDwh7nGk(beSq0URN8>Z}XLboADO|5M283u?|LW{Bpn>0Ku9Q*Z=?k diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index e3e9849615c66858ef0074eaf7b90f7930778e4c..2ae2e07295f28d245aa4fdcd9956467050e10f15 100644 GIT binary patch delta 59 zcmV-B0L1@@VTfUnc>~fn(6M~VC?_DzgYo<}Um3U=e*r}pE`9u645Qza|NqVv!T1Nr R~ZR=CORrC?~MMsqy?aUm3U=e*r}pE`9h|2czGV|NqVv!T1Nr RN8^Hho diff --git a/src/scss/cdb-components/forms/inputs.scss b/src/scss/cdb-components/forms/inputs.scss index 4c5b843..6559fe0 100644 --- a/src/scss/cdb-components/forms/inputs.scss +++ b/src/scss/cdb-components/forms/inputs.scss @@ -21,6 +21,7 @@ border-radius: $baseSize / 2; font-size: $sFontSize-medium; line-height: $sLineHeight-medium; + box-sizing: border-box; &:hover { border: 1px solid $cHoverLine; diff --git a/src/scss/cdb-components/forms/legends.scss b/src/scss/cdb-components/forms/legends.scss index d9c7317..20483ae 100644 --- a/src/scss/cdb-components/forms/legends.scss +++ b/src/scss/cdb-components/forms/legends.scss @@ -35,37 +35,45 @@

-
-

RADIO

-
    -
  • -
    +
    +

    RADIO

    +
      +
    • +
    • -
    -
-
-

RADIO

-
- -
-
+ +
+

RADIO

+ +
``` */ @import '../../cdb-variables/sizes'; +@import '../../cdb-utilities/mixins'; .CDB-Legend { width: $baseSize * 12; } + +.CDB-Fieldset { + @include display-flex(); + @include align-items(center); +} +.CDB-Fieldset-block { + width: 100%; +} + From 4567fe41417f4418daa44540a22517aab83422d4 Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Tue, 23 Feb 2016 17:04:36 +0100 Subject: [PATCH 3/7] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9875bc6..b190d05 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.26", + "version": "0.1.27", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "CartoDB", From 0591e25d0e79f69ab2b607405700acd5f7421730 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 24 Feb 2016 14:21:53 +0100 Subject: [PATCH 4/7] 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 5/7] 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; } From 04bd83c37cfaae7a5db82e20863af0d6b83948a6 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 24 Feb 2016 16:20:43 +0100 Subject: [PATCH 6/7] clean cartoassets --- 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 | 83 ----------------------- src/scss/cdb-components/menu.scss | 104 ----------------------------- 5 files changed, 187 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index b798a0b3e9580988843092c75a26e47a40a830d1..9963c375d87615e822b0a53ac5a7c4e5bd8f8332 100644 GIT binary patch delta 52 zcmaDbi}ArM#tF8JN)zqYGhYq-H}S(XDJ9={ew(ih+>E~%fZ)>SjxHFzc>&`AZvZc{ B6y5*; delta 52 zcmaDbi}ArM#tF8J&nMcgXTI{jZsLb&QqO(k`E9;3a5Mg50D?=O!@Xei<^_xgya8k$ B6{7$E diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 014b8d8be8584cbcec1296126275eaf17a1ff238..d14b72fd6d44f89f6501c1effe9ef738c6bc57de 100644 GIT binary patch delta 46 vcmdlolX1&T#tDwhR|Ee|beSfl{@fQOST>9M61*129Ip7TdqiPb2 delta 46 vcmdlolX1&T#tDwhSKil6beSgg+&7-z<|_j?<1Ypvxb!*P3r27Ja=;q^w!adL diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 1b178a0c50efff96a92a780abde43b1139c75476..3b618030f4a068ceeca269ffa27f61ccd7090d14 100644 GIT binary patch delta 60 zcmV-C0K@-?VTfUnc>~o^{;_<@C@Al*sqy?aUm3U=e*r}pE`9Fkg3)iv|9|I-VEhB* SaxgG~L;;EV4)3#WDH;c=@*SK2 delta 60 zcmV-C0K@-?VTfUnc>~n%ezAPYC@7y@sqy?aUm3U=e*r}pE`1L7g3)iv|9|I-VEhB* SaxgG~L;-744b!u3DH;cMd>do{ diff --git a/src/scss/cdb-components/lists.scss b/src/scss/cdb-components/lists.scss index 14414db..ff40d44 100644 --- a/src/scss/cdb-components/lists.scss +++ b/src/scss/cdb-components/lists.scss @@ -26,86 +26,3 @@ 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: $baseSize; - padding: $baseSize * 2; - border: 1px solid $cSecondaryLine; - border-radius: $baseSize / 2; - - &: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: $baseSize * 2; -} - -.CDB-BlockList-media { - width: 40px; - height: 40px; - border: 1px solid $cSecondaryLine; - border-radius: $baseSize / 2; - background: $cThirdBackground; -} - - - diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index 0d0c91c..2d43f8b 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -63,10 +63,6 @@ - -

-

- ``` */ @@ -155,103 +151,3 @@ } } - -/* SG -# Menu/Editor - - -``` -
- - - - - -
-``` -*/ - -.CDB-MenuEditor { - position: relative; - width: 72px; - min-height: 450px; - box-sizing: border-box; - padding: $baseSize * 2 0; - background: $cBlue; - box-shadow: 4px 0 $baseSize * 2 rgba(0, 0, 0, 0.05); -} - -.CDB-MenuEditor-navigationItem { - padding: 12px $baseSize * 2 12px $baseSize + 6; - border-left: 2px solid transparent; - text-align: center; -} -.CDB-MenuEditor-navigationItem.is-selected { - border-left: 2px solid #FFF; -} -.CDB-MenuEditor-navigationItem.is-selected .CDB-MenuEditor-navigationIcon { - opacity: 1; -} - -.CDB-MenuEditor-navigationLink { - display: block; -} -.CDB-MenuEditor-navigationIcon { - color: #FFF; - font-size: 24px; - line-height: 24px; - opacity: 0.32; -} -.CDB-MenuEditor-navigationLink:hover .CDB-MenuEditor-navigationIcon { - opacity: 1; -} - -.CDB-MenuEditor-logo { - width: 40px; - height: 40px; - margin: 0 auto $baseSize * 2; - padding: $baseSize - 2 0; - border-radius: $baseSize / 2; - background: #FFF; - box-sizing: border-box; - font-size: $baseSize * 3; - text-align: center; -} - -.CDB-MenuEditor-avatar { - position: absolute; - bottom: $baseSize * 2; - left: $baseSize * 2; - width: 40px; - height: 40px; -} -.CDB-MenuEditor-avatarImage { - width: 100%; - border-radius: $baseSize / 2; -} - From b33a64adca4573c58ec11a01c57fac377a38d69a Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 24 Feb 2016 16:31:57 +0100 Subject: [PATCH 7/7] bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2bb1a58..5d03f13 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.28", + "version": "0.1.29", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "CartoDB",