From 34d850e5ae10bd0203b11a8b77fb03a019f48778 Mon Sep 17 00:00:00 2001 From: nobuti Date: Tue, 7 Jun 2016 09:12:50 +0200 Subject: [PATCH 1/2] Update package.json to work with node v6.x --- README.md | 1 + package.json | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 95fb4ff..d209f9a 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ ### Installation As easy as: +- ```npm install --global grunt-cli``` [Grunt installation](http://gruntjs.com/getting-started) - ```npm install --global gulp-cli``` [Gulp installation](https://github.com/gulpjs/gulp) - ```npm install -g markdown-styleguide-generator``` [StyleGenerator installation](https://www.npmjs.com/package/markdown-styleguide-generator#install) - ```npm install``` diff --git a/package.json b/package.json index 9e6ddd9..463b565 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "node": ">= 0.8.0" }, "devDependencies": { + "grunt": "~0.4.5", "jquery": "~2.2.0", "highlight.js": "~9.1.0", "markdown-styleguide-generator": "~2.0.4", @@ -48,9 +49,6 @@ "grunt-shell": "1.1.2", "load-grunt-tasks": "*" }, - "peerDependencies": { - "grunt": "~0.4.5" - }, "keywords": [ "library", "CartoDB", From a167bab78e7e840b58359a8515c49f082c7ce6a7 Mon Sep 17 00:00:00 2001 From: nobuti Date: Tue, 7 Jun 2016 09:13:27 +0200 Subject: [PATCH 2/2] Remove infoboxes and box loader. Already in cartodb. --- src/scss/cdb-components/boxes.scss | 181 ----------------------------- 1 file changed, 181 deletions(-) diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/boxes.scss index beb7693..d32fd51 100644 --- a/src/scss/cdb-components/boxes.scss +++ b/src/scss/cdb-components/boxes.scss @@ -40,184 +40,3 @@ .CDB-Box-modalHeaderItem--paddingVertical { padding: $baseSize + 4 0; } - -/* SG -# Boxes/Loader -``` -
-
    -
  • -
    -
    -
    -
    -
    -
    -

    Query applied. Showing 2,561 rows, Query applied. Showing 2,561 rows, Query applied. Showing 2,561 rows Query applied. Showing 2,561 rowsQuery applied. Showing 2,561 rows Query applied. Showing 2,561 rows

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    • -
-
-
-
-
-
-
-
-
    -
  • -
    -
    -
    -
    -
    -
    -

    Finished importing populated_places_2

    -
    -
    • -
  • -
    -
    -
    -
    -

    Geocoding populated_places_2 (28%)

    -
    -
    -
    -
    -
    -
    -
    • -
- -
-
-
-
-
-
-
-
    -
  • -
    -
    -
    -
    -
    -
    -

    Error in query. Data might be outdated

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    • -
-
-``` -*/ - -.CDB-BoxLoader { - padding: 0 $baseSize * 3; - border-top: 1px solid $cMainLine; -} - - -.CDB-BoxLoader-inner { - padding: $baseSize + 4 0; - border-top: 1px solid $cMainLine; - &:first-child { - border-top: 0; - } -} - -.CDB-BoxLoader-item { - @include display-flex(); - padding: $baseSize 0; - color: $cSecondaryText; - &.is-working { - color: $cAltText; - } -} - -.CDB-BoxLoader-info { - @include flex(1); - padding-right: $baseSize * 2; -} - -/* 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

-

CLOSE

-
-
-
-
-
-

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

    -
    • -
  • - -
    • -
-
-``` -*/ - -.CDB-InfoBox { - padding: 12px 16px; - border-radius: 4px; - background: $cThirdBackground; - &.is-alert { - background: rgba($cHighlightYellow, 0.6); - } -} - -.CDB-InfoBox-footer { - @include display-flex(); - @include align-items(center); -} - -.CDB-InfoBox-footerItem { - @include flex(1); -} - -.CDB-InfoBox-footerItem--right { - text-align: right; -}