From bff9be2be6914d34f8c4608de50db914d93a4727 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 1 Feb 2016 17:56:03 +0100 Subject: [PATCH] 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 {