From dc4819fe38d9a9102ed6ebeb63d9498d8fd5c9c2 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 27 Jan 2016 19:17:16 +0100 Subject: [PATCH 01/12] add first shapes - #12 --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-components/shapes.scss | 252 ------------------ src/scss/cdb-components/shapes/arrow.scss | 86 ++++++ src/scss/cdb-components/shapes/dots.scss | 28 ++ .../cdb-components/shapes/hamburguer.scss | 63 +++++ src/scss/cdb-components/shapes/magnify.scss | 70 +++++ .../cdb-components/shapes/threePoints.scss | 64 +++++ 9 files changed, 311 insertions(+), 252 deletions(-) delete mode 100644 src/scss/cdb-components/shapes.scss create mode 100644 src/scss/cdb-components/shapes/arrow.scss create mode 100644 src/scss/cdb-components/shapes/dots.scss create mode 100644 src/scss/cdb-components/shapes/hamburguer.scss create mode 100644 src/scss/cdb-components/shapes/magnify.scss create mode 100644 src/scss/cdb-components/shapes/threePoints.scss diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 2c7eb83aa37161bf0e107e884cf4430e3bfce937..beebd56d80a7a94791563089b2e17c72a71e1310 100644 GIT binary patch delta 52 zcmZ26nQ_Hr#tAk|*R?0wZD87HGx5VTDedd={5D@1xEX&j0KuhmJ2YYR<^_x#9sm}% B6Ey$; delta 52 zcmZ26nQ_Hr#tAk|+@B}fZD8_UH1WeUsn6W;{5D@1xEX&j0KuhmZ80!<^8!W=4*(S> B6EOe) diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 323c7e1e2413a1d96777bd9cc3449e7df461e546..aac2414427a64899e9651b18c7289d8681eb175f 100644 GIT binary patch delta 45 ucmew}k@3$&#tBYL8*L`KOq0^S9?x&{m4Tb_7XuJnI=4d;MsNJW;Q;`W_z?jB delta 45 ucmew}k@3$&#tBYLzKbThOq2S|9nWv`m4Tb_7XuJnI@cBhqc?ux@Bjdk+z|l) diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 05a4401d08f5b55324963f3d61dceff9641efe81..86a0a3d7f5a362080bf1696c33bc8d4664a8103e 100644 GIT binary patch delta 59 zcmV-B0L1^iT)bS6dIGULv3$2CDE!9p{5D@1xEX%|MHnuf+o1`g-<1FV&K1G<2gv1M RU;>E(0CtKFBC}g3;Ra~|8?*ob delta 59 zcmV-B0L1^iT)bS6dIC+Nv3$2CDA&^C`E9;3a5Me_iZEO{*A@e#-<1FV&K1G<2gv1M RU;>E(0HH(=AG2F0;RbxK90LFV diff --git a/src/scss/cdb-components/shapes.scss b/src/scss/cdb-components/shapes.scss deleted file mode 100644 index 6b29308..0000000 --- a/src/scss/cdb-components/shapes.scss +++ /dev/null @@ -1,252 +0,0 @@ -// Shape styles -// ---------------------------------------------- - -/* SG -# Shapes/Dot - -You may resize and change the colors of the icons with the `glyph-`-classes. Available sizes and colors listed: - -``` - - -``` -*/ - -@import '../cdb-utilities/mixins'; - - -.CDB-Shape-dot { - display: inline-block; - width: 8px; - min-width: 8px; - height: 8px; - border-radius: 8px; -} - -/* SG -# Shapes/threePoints - -Description - -``` -
-``` -*/ - -.CDB-Shape-threePoints { - display: inline-block; - position: relative; - width: 3px; - height: 16px; - margin-right: -7px; - margin-left: 6px; - padding: 0 7px 0 10px; - text-align: center; - vertical-align: middle; - - &:after, - &:before { - display: inline-block; - position: absolute; - width: 3px; - height: 3px; - border-radius: 50%; - content: ''; - z-index: 1; - } - - &:before { - top: 0; - right: 7px; - } - - &:after { - right: 7px; - bottom: 1px; - } - - &:hover { - cursor: pointer; - } -} - -.CDB-Shape-threePointsItem { - display: block; - position: absolute; - top: 6px; - left: 7px; - width: 3px; - height: 3px; - border-radius: 50%; -} - -/* SG -# Shapes/lens - -Description - -``` -
-``` -*/ - -.CDB-Shape-lens { - display: inline-block; - position: relative; - width: 16px; - height: 16px; - - &:after, - &:before { - position: absolute; - content: ''; - } - &:after { - top: 0; - left: 0; - width: 8px; - height: 8px; - border: 1px solid transparent; - border-radius: 10px; - } - &:before { - @include css3-prefix(transform, rotate(45deg)); - right: 3px; - bottom: 5px; - width: 6px; - height: 1px; - } - - &:hover { - cursor: pointer; - } -} - -/* SG -# Shapes/hamburguer - -Description - -``` -
-``` -*/ - -.CDB-Shape-hamburguer { - display: inline-block; - position: relative; - width: 16px; - height: 2px; - border: 0; - background: #FFF; - vertical-align: middle; - - &:before, - &:after { - display: block; - position: absolute; - width: 16px; - height: 2px; - background: #FFF; - content: ''; - } - &:before { - top: -6px; - } - &:after { - bottom: -6px; - } -} - -/* SG -# Shapes/magnify - -Description - -``` -
-``` -*/ - -.CDB-Shape-magnify { - display: block; - position: relative; - width: 32px; - height: 32px; - &:before { - display: block; - position: absolute; - top: 10px; - left: 10px; - width: 7px; - height: 7px; - border: 1px solid #636D72; - border-radius: 50%; - content: ''; - } - &:after { - display: block; - position: absolute; - top: 17px; - left: 19px; - width: 1px; - height: 6px; - transform: rotate(314deg); - background: #636D72; - content: ''; - } -} - -/* SG -# Shapes/arrow - -Description - -``` -
-``` -*/ - -.CDB-Shape-Arrow { - display: block; - position: absolute; - width: 1px; - height: 8px; - background: #32A8E6; - - &:before { - display: block; - position: absolute; - top: 2px; - left: 0; - width: 5px; - height: 1px; - transform: rotate(45deg); - background: #32A8E6; - content: ''; - } - - &:after { - display: block; - position: absolute; - top: 2px; - left: -4px; - width: 5px; - height: 1px; - transform: rotate(-45deg); - background: #32A8E6; - content: ''; - } -} - -.CDB-Shape-Arrow--top { - top: 6px; - right: 9px; - transform: rotate(45deg); -} - -.CDB-Shape-Arrow--bottom { - top: 13px; - left: 46px; - transform: rotate(-135deg); -} diff --git a/src/scss/cdb-components/shapes/arrow.scss b/src/scss/cdb-components/shapes/arrow.scss new file mode 100644 index 0000000..6565e39 --- /dev/null +++ b/src/scss/cdb-components/shapes/arrow.scss @@ -0,0 +1,86 @@ +/* SG +# Shapes/Arrow + +Description + +``` +
+
+
+
+
+
+
+
+
+``` +*/ + +@import '../../cdb-variables/colors'; + +.CDB-Shape-Arrow { + position: relative; + width: 1px; + height: 8px; + background: $cMainDark; + + &::before { + display: block; + position: absolute; + top: 2px; + left: 0; + width: 5px; + height: 1px; + transform: rotate(45deg); + background: $cMainDark; + content: ''; + } + + &::after { + display: block; + position: absolute; + top: 2px; + left: -4px; + width: 5px; + height: 1px; + transform: rotate(-45deg); + background: $cMainDark; + content: ''; + } +} + +.CDB-Shape-Arrow--top { + top: 6px; + right: 9px; + transform: rotate(45deg); +} + +.CDB-Shape-Arrow--bottom { + top: 13px; + left: 46px; + transform: rotate(-135deg); +} + +.CDB-Shape-Arrow.is-blue { + background: $cBlue; + + &::before { + background: $cBlue; + } + + &::after { + background: $cBlue; + } +} + +.CDB-Shape-Arrow.is-white { + background: $cWhite; + + &::before { + background: $cWhite; + } + + &::after { + background: $cWhite; + } +} diff --git a/src/scss/cdb-components/shapes/dots.scss b/src/scss/cdb-components/shapes/dots.scss new file mode 100644 index 0000000..3b55072 --- /dev/null +++ b/src/scss/cdb-components/shapes/dots.scss @@ -0,0 +1,28 @@ +// Shape styles +// ---------------------------------------------- + +/* SG +# Shapes/Dots + +You may resize and change the colors of the icons with the `glyph-`-classes. Available sizes and colors listed: + +``` + + +``` +*/ + +@import '../../cdb-variables/colors'; +@import '../../cdb-variables/sizes'; + +.CDB-Shape-dot { + display: inline-block; + width: $baseSize; + height: $baseSize; + border-radius: 50%; + background: $cSecondaryLine; + + &.is-selected { + background: $cTypo2; + } +} diff --git a/src/scss/cdb-components/shapes/hamburguer.scss b/src/scss/cdb-components/shapes/hamburguer.scss new file mode 100644 index 0000000..7b8ceff --- /dev/null +++ b/src/scss/cdb-components/shapes/hamburguer.scss @@ -0,0 +1,63 @@ +/* SG +# Shapes/Hamburguer + +Description + +``` +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+``` +*/ + +@import '../../cdb-variables/colors'; +@import '../../cdb-variables/sizes'; + +.CDB-Shape-hamburguer { + width: $baseSize * 2; + &:hover { + cursor: pointer; + } +} + +.CDB-Shape-hamburguerItem { + height: $baseSize / 4; + margin-bottom: $baseSize / 4; + background: $cMainDark; + + &:last-child { + margin-bottom: 0; + } +} + +.CDB-Shape-hamburguer.is-blue { + .CDB-Shape-hamburguerItem { + background: $cBlue; + } +} + +.CDB-Shape-hamburguer.is-white { + .CDB-Shape-hamburguerItem { + background: $cWhite; + } +} diff --git a/src/scss/cdb-components/shapes/magnify.scss b/src/scss/cdb-components/shapes/magnify.scss new file mode 100644 index 0000000..f5857d3 --- /dev/null +++ b/src/scss/cdb-components/shapes/magnify.scss @@ -0,0 +1,70 @@ +/* SG +# Shapes/Magnify + +Description + +``` +
+
+
+
+
+
+
+
+
+``` +*/ + +@import '../../cdb-variables/colors'; + +.CDB-Shape-magnify { + position: relative; + width: 32px; + height: 32px; + + &::before { + display: block; + position: absolute; + top: 10px; + left: 10px; + width: 7px; + height: 7px; + border: 1px solid $cMainDark; + border-radius: 50%; + content: ''; + } + + &::after { + display: block; + position: absolute; + top: 17px; + left: 19px; + width: 1px; + height: 6px; + transform: rotate(314deg); + background: $cMainDark; + content: ''; + } + &:hover { + cursor: pointer; + } +} + +.CDB-Shape-magnify.is-blue { + &:before { + border: 1px solid $cBlue; + } + &:after { + background: $cBlue; + } +} + +.CDB-Shape-magnify.is-white { + &:before { + border: 1px solid $cWhite; + } + &:after { + background: $cWhite; + } +} diff --git a/src/scss/cdb-components/shapes/threePoints.scss b/src/scss/cdb-components/shapes/threePoints.scss new file mode 100644 index 0000000..7234a32 --- /dev/null +++ b/src/scss/cdb-components/shapes/threePoints.scss @@ -0,0 +1,64 @@ +/* SG +# Shapes/Three Points + +Description + +``` +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+``` +*/ + +@import '../../cdb-variables/colors'; + +.CDB-Shape-threePoints { + display: inline-block; + position: relative; + width: 3px; + height: 15px; + padding: 0 12; + + &:hover { + cursor: pointer; + } +} + +.CDB-Shape-threePointsItem { + width: 3px; + height: 3px; + margin-bottom: 3px; + border-radius: 50%; + background: $cMainDark; +} + +.CDB-Shape-threePoints.is-blue { + .CDB-Shape-threePointsItem { + background: $cBlue; + } +} + +.CDB-Shape-threePoints.is-white { + .CDB-Shape-threePointsItem { + background: $cWhite; + } +} + From ac500fb06eab42544b80b5507445c6c93af43140 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Thu, 28 Jan 2016 16:14:00 +0100 Subject: [PATCH 02/12] add shapes --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-components/shapes/close.scss | 115 ++++++++++++++++++ src/scss/cdb-components/shapes/magnify.scss | 84 ++++++++++--- .../cdb-components/shapes/threePoints.scss | 101 +++++++++++---- 6 files changed, 261 insertions(+), 39 deletions(-) create mode 100644 src/scss/cdb-components/shapes/close.scss diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index beebd56d80a7a94791563089b2e17c72a71e1310..a07b1ff2e07227be842edb645583b412f26abaea 100644 GIT binary patch delta 55 zcmZ26nQ_Hr#tAmemp8Obv|q>Eo40S`hpEyn8!pH5+k9oG F005!y7fb*E delta 55 zcmZ26nQ_Hr#tAme*R?w)+OK2o-e@!N!&K=G?d$RUHeVUI8GkVV!KHIMG-34S1&kaX E0B3C!(EtDd diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index aac2414427a64899e9651b18c7289d8681eb175f..5fbce8e1e18568bfe0925802a57f70e3b9683cfd 100644 GIT binary patch delta 47 wcmew}k@3$&#tDwhy?Og4x=fXB*>E|Y-{va=H{&k`Ah>jX+AA2n@e79s0Oao!5&!@I delta 47 wcmew}k@3$&#tDwh-5YHtx=fYs(7qneZ}XLboADO|5L`O9LlZ`C{KDY@0K#Mv6aWAK diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 86a0a3d7f5a362080bf1696c33bc8d4664a8103e..79b2a79d38e099205ea6dee043e043705074bfb0 100644 GIT binary patch delta 61 zcmV-D0K)&gT)bS6c>|4ZzOj6^CMnHR^yB$$zA|t#{sM|HTslAP6^wpU{{K5y1mhnd TmxF-`Bnkkih7aGfTPNWLnvEO9 delta 61 zcmV-D0K)&gT)bS6c>{~FJh6PXCMoUw#_{|%Um3U=e*r}pE}h$<38UYX|NqVv!T1Nr T16px +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

