diff --git a/icon-font/template.jst.ejs b/icon-font/template.jst.ejs index 3552596..452bb08 100644 --- a/icon-font/template.jst.ejs +++ b/icon-font/template.jst.ejs @@ -43,7 +43,7 @@ All available icons in CartoDB. <% var name = glyph.fileName.split("_")[2].toCamelCase(); %>
-

<%= name %>

+

<%= name %>

<% }); %> ``` diff --git a/package.json b/package.json index 3cd00cf..a6c7113 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "jquery": "~2.2.0", "highlight.js": "~9.1.0", "markdown-styleguide-generator": "~2.0.4", - "grunt-sass": "1.1.0", + "grunt-sass": "2.0.0", "grunt-contrib-clean": "0.7.0", "grunt-contrib-concat": "0.5.1", "grunt-contrib-cssmin": "0.14.0", diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 9615584..23f6877 100644 Binary files a/src/fonts/cartoIcon.eot and b/src/fonts/cartoIcon.eot differ diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 7a97c74..178f160 100644 Binary files a/src/fonts/cartoIcon.ttf and b/src/fonts/cartoIcon.ttf differ diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 4e31ea4..1e22f26 100644 Binary files a/src/fonts/cartoIcon.woff and b/src/fonts/cartoIcon.woff differ diff --git a/src/scss/cdb-components/avatars.scss b/src/scss/cdb-components/avatars.scss index b661414..b6d6558 100644 --- a/src/scss/cdb-components/avatars.scss +++ b/src/scss/cdb-components/avatars.scss @@ -22,9 +22,6 @@ ``` */ -@import '../cdb-variables/sizes'; -@import '../cdb-variables/colors'; - .CDB-AvatarList { padding-left: 12px; } diff --git a/src/scss/cdb-components/boxes.scss b/src/scss/cdb-components/boxes.scss index d32fd51..fbdcd66 100644 --- a/src/scss/cdb-components/boxes.scss +++ b/src/scss/cdb-components/boxes.scss @@ -10,10 +10,6 @@ ``` */ -@import '../cdb-utilities/mixins'; -@import '../cdb-variables/sizes'; -@import '../cdb-variables/colors'; - .CDB-Box-modal { min-width: 160px; border: 1px solid $cMainLine; diff --git a/src/scss/cdb-components/buttons.scss b/src/scss/cdb-components/buttons.scss index 3184375..6f42f51 100644 --- a/src/scss/cdb-components/buttons.scss +++ b/src/scss/cdb-components/buttons.scss @@ -159,11 +159,6 @@ Layout Component: ``` */ -@import '../cdb-utilities/mixins'; -@import '../cdb-variables/sizes'; -@import '../cdb-variables/colors'; - - .CDB-Button { @include transition(background, 300ms); position: relative; diff --git a/src/scss/cdb-components/colors.scss b/src/scss/cdb-components/colors.scss index 87fb7b7..98cb077 100644 --- a/src/scss/cdb-components/colors.scss +++ b/src/scss/cdb-components/colors.scss @@ -12,12 +12,9 @@
-``` +``` */ -@import '../cdb-variables/colors'; - - .Color-Blue { background: $cBlue; } @@ -125,5 +122,3 @@ .Color-Error { background: $cError; } - - diff --git a/src/scss/cdb-components/forms/checkbox.scss b/src/scss/cdb-components/forms/checkbox.scss index 2890cf8..be8ee9b 100644 --- a/src/scss/cdb-components/forms/checkbox.scss +++ b/src/scss/cdb-components/forms/checkbox.scss @@ -20,11 +20,6 @@ ``` */ -@import '../../cdb-variables/sizes'; -@import '../../cdb-variables/colors'; -@import '../../cdb-utilities/mixins'; - - .CDB-Checkbox { position: absolute; width: $baseSize * 2; @@ -112,4 +107,3 @@ opacity: 0; } } - diff --git a/src/scss/cdb-components/forms/dropdowns.scss b/src/scss/cdb-components/forms/dropdowns.scss index 5258392..bef1bf3 100644 --- a/src/scss/cdb-components/forms/dropdowns.scss +++ b/src/scss/cdb-components/forms/dropdowns.scss @@ -109,10 +109,6 @@ ``` */ -@import '../../cdb-utilities/mixins'; -@import '../../cdb-variables/sizes'; -@import '../../cdb-variables/colors'; - .CDB-DropdownContainer { position: relative; height: 250px; diff --git a/src/scss/cdb-components/forms/inputs.scss b/src/scss/cdb-components/forms/inputs.scss index 02a1032..77d023f 100644 --- a/src/scss/cdb-components/forms/inputs.scss +++ b/src/scss/cdb-components/forms/inputs.scss @@ -11,10 +11,6 @@ ``` */ -@import '../../cdb-variables/sizes'; -@import '../../cdb-variables/colors'; -@import '../../cdb-utilities/helpers'; - .CDB-InputText { width: 100%; min-height: 32px; diff --git a/src/scss/cdb-components/forms/legends.scss b/src/scss/cdb-components/forms/legends.scss index 34259cb..50d3c23 100644 --- a/src/scss/cdb-components/forms/legends.scss +++ b/src/scss/cdb-components/forms/legends.scss @@ -83,9 +83,6 @@ ``` */ -@import '../../cdb-variables/sizes'; -@import '../../cdb-utilities/mixins'; - .CDB-Legend { width: $baseSize * 12; } @@ -101,4 +98,3 @@ .CDB-Fieldset-block { width: 100%; } - diff --git a/src/scss/cdb-components/forms/option-input.scss b/src/scss/cdb-components/forms/option-input.scss index 9383ff7..ff4987e 100644 --- a/src/scss/cdb-components/forms/option-input.scss +++ b/src/scss/cdb-components/forms/option-input.scss @@ -98,10 +98,6 @@ ``` */ -@import '../../cdb-variables/sizes'; -@import '../../cdb-variables/colors'; -@import '../../cdb-utilities/mixins'; - .CDB-OptionInput { width: 100%; height: $baseSize * 4; diff --git a/src/scss/cdb-components/forms/radio.scss b/src/scss/cdb-components/forms/radio.scss index 2ada046..aed6dca 100644 --- a/src/scss/cdb-components/forms/radio.scss +++ b/src/scss/cdb-components/forms/radio.scss @@ -21,11 +21,6 @@ ``` */ -@import '../../cdb-variables/sizes'; -@import '../../cdb-variables/colors'; -@import '../../cdb-utilities/mixins'; - - .CDB-Radio { position: absolute; width: $baseSize * 2; @@ -106,7 +101,3 @@ background: $cBlue; } } - - - - diff --git a/src/scss/cdb-components/forms/selects.scss b/src/scss/cdb-components/forms/selects.scss index f388874..3a69340 100644 --- a/src/scss/cdb-components/forms/selects.scss +++ b/src/scss/cdb-components/forms/selects.scss @@ -55,10 +55,6 @@ ``` */ -@import '../../cdb-variables/sizes'; -@import '../../cdb-variables/colors'; -@import '../../cdb-utilities/helpers'; - .CDB-Select { position: relative; } diff --git a/src/scss/cdb-components/forms/tabsForms.scss b/src/scss/cdb-components/forms/tabsForms.scss index d0b5f34..b1655ba 100644 --- a/src/scss/cdb-components/forms/tabsForms.scss +++ b/src/scss/cdb-components/forms/tabsForms.scss @@ -72,11 +72,6 @@ ``` */ -@import '../../cdb-utilities/mixins'; -@import '../../cdb-variables/sizes'; -@import '../../cdb-variables/colors'; - - .CDB-TabsForms { border: 1px solid $cMainLine; border-radius: 4px; @@ -93,9 +88,3 @@ .CDB-TabsForms-button { padding: 7px 8px; } - - - - - - diff --git a/src/scss/cdb-components/forms/textarea.scss b/src/scss/cdb-components/forms/textarea.scss index 13c6c96..e6ace99 100644 --- a/src/scss/cdb-components/forms/textarea.scss +++ b/src/scss/cdb-components/forms/textarea.scss @@ -11,10 +11,6 @@ ``` */ -@import '../../cdb-variables/sizes'; -@import '../../cdb-variables/colors'; -@import '../../cdb-utilities/helpers'; - .CDB-Textarea { width: 100%; padding: 7px 8px 6px; diff --git a/src/scss/cdb-components/forms/toggle.scss b/src/scss/cdb-components/forms/toggle.scss index c41ac45..5947e5d 100644 --- a/src/scss/cdb-components/forms/toggle.scss +++ b/src/scss/cdb-components/forms/toggle.scss @@ -28,10 +28,6 @@ ``` */ -@import '../../cdb-variables/sizes'; -@import '../../cdb-variables/colors'; -@import '../../cdb-utilities/mixins'; - .CDB-Toggle { position: absolute; width: $baseSize * 4; diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss index 497bcd7..2f89782 100644 --- a/src/scss/cdb-components/headers.scss +++ b/src/scss/cdb-components/headers.scss @@ -145,7 +145,7 @@

Type

- +
@@ -166,10 +166,6 @@ ``` */ -@import '../cdb-utilities/mixins'; -@import '../cdb-variables/sizes'; -@import '../cdb-variables/colors'; - .CDB-HeaderInfo { @include display-flex(); @include align-items(flex-start); diff --git a/src/scss/cdb-components/lists.scss b/src/scss/cdb-components/lists.scss index 57b2a9c..3c016b6 100644 --- a/src/scss/cdb-components/lists.scss +++ b/src/scss/cdb-components/lists.scss @@ -10,9 +10,6 @@ ``` */ -@import '../cdb-variables/sizes'; -@import '../cdb-variables/colors'; - .CDB-ListDecoration-item { border-bottom: 1px solid $cSecondaryLine; @@ -36,4 +33,3 @@ padding: 12px 16px; text-align: left; } - diff --git a/src/scss/cdb-components/loader.scss b/src/scss/cdb-components/loader.scss index a1c2a5c..2890efd 100644 --- a/src/scss/cdb-components/loader.scss +++ b/src/scss/cdb-components/loader.scss @@ -12,10 +12,6 @@ This is the generic loader for widgets, maps, components, ... ``` */ -@import '../cdb-utilities/mixins'; -@import '../cdb-variables/colors'; -@import '../cdb-variables/sizes'; - .CDB-Loader { position: absolute; top: 0; diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index 4e6787d..0759605 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -128,9 +128,6 @@ ``` */ -@import '../cdb-variables/colors'; -@import '../cdb-variables/sizes'; - .CDB-NavMenu { position: relative; z-index: 2; @@ -227,6 +224,3 @@ color: $cSecondaryText; } } - - - diff --git a/src/scss/cdb-components/shapes/add.scss b/src/scss/cdb-components/shapes/add.scss index 6fa4b2b..2860a56 100644 --- a/src/scss/cdb-components/shapes/add.scss +++ b/src/scss/cdb-components/shapes/add.scss @@ -43,8 +43,6 @@ Description ``` */ -@import '../../cdb-variables/colors'; - .CDB-Shape { width: 16px; height: 16px; @@ -126,6 +124,3 @@ Description background: $cWhite; } } - - - diff --git a/src/scss/cdb-components/shapes/arrow.scss b/src/scss/cdb-components/shapes/arrow.scss index 295cd40..2f5cc7d 100644 --- a/src/scss/cdb-components/shapes/arrow.scss +++ b/src/scss/cdb-components/shapes/arrow.scss @@ -16,8 +16,6 @@ Description ``` */ -@import '../../cdb-variables/colors'; - .CDB-Shape-Arrow { position: relative; width: 1px; diff --git a/src/scss/cdb-components/shapes/check-circle.scss b/src/scss/cdb-components/shapes/check-circle.scss index cf2b1f1..42323d8 100644 --- a/src/scss/cdb-components/shapes/check-circle.scss +++ b/src/scss/cdb-components/shapes/check-circle.scss @@ -55,8 +55,6 @@ Description ``` */ -@import '../../cdb-variables/colors'; - .CDB-Shape-CircleItem { width: 14px; height: 14px; @@ -151,6 +149,3 @@ Description background: $cHighlight; } } - - - diff --git a/src/scss/cdb-components/shapes/close.scss b/src/scss/cdb-components/shapes/close.scss index 473f7dc..5ecde8e 100644 --- a/src/scss/cdb-components/shapes/close.scss +++ b/src/scss/cdb-components/shapes/close.scss @@ -43,8 +43,6 @@ Description ``` */ -@import '../../cdb-variables/colors'; - .CDB-Shape-close { display: block; position: relative; @@ -146,4 +144,3 @@ Description background: $cError; } } - diff --git a/src/scss/cdb-components/shapes/dash.scss b/src/scss/cdb-components/shapes/dash.scss index 8c3bdeb..84c32f1 100644 --- a/src/scss/cdb-components/shapes/dash.scss +++ b/src/scss/cdb-components/shapes/dash.scss @@ -43,8 +43,6 @@ Description ``` */ -@import '../../cdb-variables/colors'; - .CDB-Shape-dash { position: relative; height: 100%; @@ -80,6 +78,3 @@ Description background: $cWhite; } } - - - diff --git a/src/scss/cdb-components/shapes/dataset.scss b/src/scss/cdb-components/shapes/dataset.scss index 71930a1..4635801 100644 --- a/src/scss/cdb-components/shapes/dataset.scss +++ b/src/scss/cdb-components/shapes/dataset.scss @@ -78,9 +78,6 @@ Description ``` */ -@import '../../cdb-variables/colors'; -@import '../../cdb-variables/sizes'; - .CDB-Shape-Dataset { padding-top: 1px; &.is-small { diff --git a/src/scss/cdb-components/shapes/dots.scss b/src/scss/cdb-components/shapes/dots.scss index 54e61b7..f082276 100644 --- a/src/scss/cdb-components/shapes/dots.scss +++ b/src/scss/cdb-components/shapes/dots.scss @@ -12,9 +12,6 @@ You may resize and change the colors of the icons with the `glyph-`-classes. Ava ``` */ -@import '../../cdb-variables/colors'; -@import '../../cdb-variables/sizes'; - .CDB-Shape-dot { display: inline-block; width: $baseSize; diff --git a/src/scss/cdb-components/shapes/error-circle.scss b/src/scss/cdb-components/shapes/error-circle.scss index 010a296..12cc8eb 100644 --- a/src/scss/cdb-components/shapes/error-circle.scss +++ b/src/scss/cdb-components/shapes/error-circle.scss @@ -55,8 +55,6 @@ Description ``` */ -@import '../../cdb-variables/colors'; - .CDB-Shape-CircleItem { width: 13px; height: 13px; diff --git a/src/scss/cdb-components/shapes/hamburguer.scss b/src/scss/cdb-components/shapes/hamburguer.scss index d5d2bc4..c1aeaf5 100644 --- a/src/scss/cdb-components/shapes/hamburguer.scss +++ b/src/scss/cdb-components/shapes/hamburguer.scss @@ -30,9 +30,6 @@ Description ``` */ -@import '../../cdb-variables/colors'; -@import '../../cdb-variables/sizes'; - .CDB-Shape-hamburguer { width: $baseSize * 2; &:hover { diff --git a/src/scss/cdb-components/shapes/magnify.scss b/src/scss/cdb-components/shapes/magnify.scss index abac5b5..1c3466d 100644 --- a/src/scss/cdb-components/shapes/magnify.scss +++ b/src/scss/cdb-components/shapes/magnify.scss @@ -44,8 +44,6 @@ Description ``` */ -@import '../../cdb-variables/colors'; - .CDB-Shape-magnify { display: block; position: relative; diff --git a/src/scss/cdb-components/shapes/move.scss b/src/scss/cdb-components/shapes/move.scss index 622ad77..792c34b 100644 --- a/src/scss/cdb-components/shapes/move.scss +++ b/src/scss/cdb-components/shapes/move.scss @@ -85,8 +85,6 @@ Description ``` */ -@import '../../cdb-variables/colors'; - .CDB-Shape-rectsHandle { position: relative; padding: 1px 0 0; diff --git a/src/scss/cdb-components/shapes/paragraph.scss b/src/scss/cdb-components/shapes/paragraph.scss index 9c9517b..36b736c 100644 --- a/src/scss/cdb-components/shapes/paragraph.scss +++ b/src/scss/cdb-components/shapes/paragraph.scss @@ -66,8 +66,6 @@ Description ``` */ -@import '../../cdb-variables/colors'; - .CDB-Shape-paragraph { padding-top: 3px; text-align: left; diff --git a/src/scss/cdb-components/shapes/threePoints.scss b/src/scss/cdb-components/shapes/threePoints.scss index effdd59..b15dad5 100644 --- a/src/scss/cdb-components/shapes/threePoints.scss +++ b/src/scss/cdb-components/shapes/threePoints.scss @@ -102,8 +102,6 @@ Description ``` */ -@import '../../cdb-variables/colors'; - .CDB-Shape-threePoints { display: inline-block; padding: 0 4px; diff --git a/src/scss/cdb-components/shapes/toogle-arrow.scss b/src/scss/cdb-components/shapes/toogle-arrow.scss index 90381da..240ea7a 100644 --- a/src/scss/cdb-components/shapes/toogle-arrow.scss +++ b/src/scss/cdb-components/shapes/toogle-arrow.scss @@ -83,8 +83,6 @@ Description ``` */ -@import '../../cdb-variables/colors'; - .CDB-ArrowToogle { position: relative; height: 100%; diff --git a/src/scss/cdb-components/shapes/type.scss b/src/scss/cdb-components/shapes/type.scss index 1a6decc..a8aed38 100644 --- a/src/scss/cdb-components/shapes/type.scss +++ b/src/scss/cdb-components/shapes/type.scss @@ -37,8 +37,6 @@ Description ``` */ -@import '../../cdb-variables/colors'; - .CDB-Shape { width: 16px; height: 16px; diff --git a/src/scss/cdb-components/tags.scss b/src/scss/cdb-components/tags.scss index c8a74ee..9ba0c5b 100644 --- a/src/scss/cdb-components/tags.scss +++ b/src/scss/cdb-components/tags.scss @@ -23,11 +23,6 @@ ``` */ -@import '../cdb-utilities/mixins'; -@import '../cdb-variables/sizes'; -@import '../cdb-variables/colors'; - - .CDB-Tag { padding: 0 3px; border: 1px solid $cBlue; @@ -133,4 +128,3 @@ background: rgba(0, 0, 0, 0.04); text-transform: uppercase; } - diff --git a/src/scss/cdb-components/tooltips.scss b/src/scss/cdb-components/tooltips.scss index 49cd210..f90333d 100644 --- a/src/scss/cdb-components/tooltips.scss +++ b/src/scss/cdb-components/tooltips.scss @@ -60,11 +60,6 @@ ``` */ -@import '../cdb-utilities/mixins'; -@import '../cdb-variables/colors'; -@import '../cdb-variables/sizes'; - - .CDB-InfoTooltip { display: inline-block; position: absolute; diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index 1487433..2726ca0 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -19,9 +19,6 @@ ``` */ -@import '../cdb-variables/sizes'; -@import '../cdb-variables/colors'; - .CDB-Text { font-family: 'Open Sans'; $sFontWeight-normal: 400; @@ -74,4 +71,3 @@ .CDB-IconFont.is-disabled { opacity: 0.24; } - diff --git a/src/scss/cdb-icon-font.scss b/src/scss/cdb-icon-font.scss index f417fee..d22047d 100644 --- a/src/scss/cdb-icon-font.scss +++ b/src/scss/cdb-icon-font.scss @@ -43,673 +43,673 @@ All available icons in CartoDB.
-

clock

+

clock

-

stats

+

stats

-

heartEmpty

+

heartEmpty

-

heartFill

+

heartFill

-

alert

+

alert

-

rows

+

rows

-

check

+

check

-

dribbble

+

dribbble

-

twitter

+

twitter

-

caretDown

+

caretDown

-

lightbulb

+

lightbulb

-

explore

+

explore

-

drop

+

drop

-

edition

+

edition

-

view

+

view

-

odyssey

+

odyssey

-

settings

+

settings

-

downloadCircle

+

downloadCircle

-

pencilMenu

+

pencilMenu

-

mobile

+

mobile

-

wizard

+

wizard

-

undo

+

undo

-

redo

+

redo

-

lArrowLight

+

lArrowLight

-

hide

+

hide

-

info

+

info

-

fork

+

fork

-

facebook

+

facebook

-

folder

+

folder

-

dropbox

+

dropbox

-

cloud

+

cloud

-

step

+

step

-

addDocument

+

addDocument

-

arrowNext

+

arrowNext

-

arrowPrev

+

arrowPrev

-

close

+

close

-

cartoFante

+

cartoFante

-

lock

+

lock

-

cartoDB

+

cartoDB

-

lens

+

lens

-

closeLimits

+

closeLimits

-

defaultUser

+

defaultUser

-

cockroach

+

cockroach

-

floppy

+

floppy

-

trash

+

trash

-

wifi

+

wifi

-

unlock

+

unlock

-

unlockWithEllipsis

+

unlockWithEllipsis

-

gift

+

gift

-

people

+

people

-

play

+

play

-

add

+

add

-

map

+

map

-

anchor

+

anchor

-

key

+

key

-

calendar

+

calendar

-

document

+

document

-

eye

+

eye

-

marker

+

marker

-

progressBar

+

progressBar

-

book

+

book

-

notes

+

notes

-

rectangles

+

rectangles

-

mountain

+

mountain

-

points

+

points

-

snake

+

snake

-

boss

+

boss

-

rocket

+

rocket

-

barometer

+

barometer

-

dollar

+

dollar

-

email

+

email

-

label

+

label

-

outside

+

outside

-

jigsaw

+

jigsaw

-

tools

+

tools

-

question

+

question

-

layerStack

+

layerStack

-

alarm

+

alarm

-

cloudDownArrow

+

cloudDownArrow

-

pencil

+

pencil

-

fountainPen

+

fountainPen

-

emptyDoc

+

emptyDoc

-

mergeArrow

+

mergeArrow

-

mergeColumns

+

mergeColumns

-

mergeSpatial

+

mergeSpatial

-

globe

+

globe

-

chevronDown

+

chevronDown

-

streets

+

streets

-

keys

+

keys

-

facebookSquare

+

facebookSquare

-

fullscreen

+

fullscreen

-

rArrowLight

+

rArrowLight

-

share

+

share

-

linkedin

+

linkedin

-

calendarBlank

+

calendarBlank

-

creativeCommons

+

creativeCommons

-

bubble

+

bubble

-

bars

+

bars

-

arrowMenuLight

+

arrowMenuLight

-

tieFighter

+

tieFighter

-

ray

+

ray

-

markup

+

markup

-

table

+

table

-

airlock

+

airlock

-

pin

+

pin

-

attache

+

attache

-

download

+

download

-

group

+

group

-

dashboard

+

dashboard

-

spinner

+

spinner

-

mapsearch

+

mapsearch

-

rArrow

+

rArrow

``` diff --git a/src/scss/cdb-utilities/defaults.css.scss b/src/scss/cdb-utilities/defaults.scss similarity index 83% rename from src/scss/cdb-utilities/defaults.css.scss rename to src/scss/cdb-utilities/defaults.scss index aaabb14..cf0f99d 100644 --- a/src/scss/cdb-utilities/defaults.css.scss +++ b/src/scss/cdb-utilities/defaults.scss @@ -1,8 +1,6 @@ // Default classes // ---------------------------------------------- -@import '../cdb-variables/colors'; - body { color: $cMainText; } @@ -15,4 +13,3 @@ a { a:hover { text-decoration: underline; } - diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index c8d83d6..e4d90b3 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -1,9 +1,6 @@ // Helper classes // ---------------------------------------------- -@import './mixins'; -@import '../cdb-variables/colors'; - /* Margins */ .u-tSpace { margin-top: 4px; diff --git a/src/scss/entry.scss b/src/scss/entry.scss new file mode 100644 index 0000000..cae3365 --- /dev/null +++ b/src/scss/entry.scss @@ -0,0 +1,54 @@ +// Entry point for all CartoAssets +// ---------------------------------------------- + +// Variables and functions +@import 'cdb-variables/sizes'; +@import 'cdb-variables/colors'; +@import 'cdb-utilities/mixins'; + +@import 'cdb-utilities/vendor/reset'; +@import 'cdb-utilities/vendor/normalize'; +@import 'cdb-utilities/defaults'; +@import 'cdb-utilities/fonts'; +@import 'cdb-utilities/helpers'; + +@import 'cdb-components/forms/checkbox'; +@import 'cdb-components/forms/dropdowns'; +@import 'cdb-components/forms/inputs'; +@import 'cdb-components/forms/legends'; +@import 'cdb-components/forms/option-input'; +@import 'cdb-components/forms/radio'; +@import 'cdb-components/forms/selects'; +@import 'cdb-components/forms/tabsForms'; +@import 'cdb-components/forms/textarea'; +@import 'cdb-components/forms/toggle'; + +@import 'cdb-components/shapes/add'; +@import 'cdb-components/shapes/arrow'; +@import 'cdb-components/shapes/check-circle'; +@import 'cdb-components/shapes/close'; +@import 'cdb-components/shapes/dash'; +@import 'cdb-components/shapes/dataset'; +@import 'cdb-components/shapes/dots'; +@import 'cdb-components/shapes/error-circle'; +@import 'cdb-components/shapes/hamburguer'; +@import 'cdb-components/shapes/magnify'; +@import 'cdb-components/shapes/move'; +@import 'cdb-components/shapes/paragraph'; +@import 'cdb-components/shapes/threePoints'; +@import 'cdb-components/shapes/toogle-arrow'; +@import 'cdb-components/shapes/type'; + +@import 'cdb-components/avatars'; +@import 'cdb-components/boxes'; +@import 'cdb-components/buttons'; +@import 'cdb-components/colors'; +@import 'cdb-components/headers'; +@import 'cdb-components/lists'; +@import 'cdb-components/loader'; +@import 'cdb-components/menu'; +@import 'cdb-components/tags'; +@import 'cdb-components/tooltips'; +@import 'cdb-components/typography'; + +@import 'cdb-icon-font'; diff --git a/styleguide/_template.html b/styleguide/_template.html index ff15055..d28c814 100644 --- a/styleguide/_template.html +++ b/styleguide/_template.html @@ -1,8 +1,14 @@ - - + {{> theme}} @@ -124,6 +130,3 @@
{{/each}}
- - - diff --git a/tasks/sass.js b/tasks/sass.js index a6c6152..8f8f168 100644 --- a/tasks/sass.js +++ b/tasks/sass.js @@ -7,7 +7,7 @@ module.exports = { files: [{ expand: true, src: [ - 'src/scss/**/*.scss' + 'src/scss/entry.scss' ], dest: '.tmp', ext: '.css'