diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 051e7c5..e91245e 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 c7112e7..7855043 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 1e0eba1..40838e3 100644 Binary files a/src/fonts/cartoIcon.woff and b/src/fonts/cartoIcon.woff differ diff --git a/src/scss/cdb-components/buttons.scss b/src/scss/cdb-components/buttons.scss index a862ec3..3c70554 100644 --- a/src/scss/cdb-components/buttons.scss +++ b/src/scss/cdb-components/buttons.scss @@ -8,14 +8,24 @@ Layout Component: [CDB-Button][CDB-Button--primary | CDB-Button--secondary] ``` - - + + + + + @@ -33,14 +43,23 @@ Layout Component:
- - + + + + @@ -64,9 +83,11 @@ Layout Component: .CDB-Button { - padding: $baseSize $baseSize + 12; + padding: $baseSize + 1 $baseSize + 12; + border: 1px solid transparent; border-radius: $baseSize / 2; cursor: pointer; + box-sizing: border-box; .CDB-Button-Text { display: block; @@ -80,6 +101,11 @@ Layout Component: .CDB-Button--small { padding: $baseSize - 3 $baseSize + 4; } + +.CDB-Button--big { + padding: $baseSize + 4 $baseSize + 12; +} + .CDB-Button--icon { padding: 7px 9px; } @@ -114,6 +140,14 @@ Layout Component: # Buttons/Secondary ``` + + + + @@ -135,6 +169,14 @@ Layout Component:
+ + + + diff --git a/src/scss/cdb-components/shapes/dataset.scss b/src/scss/cdb-components/shapes/dataset.scss index 0639597..71930a1 100644 --- a/src/scss/cdb-components/shapes/dataset.scss +++ b/src/scss/cdb-components/shapes/dataset.scss @@ -83,10 +83,8 @@ Description .CDB-Shape-Dataset { padding-top: 1px; - padding-left: 10px; &.is-small { padding-top: 0; - padding-left: 7px; } } @@ -101,6 +99,7 @@ Description &:first-child { position: relative; + margin-left: 0; box-shadow: 3px 0 0 $cWhite; z-index: 1; } @@ -112,6 +111,7 @@ Description height: 6px; margin-left: -7px; &:first-child { + margin-left: 0; box-shadow: 2px 0 0 $cWhite; } }