12px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+``` +*/ + +@import '../../cdb-variables/colors'; + +.CDB-Shape { + width: 16px; + height: 16px; + text-align: center; + &:hover { + cursor: pointer; + } +} + +.CDB-Shape-close { + display: block; + position: relative; + height: 100%; + + &::before { + display: block; + position: absolute; + top: -2px; + left: 7px; + width: 1px; + height: 20px; + transform: rotate(-45deg); + background: $cMainDark; + content: ''; + } + &::after { + display: block; + position: absolute; + top: -2px; + right: 8px; + width: 1px; + height: 20px; + transform: rotate(45deg); + background: $cMainDark; + content: ''; + } + &.is-small { + &::before { + top: 2px; + left: 7px; + height: 12px; + transform: rotate(-45deg); + } + &::after { + top: 2px; + right: 8px; + height: 12px; + } + } +} + +.CDB-Shape-close.is-blue { + &::before { + background: $cBlue; + } + &::after { + background: $cBlue; + } +} + +.CDB-Shape-close.is-white { + &::before { + background: $cWhite; + } + &::after { + background: $cWhite; + } +} diff --git a/src/scss/cdb-components/shapes/magnify.scss b/src/scss/cdb-components/shapes/magnify.scss index f5857d3..3dc9edd 100644 --- a/src/scss/cdb-components/shapes/magnify.scss +++ b/src/scss/cdb-components/shapes/magnify.scss @@ -4,32 +4,69 @@ Description ``` +

