From 2f0b6c785470ef056ee537d43d41f8d72ed0f1d8 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 23 Mar 2016 11:33:18 +0100 Subject: [PATCH] add new button size and fix size typography --- 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/buttons.scss | 52 ++++++++++++++++++-- src/scss/cdb-components/shapes/dataset.scss | 4 +- 5 files changed, 49 insertions(+), 7 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 051e7c50c57c247ebedb5b704dcbf5762dac9901..e91245e1b39e98329d12cfdc77758ad494c2e2a2 100644 GIT binary patch delta 58 zcmaDbi}ArM#tAkoU#IReoanHI<&WG9t%)C|$QbUL`Zb>4<|_j?<1YpvxGbT)07h?K Iz<9tL0N;rguK)l5 delta 58 zcmaDbi}ArM#tAkoSN9qkO>|hp^7}E1)x-}|WQ+{=UXACs`O3h}_=^DuF8xYe0i!oB IU_9Ur0NmCXEdT%j diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index c7112e76b6da87e0625901f91931ae8a976b9ab9..7855043e93426609f62ec515e88608f703020318 100644 GIT binary patch delta 49 ycmdlolX1&T#t9BAf8=IpO>~(eW4LST*LZ%LuMFIbzZihvvV`^m7`^e!0dD}&ClUw% delta 49 ycmdlolX1&T#t9BAzaO($O>~(eV`RAZYCONqR|amzUkpHS=~vM!zZl a|D7v>@eh#8!N3F(1ptaE4)e2bDH#XUpd66^ 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; } }