16px

-
+
+
+
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+

12px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
``` */ @import '../../cdb-variables/colors'; +.CDB-Shape { + width: 16px; + height: 16px; + text-align: center; + &:hover { + cursor: pointer; + } +} + .CDB-Shape-magnify { + display: block; position: relative; - width: 32px; - height: 32px; + height: 100%; &::before { display: block; position: absolute; - top: 10px; - left: 10px; - width: 7px; - height: 7px; + top: 0; + left: 0; + width: 11px; + height: 11px; border: 1px solid $cMainDark; border-radius: 50%; content: ''; @@ -38,17 +75,14 @@ Description &::after { display: block; position: absolute; - top: 17px; - left: 19px; + right: 2px; + bottom: -1px; width: 1px; - height: 6px; + height: 7px; transform: rotate(314deg); background: $cMainDark; content: ''; } - &:hover { - cursor: pointer; - } } .CDB-Shape-magnify.is-blue { @@ -68,3 +102,23 @@ Description background: $cWhite; } } + +.CDB-Shape-magnify.is-small { + &::before { + top: 3px; + left: 3px; + width: 6px; + height: 6px; + } + + &::after { + display: block; + position: absolute; + right: 4px; + bottom: 2px; + width: 1px; + height: 5px; + transform: rotate(314deg); + content: ''; + } +} diff --git a/src/scss/cdb-components/shapes/threePoints.scss b/src/scss/cdb-components/shapes/threePoints.scss index 7234a32..cf5b1d7 100644 --- a/src/scss/cdb-components/shapes/threePoints.scss +++ b/src/scss/cdb-components/shapes/threePoints.scss @@ -4,25 +4,64 @@ Description ``` +

16px

-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+

12px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
``` @@ -30,24 +69,38 @@ Description @import '../../cdb-variables/colors'; -.CDB-Shape-threePoints { - display: inline-block; - position: relative; - width: 3px; - height: 15px; - padding: 0 12; - +.CDB-Shape { + width: 16px; + height: 16px; + text-align: center; &:hover { cursor: pointer; } } +.CDB-Shape-threePoints { + display: inline-block; + height: 100%; +} + .CDB-Shape-threePointsItem { - width: 3px; - height: 3px; - margin-bottom: 3px; - border-radius: 50%; + width: 2px; + height: 2px; + margin-bottom: 5px; background: $cMainDark; + &:last-child { + margin-bottom: 0; + } +} + +.CDB-Shape-threePoints.is-small { + padding-top: 2px; + + .CDB-Shape-threePointsItem { + width: 2px; + height: 2px; + margin-bottom: 3px; + } } .CDB-Shape-threePoints.is-blue { From ea8da9d88a0d3f96ce4fa32943bab39e1093481e Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Fri, 29 Jan 2016 13:30:23 +0100 Subject: [PATCH 03/12] add assets --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-components/shapes/add.scss | 126 ++++++++++++++ src/scss/cdb-components/shapes/move.scss | 140 ++++++++++++++++ src/scss/cdb-components/shapes/subtract.scss | 94 +++++++++++ .../cdb-components/shapes/toogle-arrow.scss | 157 ++++++++++++++++++ 7 files changed, 517 insertions(+) create mode 100644 src/scss/cdb-components/shapes/add.scss create mode 100644 src/scss/cdb-components/shapes/move.scss create mode 100644 src/scss/cdb-components/shapes/subtract.scss create mode 100644 src/scss/cdb-components/shapes/toogle-arrow.scss diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index a07b1ff2e07227be842edb645583b412f26abaea..fee0da095cc0502fdae87dfc93a92eaa23222857 100644 GIT binary patch delta 55 zcmZ26nQ_Hr#tAmet8?oo+OK1tAP_Y1!&K?|+|}{?HeVUI8GkVV!KDk&x4`Jl3m7>( E0A^|x-2eap delta 55 zcmZ26nQ_Hr#tAmemp8Obv|q>Eo40S`hpEyn8!pH5+k9oG F005!y7fb*E diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 5fbce8e1e18568bfe0925802a57f70e3b9683cfd..9437c86a3871af192822af61ce1fae9b0ef30105 100644 GIT binary patch delta 47 wcmew}k@3$&#tDwh69j@Lx=fX>&s`nQZ}XLboADO|5L~+Od<%@;_=Up*0KPmE6951J delta 47 wcmew}k@3$&#tDwhy?Og4x=fXB*>E|Y-{va=H{&k`Ah>jX+AA2n@e79s0Oao!5&!@I diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 79b2a79d38e099205ea6dee043e043705074bfb0..60e4edac2986799b255f4c283ae81cab72b528bc 100644 GIT binary patch delta 61 zcmV-D0K)&gT)bS6c>|CTQn7rtCMk7+?D70IUm3U=e*r}pE?s!O1xCLq|NosUg7FWK T%fY||5(NO87Z0biTPNWLOVt`f delta 61 zcmV-D0K)&gT)bS6c>|4ZzOj6^CMnHR^yB$$zA|t#{sM|HTslAP6^wpU{{K5y1mhnd TmxF-`Bnkkih7aGfTPNWLnvEO9 diff --git a/src/scss/cdb-components/shapes/add.scss b/src/scss/cdb-components/shapes/add.scss new file mode 100644 index 0000000..e0a4ecc --- /dev/null +++ b/src/scss/cdb-components/shapes/add.scss @@ -0,0 +1,126 @@ +/* SG +# Shapes/Add + +Description + +``` +

16px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

12px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+``` +*/ + +@import '../../cdb-variables/colors'; + +.CDB-Shape { + width: 16px; + height: 16px; + text-align: center; + &:hover { + cursor: pointer; + } +} + +.CDB-Shape-add { + position: relative; + height: 100%; + + &::before { + display: block; + position: absolute; + right: 1px; + bottom: 7px; + left: 0; + height: 1px; + background: $cMainDark; + content: ''; + } + + &::after { + display: block; + position: absolute; + top: 1; + bottom: 0; + left: 7px; + width: 1px; + background: $cMainDark; + content: ''; + } +} + +.CDB-Shape-add.is-small { + + &::before { + display: block; + position: absolute; + right: 3px; + bottom: 7px; + left: 4px; + height: 1px; + background: $cMainDark; + content: ''; + } + + &::after { + display: block; + position: absolute; + top: 4px; + bottom: 3px; + left: 8px; + width: 1px; + background: $cMainDark; + content: ''; + } +} + + + +.CDB-Shape-add.is-blue { + &::before, + &::after { + background: $cBlue; + } +} + +.CDB-Shape-add.is-white { + &::before, + &::after { + background: $cWhite; + } +} + + + diff --git a/src/scss/cdb-components/shapes/move.scss b/src/scss/cdb-components/shapes/move.scss new file mode 100644 index 0000000..cdb8d40 --- /dev/null +++ b/src/scss/cdb-components/shapes/move.scss @@ -0,0 +1,140 @@ +/* SG +# Shapes/Move + +Description + +``` +

16px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

12px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+``` +*/ + +@import '../../cdb-variables/colors'; + +.CDB-Shape { + width: 16px; + height: 16px; + text-align: center; + + &:hover { + cursor: pointer; + } +} + +.CDB-Shape-Move { + padding: 1px 0 0; +} + +.CDB-Shape-Move.is-small { + padding: 3px 0 0 1px; + + .CDB-Shape-MoveItem { + margin-bottom: 2px; + + &::before { + width: 2px; + height: 2px; + } + &::after { + width: 2px; + height: 2px; + margin-left: 1px; + } + } +} + +.CDB-Shape-MoveItem { + margin-bottom: 3px; + + &:last-child { + margin-bottom: 0; + } + &::before { + display: inline-block; + width: 3px; + height: 3px; + background: $cMainDark; + content: ''; + } + + &::after { + display: inline-block; + width: 3px; + height: 3px; + margin-left: 2px; + background: $cMainDark; + content: ''; + } +} + +.CDB-Shape-MoveItem.is-blue { + &::before, + &::after { + background: $cBlue; + } +} + +.CDB-Shape-MoveItem.is-white { + &::before, + &::after { + background: $cWhite; + } +} diff --git a/src/scss/cdb-components/shapes/subtract.scss b/src/scss/cdb-components/shapes/subtract.scss new file mode 100644 index 0000000..c80d079 --- /dev/null +++ b/src/scss/cdb-components/shapes/subtract.scss @@ -0,0 +1,94 @@ +/* SG +# Shapes/Subtract + +Description + +``` +

16px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

12px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+``` +*/ + +@import '../../cdb-variables/colors'; + +.CDB-Shape { + width: 16px; + height: 16px; + text-align: center; + &:hover { + cursor: pointer; + } +} + +.CDB-Shape-subtract { + position: relative; + height: 100%; + + &::before { + display: block; + position: absolute; + right: 2px; + bottom: 7px; + left: 2px; + height: 1px; + background: $cMainDark; + content: ''; + } +} + +.CDB-Shape-subtract.is-small { + + &::before { + right: 3px; + left: 3px; + } +} + +.CDB-Shape-subtract.is-blue { + &::before { + background: $cBlue; + } +} + +.CDB-Shape-subtract.is-white { + &::before { + background: $cWhite; + } +} + + + diff --git a/src/scss/cdb-components/shapes/toogle-arrow.scss b/src/scss/cdb-components/shapes/toogle-arrow.scss new file mode 100644 index 0000000..da35dfb --- /dev/null +++ b/src/scss/cdb-components/shapes/toogle-arrow.scss @@ -0,0 +1,157 @@ +/* SG +# Shapes/Toogle Arrows + +Description + +``` +

16px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

12px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

16px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

12px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+``` +*/ + +@import '../../cdb-variables/colors'; + +.CDB-Shape { + width: 16px; + height: 16px; + text-align: center; + + &:hover { + cursor: pointer; + } +} + +.CDB-ArrowToogle { + position: relative; + height: 100%; + + &::before { + display: block; + position: absolute; + top: 8px; + left: 0; + width: 10px; + height: 1px; + transform: rotate(-45deg); + background: $cMainDark; + content: ''; + } + &::after { + display: block; + position: absolute; + top: 8px; + right: -1px; + width: 10px; + height: 1px; + transform: rotate(45deg); + background: $cMainDark; + content: ''; + } +} + +.CDB-ArrowToogle.is-down { + transform: rotate(180deg); +} + +.CDB-ArrowToogle.is-small { + &::before { + left: 2px; + width: 8px; + } + &::after { + right: 1px; + width: 8px; + } +} + +.CDB-ArrowToogle.is-blue { + &::before { + background: $cBlue; + } + &::after { + background: $cBlue; + } +} + +.CDB-ArrowToogle.is-white { + &::before { + background: $cWhite; + } + &::after { + background: $cWhite; + } +} From d8a5d45cc33716ae1f4a5583c007eafb6a8938c2 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Fri, 29 Jan 2016 15:42:25 +0100 Subject: [PATCH 04/12] add shape circle --- .../cdb-components/shapes/check-circle.scss | 78 +++++++++++++++++++ src/scss/cdb-components/shapes/close.scss | 70 +++++++++++------ .../cdb-components/shapes/error-circle.scss | 78 +++++++++++++++++++ src/scss/cdb-components/shapes/magnify.scss | 9 --- src/scss/cdb-components/shapes/move.scss | 10 --- src/scss/cdb-components/shapes/subtract.scss | 9 --- .../cdb-components/shapes/threePoints.scss | 9 --- .../cdb-components/shapes/toogle-arrow.scss | 10 --- 8 files changed, 203 insertions(+), 70 deletions(-) create mode 100644 src/scss/cdb-components/shapes/check-circle.scss create mode 100644 src/scss/cdb-components/shapes/error-circle.scss diff --git a/src/scss/cdb-components/shapes/check-circle.scss b/src/scss/cdb-components/shapes/check-circle.scss new file mode 100644 index 0000000..cb2022f --- /dev/null +++ b/src/scss/cdb-components/shapes/check-circle.scss @@ -0,0 +1,78 @@ +/* SG +# Shapes/Check circle + +Description + +``` +

16px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

12px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+``` +*/ + +@import '../../cdb-variables/colors'; + +.CDB-Shape-CircleItem { + width: 14px; + height: 14px; + border: 1px solid $cMainDark; + border-radius: 50%; + + &.is-small { + width: 12px; + height: 12px; + margin: 2px auto; + } + &.is-blue { + border: 1px solid $cBlue; + } + &.is-white { + border: 1px solid $cWhite; + } +} + diff --git a/src/scss/cdb-components/shapes/close.scss b/src/scss/cdb-components/shapes/close.scss index bad5011..381dd8d 100644 --- a/src/scss/cdb-components/shapes/close.scss +++ b/src/scss/cdb-components/shapes/close.scss @@ -7,17 +7,17 @@ Description

16px

-
+
-
+
-
+

@@ -27,17 +27,17 @@ Description

12px

-
+
-
+
-
+
``` @@ -45,15 +45,6 @@ Description @import '../../cdb-variables/colors'; -.CDB-Shape { - width: 16px; - height: 16px; - text-align: center; - &:hover { - cursor: pointer; - } -} - .CDB-Shape-close { display: block; position: relative; @@ -62,10 +53,7 @@ Description &::before { display: block; position: absolute; - top: -2px; - left: 7px; width: 1px; - height: 20px; transform: rotate(-45deg); background: $cMainDark; content: ''; @@ -73,20 +61,30 @@ Description &::after { display: block; position: absolute; - top: -2px; - right: 8px; width: 1px; - height: 20px; transform: rotate(45deg); background: $cMainDark; content: ''; } - &.is-small { + + &.is-huge { + &::before { + top: -2px; + left: 7px; + height: 20px; + } + &::after { + top: -2px; + right: 8px; + height: 20px; + } + } + + &.is-large { &::before { top: 2px; left: 7px; height: 12px; - transform: rotate(-45deg); } &::after { top: 2px; @@ -94,6 +92,32 @@ Description height: 12px; } } + + &.is-medium { + &::before { + top: 3px; + left: 6px; + height: 8px; + } + &::after { + top: 3px; + right: 7px; + height: 8px; + } + } + + &.is-small { + &::before { + top: 2px; + left: 4px; + height: 6px; + } + &::after { + top: 2px; + right: 5px; + height: 6px; + } + } } .CDB-Shape-close.is-blue { diff --git a/src/scss/cdb-components/shapes/error-circle.scss b/src/scss/cdb-components/shapes/error-circle.scss new file mode 100644 index 0000000..73c00d4 --- /dev/null +++ b/src/scss/cdb-components/shapes/error-circle.scss @@ -0,0 +1,78 @@ +/* SG +# Shapes/Error circle + +Description + +``` +

16px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

12px

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+``` +*/ + +@import '../../cdb-variables/colors'; + +.CDB-Shape-CircleItem { + width: 14px; + height: 14px; + border: 1px solid $cMainDark; + border-radius: 50%; + + &.is-small { + width: 10px; + height: 10px; + margin: 2px auto; + } + &.is-blue { + border: 1px solid $cBlue; + } + &.is-white { + border: 1px solid $cWhite; + } +} + diff --git a/src/scss/cdb-components/shapes/magnify.scss b/src/scss/cdb-components/shapes/magnify.scss index 3dc9edd..cf3edc4 100644 --- a/src/scss/cdb-components/shapes/magnify.scss +++ b/src/scss/cdb-components/shapes/magnify.scss @@ -46,15 +46,6 @@ Description @import '../../cdb-variables/colors'; -.CDB-Shape { - width: 16px; - height: 16px; - text-align: center; - &:hover { - cursor: pointer; - } -} - .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 cdb8d40..e1f423b 100644 --- a/src/scss/cdb-components/shapes/move.scss +++ b/src/scss/cdb-components/shapes/move.scss @@ -69,16 +69,6 @@ Description @import '../../cdb-variables/colors'; -.CDB-Shape { - width: 16px; - height: 16px; - text-align: center; - - &:hover { - cursor: pointer; - } -} - .CDB-Shape-Move { padding: 1px 0 0; } diff --git a/src/scss/cdb-components/shapes/subtract.scss b/src/scss/cdb-components/shapes/subtract.scss index c80d079..5664987 100644 --- a/src/scss/cdb-components/shapes/subtract.scss +++ b/src/scss/cdb-components/shapes/subtract.scss @@ -45,15 +45,6 @@ Description @import '../../cdb-variables/colors'; -.CDB-Shape { - width: 16px; - height: 16px; - text-align: center; - &:hover { - cursor: pointer; - } -} - .CDB-Shape-subtract { position: relative; height: 100%; diff --git a/src/scss/cdb-components/shapes/threePoints.scss b/src/scss/cdb-components/shapes/threePoints.scss index cf5b1d7..7f73c0a 100644 --- a/src/scss/cdb-components/shapes/threePoints.scss +++ b/src/scss/cdb-components/shapes/threePoints.scss @@ -69,15 +69,6 @@ Description @import '../../cdb-variables/colors'; -.CDB-Shape { - width: 16px; - height: 16px; - text-align: center; - &:hover { - cursor: pointer; - } -} - .CDB-Shape-threePoints { display: inline-block; height: 100%; diff --git a/src/scss/cdb-components/shapes/toogle-arrow.scss b/src/scss/cdb-components/shapes/toogle-arrow.scss index da35dfb..86f302a 100644 --- a/src/scss/cdb-components/shapes/toogle-arrow.scss +++ b/src/scss/cdb-components/shapes/toogle-arrow.scss @@ -85,16 +85,6 @@ Description @import '../../cdb-variables/colors'; -.CDB-Shape { - width: 16px; - height: 16px; - text-align: center; - - &:hover { - cursor: pointer; - } -} - .CDB-ArrowToogle { position: relative; height: 100%; From 5024e786bedd28c9f7da3cd45d94a9fc7bb72672 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Fri, 29 Jan 2016 16:36:32 +0100 Subject: [PATCH 05/12] add checks --- .../cdb-components/shapes/check-circle.scss | 84 +++++++++++++++++-- 1 file changed, 76 insertions(+), 8 deletions(-) diff --git a/src/scss/cdb-components/shapes/check-circle.scss b/src/scss/cdb-components/shapes/check-circle.scss index cb2022f..3b109e4 100644 --- a/src/scss/cdb-components/shapes/check-circle.scss +++ b/src/scss/cdb-components/shapes/check-circle.scss @@ -8,21 +8,21 @@ Description
-
+
-
+
-
+
-
+
@@ -34,21 +34,21 @@ Description
-
+
-
+
-
+
@@ -66,7 +66,7 @@ Description &.is-small { width: 12px; height: 12px; - margin: 2px auto; + transform: translateY(2px); } &.is-blue { border: 1px solid $cBlue; @@ -76,3 +76,71 @@ Description } } +.CDB-Shape-tick { + display: block; + position: relative; + height: 100%; + + &::before { + display: block; + position: absolute; + width: 1px; + transform: rotate(-45deg); + background: $cMainDark; + content: ''; + } + &::after { + display: block; + position: absolute; + width: 1px; + transform: rotate(45deg); + background: $cMainDark; + content: ''; + } + + &.is-medium { + &::before { + top: 6px; + left: 4px; + height: 4px; + } + &::after { + top: 4px; + right: 5px; + height: 7px; + } + } + + &.is-small { + &::before { + top: 5px; + left: 3px; + height: 3px; + } + &::after { + top: 3px; + right: 3px; + height: 5px; + } + } +} + +.CDB-Shape-tick.is-blue { + &::before { + background: $cBlue; + } + &::after { + background: $cBlue; + } +} + +.CDB-Shape-tick.is-white { + &::before { + background: $cWhite; + } + &::after { + background: $cWhite; + } +} + + From 6257d6032ed64b2d6a134462fc62204ea0c1098f Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 1 Feb 2016 11:14:08 +0100 Subject: [PATCH 06/12] update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 026b87e..370c27a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.23", + "version": "0.1.24", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "CartoDB", From f6dfad3b79e83fd47ccdb4bb17e28bcc7bc8cdb0 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 1 Feb 2016 11:19:41 +0100 Subject: [PATCH 07/12] fix hound --- src/scss/cdb-components/shapes/add.scss | 2 +- src/scss/cdb-components/shapes/check-circle.scss | 2 +- src/scss/cdb-components/shapes/error-circle.scss | 3 +-- src/scss/cdb-components/shapes/magnify.scss | 8 ++++---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/scss/cdb-components/shapes/add.scss b/src/scss/cdb-components/shapes/add.scss index e0a4ecc..570d5b4 100644 --- a/src/scss/cdb-components/shapes/add.scss +++ b/src/scss/cdb-components/shapes/add.scss @@ -46,7 +46,7 @@ Description @import '../../cdb-variables/colors'; .CDB-Shape { - width: 16px; + width: 16px; height: 16px; text-align: center; &:hover { diff --git a/src/scss/cdb-components/shapes/check-circle.scss b/src/scss/cdb-components/shapes/check-circle.scss index 3b109e4..c8bb269 100644 --- a/src/scss/cdb-components/shapes/check-circle.scss +++ b/src/scss/cdb-components/shapes/check-circle.scss @@ -74,7 +74,7 @@ Description &.is-white { border: 1px solid $cWhite; } -} +} .CDB-Shape-tick { display: block; diff --git a/src/scss/cdb-components/shapes/error-circle.scss b/src/scss/cdb-components/shapes/error-circle.scss index 73c00d4..94eea5d 100644 --- a/src/scss/cdb-components/shapes/error-circle.scss +++ b/src/scss/cdb-components/shapes/error-circle.scss @@ -74,5 +74,4 @@ Description &.is-white { border: 1px solid $cWhite; } -} - +} diff --git a/src/scss/cdb-components/shapes/magnify.scss b/src/scss/cdb-components/shapes/magnify.scss index cf3edc4..7f4f2f0 100644 --- a/src/scss/cdb-components/shapes/magnify.scss +++ b/src/scss/cdb-components/shapes/magnify.scss @@ -77,19 +77,19 @@ Description } .CDB-Shape-magnify.is-blue { - &:before { + &::before { border: 1px solid $cBlue; } - &:after { + &::after { background: $cBlue; } } .CDB-Shape-magnify.is-white { - &:before { + &::before { border: 1px solid $cWhite; } - &:after { + &::after { background: $cWhite; } } From 033f50300d42f7ff56b99d0875172c0df7b7c0e2 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 1 Feb 2016 17:16:15 +0100 Subject: [PATCH 08/12] add headers --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/img/avatar-40x40.png | Bin 0 -> 4350 bytes src/scss/cdb-components/avatars.scss | 54 +++++++++ src/scss/cdb-components/forms/inputs.scss | 2 +- src/scss/cdb-components/headers.scss | 133 ++++++++++++++++++++++ src/scss/cdb-components/tags.scss | 48 ++++++++ src/scss/cdb-components/typography.scss | 3 +- src/scss/cdb-utilities/helpers.scss | 10 ++ 10 files changed, 248 insertions(+), 2 deletions(-) create mode 100644 src/img/avatar-40x40.png create mode 100644 src/scss/cdb-components/avatars.scss create mode 100644 src/scss/cdb-components/headers.scss create mode 100644 src/scss/cdb-components/tags.scss diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index d9aff25db436abd65a4564b57cf68ec2a86c9fc6..474080a97e0b1ea52f04ac371dfcdd8b620ffad4 100644 GIT binary patch delta 55 zcmZ26nQ_Hr#tAme&qeYl+OK1tVY6l8hpE!}BG2RbZN4&aGyY-#f=gHaK84Yn7cg>o F004Cm7OwyR delta 55 zcmZ26nQ_Hr#tAme?Mpi*+OK2oE=igAVXAb;()M_Mo39MqjK3Iw;L^F7dtvnE1&kaX E0C|NK`Tzg` diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index f61778a2a48bf4cc6baa0b97b9c434d2d5d69e3f..c936f3d9f0fb34a6e6a8307d06054483ff11a341 100644 GIT binary patch delta 47 wcmew}k@3$&#tDwhGikp?^77P@e79s0MmdJ5&!@I delta 47 wcmew}k@3$&#tDwh-6bg#U8YKRENzeHxB1Gz&G?G}2riwQxfe!n{KDY@0L*I>6951J diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index f8f872e7914b30d6824210f790094499f77353bc..ee96c45ed0d81d0db32e2ea69ffb807387c76cf8 100644 GIT binary patch delta 61 zcmV-D0K)&gT)bS6c>|a{w6T1)CMmf;oa6azzA|t#{sM|HT)Oi2DU5zo{{K5y1mhnd TmxF-`Bnkk`m=O=NTPNWLpAQ?& delta 61 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 +
  • + User Name +
    • +
  • + User Name +
    • +
  • + User Name +
    • +
  • + +
    • + +``` +*/ + +@import '../cdb-variables/sizes'; +@import '../cdb-variables/colors'; + +.CDB-AvatarList { + padding-left: 12px; +} + +.CDB-AvatarList-item { + display: inline-block; + margin-left: -12px; + border: 2px solid $cWhite; + border-radius: 50%; + vertical-align: middle; +} + +.CDB-AvatarList-itemMore { + display: inline-block; + margin-left: -12px; + padding: 2px 6px; + border-left: 2px solid $cWhite; + border-radius: 50px; + background: $cSecondaryLine; + color: $cTypo2; +} + +.CDB-AvatarList-itemMedia { + width: 16px; + height: 16px; + border-radius: 50%; +} diff --git a/src/scss/cdb-components/forms/inputs.scss b/src/scss/cdb-components/forms/inputs.scss index 5e00e7a..9c4f75a 100644 --- a/src/scss/cdb-components/forms/inputs.scss +++ b/src/scss/cdb-components/forms/inputs.scss @@ -15,7 +15,7 @@ @import '../../cdb-variables/colors'; .CDB-InputText { - min-width: 152px; + width: 100%; padding: 7px 8px 6px; border: 1px solid $cMainLine; border-radius: 3px; diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss new file mode 100644 index 0000000..f657ea6 --- /dev/null +++ b/src/scss/cdb-components/headers.scss @@ -0,0 +1,133 @@ +// Typography styles +// ---------------------------------------------- + +/* SG +# Headers + +``` +
    +
    +

    Name map

    +
    +
      +
    • + +
      • +
    • +
        +
      • + User Name +
        • +
      • + User Name +
        • +
      • + User Name +
        • +
      • + +
        • +
      +
      • +
    • +

      Published 8 days ago

      +
      • +
    +
    +
    +
    +
    +
    + + + +
    +
    +

    Stadiums Affected

    +

    Rabo

    +
    +

    populated_places

    +
    +
    +
    +
    +
    + +
    + + + +
    +

    Basemap

    +

    Positron by CartoDB

    +
    +
    +
    +
    +
    + +
    + + + +
    + +

    populates_places

    +
    +
    +
    +
    +
    + +``` +*/ + +@import '../cdb-utilities/mixins'; +@import '../cdb-variables/sizes'; +@import '../cdb-variables/colors'; + +.CDB-HeaderInfo { + @include display-flex(); + + &.is-block { + display: block; + } +} + +.CDB-HeaderInfo-ListItem { + display: inline-block; + margin-right: 8px; + vertical-align: middle; + + &:last-child { + margin-right: 0; + } +} + +.CDB-HeaderInfo-Text { + color: $cTypo3; +} + +.CDB-HeaderInfo-Inner { + @include flex(1); +} + +.CDB-HeaderInfo-Back { + margin-top: 7px; +} + +.CDB-HeaderInfo-Title { + @include display-flex(); + @include align-items(center); +} + +.CDB-HeaderInfo-TitleText { + @include flex(1); + padding-right: 24px; +} + + + + diff --git a/src/scss/cdb-components/tags.scss b/src/scss/cdb-components/tags.scss new file mode 100644 index 0000000..d564edb --- /dev/null +++ b/src/scss/cdb-components/tags.scss @@ -0,0 +1,48 @@ +// Typography styles +// ---------------------------------------------- + +/* SG +# Tags + +``` + + + + +``` +*/ + +@import '../cdb-variables/sizes'; +@import '../cdb-variables/colors'; + + +.CDB-Tag { + border: 1px solid red; + padding: 0 3px; + border-radius: 2px; + + &.is-public { + border: 1px solid $cPublic; + color: $cPublic; + } + &.is-link { + border: 1px solid $cLink; + color: $cLink; + } + &.is-password { + border: 1px solid $cPassword; + color: $cPassword; + } + &.is-private { + border: 1px solid $cError; + color: $cError; + } +} diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index d9ec4aa..b02624d 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -6,10 +6,11 @@ ```

    Open Sans 26/34 Regular

    +

    Open Sans 26/34 Light

    Open Sans 16/22 Regular

    Open Sans 12/16 Semibold

    Open Sans 12/16 Regular

    -

    Open Sans 10/14 Semibold

    +

    Open Sans 10/14 Semibold

    Open Sans 10/14 Regular

    ``` */ diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index cee8ce7..1cb8a7b 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -6,6 +6,9 @@ .u-tSpace { margin-top: 4px; } +.u-tSpace--m { + margin-top: 8px; +} .u-tSpace-xl { margin-top: 12px; } @@ -27,6 +30,13 @@ .u-lSpace--xl { margin-left: 12px; } +.u-bSpace { + margin-bottom: 4px; +} +.u-bSpace--m { + margin-bottom: 8px; +} + .u-iBlock { @include inline-block(); } From bff9be2be6914d34f8c4608de50db914d93a4727 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 1 Feb 2016 17:56:03 +0100 Subject: [PATCH 09/12] fix CR --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-components/shapes/arrow.scss | 21 ++++++++--------- src/scss/cdb-components/shapes/close.scss | 12 +++++----- .../shapes/{subtract.scss => dash.scss} | 22 +++++++++--------- .../cdb-components/shapes/error-circle.scss | 8 +++---- 7 files changed, 31 insertions(+), 32 deletions(-) rename src/scss/cdb-components/shapes/{subtract.scss => dash.scss} (72%) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 230e56795e2952b800812dc7bff3dde5266a5d9a..05b79bf6e2c98a5763f873ff48197b13e7dd8d9a 100644 GIT binary patch delta 54 zcmZ26nQ_Hr#tAme*MH?sv|rD3a?ivMQ>Al%U61Ft`O3h}_=^DuE?srWgwdN9FmiYR E0Fr7I>;M1& delta 54 zcmZ26nQ_Hr#tAme=^^B>7+7`=G`BZmh7 DHmnob diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 48676226efff55c29589383c1d494e99602e5247..059b0812c5a4bb81bea1fa55ad1c14d4d218886e 100644 GIT binary patch delta 46 vcmew}k@3$&#tBYLC-+QrnJS(8>v}xD%~u9)#$OCTaOtW`CXC+rg~I~?&`}b5 delta 46 vcmew}k@3$&#tBYLGG8XTOqI?LNss5Z`O3h}_=^DuE?s%Y3ZplE;qU+erF0Q| diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 305080e362d45172519d05fc7547e9ad1d27592a..66453781d5b4ce6ec43c35c41fca8e183d6b2ee6 100644 GIT binary patch delta 60 zcmV-C0K@;hT)bS6dIHJ3v3#~BDLMCy@eh#8 S!N3F(1pt-_4)L>FC*cO0VjRr? diff --git a/src/scss/cdb-components/shapes/arrow.scss b/src/scss/cdb-components/shapes/arrow.scss index 6565e39..cb596d0 100644 --- a/src/scss/cdb-components/shapes/arrow.scss +++ b/src/scss/cdb-components/shapes/arrow.scss @@ -47,18 +47,17 @@ Description background: $cMainDark; content: ''; } -} + &.is-up { + top: 6px; + right: 9px; + transform: rotate(45deg); + } -.CDB-Shape-Arrow--top { - top: 6px; - right: 9px; - transform: rotate(45deg); -} - -.CDB-Shape-Arrow--bottom { - top: 13px; - left: 46px; - transform: rotate(-135deg); + &.is-down { + top: 13px; + left: 46px; + transform: rotate(-135deg); + } } .CDB-Shape-Arrow.is-blue { diff --git a/src/scss/cdb-components/shapes/close.scss b/src/scss/cdb-components/shapes/close.scss index 381dd8d..cbb8591 100644 --- a/src/scss/cdb-components/shapes/close.scss +++ b/src/scss/cdb-components/shapes/close.scss @@ -97,12 +97,12 @@ Description &::before { top: 3px; left: 6px; - height: 8px; + height: 7px; } &::after { top: 3px; - right: 7px; - height: 8px; + right: 6px; + height: 7px; } } @@ -110,12 +110,12 @@ Description &::before { top: 2px; left: 4px; - height: 6px; + height: 5px; } &::after { top: 2px; - right: 5px; - height: 6px; + right: 4px; + height: 5px; } } } diff --git a/src/scss/cdb-components/shapes/subtract.scss b/src/scss/cdb-components/shapes/dash.scss similarity index 72% rename from src/scss/cdb-components/shapes/subtract.scss rename to src/scss/cdb-components/shapes/dash.scss index 5664987..409bd20 100644 --- a/src/scss/cdb-components/shapes/subtract.scss +++ b/src/scss/cdb-components/shapes/dash.scss @@ -1,5 +1,5 @@ /* SG -# Shapes/Subtract +# Shapes/Dash Description @@ -7,17 +7,17 @@ Description

    16px

    -
    +
    -
    +
    -
    +

    @@ -27,17 +27,17 @@ Description

    12px

    -
    +
    -
    +
    -
    +
    ``` @@ -45,7 +45,7 @@ Description @import '../../cdb-variables/colors'; -.CDB-Shape-subtract { +.CDB-Shape-dash { position: relative; height: 100%; @@ -61,7 +61,7 @@ Description } } -.CDB-Shape-subtract.is-small { +.CDB-Shape-dash.is-small { &::before { right: 3px; @@ -69,13 +69,13 @@ Description } } -.CDB-Shape-subtract.is-blue { +.CDB-Shape-dash.is-blue { &::before { background: $cBlue; } } -.CDB-Shape-subtract.is-white { +.CDB-Shape-dash.is-white { &::before { background: $cWhite; } diff --git a/src/scss/cdb-components/shapes/error-circle.scss b/src/scss/cdb-components/shapes/error-circle.scss index 94eea5d..5a77161 100644 --- a/src/scss/cdb-components/shapes/error-circle.scss +++ b/src/scss/cdb-components/shapes/error-circle.scss @@ -58,14 +58,14 @@ Description @import '../../cdb-variables/colors'; .CDB-Shape-CircleItem { - width: 14px; - height: 14px; + width: 13px; + height: 13px; border: 1px solid $cMainDark; border-radius: 50%; &.is-small { - width: 10px; - height: 10px; + width: 9px; + height: 9px; margin: 2px auto; } &.is-blue { From 11f333651d5b70076a9a530dc1eae1b0715be3bf Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 2 Feb 2016 09:58:47 +0100 Subject: [PATCH 10/12] fix hound --- src/scss/cdb-components/shapes/dataset.scss | 2 +- src/scss/cdb-components/tags.scss | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/scss/cdb-components/shapes/dataset.scss b/src/scss/cdb-components/shapes/dataset.scss index 64bfb64..494918d 100644 --- a/src/scss/cdb-components/shapes/dataset.scss +++ b/src/scss/cdb-components/shapes/dataset.scss @@ -100,7 +100,7 @@ Description background: $cWhite; &:first-child { - position: relative; + position: relative; box-shadow: 3px 0 0 $cWhite; z-index: 1; } diff --git a/src/scss/cdb-components/tags.scss b/src/scss/cdb-components/tags.scss index d564edb..3df5a0b 100644 --- a/src/scss/cdb-components/tags.scss +++ b/src/scss/cdb-components/tags.scss @@ -25,7 +25,6 @@ .CDB-Tag { - border: 1px solid red; padding: 0 3px; border-radius: 2px; From ac99ac9c488dd2ea5afee88d6c3f4ff366e7d748 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 2 Feb 2016 10:36:40 +0100 Subject: [PATCH 11/12] fix padding --- src/scss/cdb-components/headers.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss index e2454b9..02ca1b2 100644 --- a/src/scss/cdb-components/headers.scss +++ b/src/scss/cdb-components/headers.scss @@ -179,7 +179,7 @@ .CDB-HeaderInfo-TitleText { @include flex(1); width: 0; - padding-right: 24px; + padding-right: 16px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; From 17163ae054d2dfecc4a3e071f0c4c0a6108a7fea Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Tue, 2 Feb 2016 11:53:34 +0100 Subject: [PATCH 12/12] Adds @matallo avatar for a 700% improvement --- src/img/avatar-40x40.png | Bin 4350 -> 6665 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/img/avatar-40x40.png b/src/img/avatar-40x40.png index f002732f920e0311292a11230e224c9ae930b67f..a261d7dedc687ad1f4d98663b4b4233934e392cb 100644 GIT binary patch literal 6665 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 T8tL?S00000NkvXXu0mjfOeCT_ literal 4350 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