From 0ab3ba2a7b3af18b813c411a668ac38473717ee8 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Wed, 8 Aug 2018 12:11:53 -0300 Subject: [PATCH 1/3] updated snapshots --- .../InputLabel/__snapshots__/InputLabel.spec.tsx.snap | 6 +++--- .../TextField/__snapshots__/TextField.spec.tsx.snap | 1 + .../__snapshots__/ValidationMessage.spec.tsx.snap | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/client/ui/components/InputLabel/__snapshots__/InputLabel.spec.tsx.snap b/src/core/client/ui/components/InputLabel/__snapshots__/InputLabel.spec.tsx.snap index 25f8d3cdf..ec528e72d 100644 --- a/src/core/client/ui/components/InputLabel/__snapshots__/InputLabel.spec.tsx.snap +++ b/src/core/client/ui/components/InputLabel/__snapshots__/InputLabel.spec.tsx.snap @@ -1,9 +1,9 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`renders correctly 1`] = ` -

Hello -

+ `; diff --git a/src/core/client/ui/components/TextField/__snapshots__/TextField.spec.tsx.snap b/src/core/client/ui/components/TextField/__snapshots__/TextField.spec.tsx.snap index 1f68a613c..a277de918 100644 --- a/src/core/client/ui/components/TextField/__snapshots__/TextField.spec.tsx.snap +++ b/src/core/client/ui/components/TextField/__snapshots__/TextField.spec.tsx.snap @@ -4,5 +4,6 @@ exports[`renders correctly 1`] = ` `; diff --git a/src/core/client/ui/components/ValidationMessage/__snapshots__/ValidationMessage.spec.tsx.snap b/src/core/client/ui/components/ValidationMessage/__snapshots__/ValidationMessage.spec.tsx.snap index 2a80be622..b26303e81 100644 --- a/src/core/client/ui/components/ValidationMessage/__snapshots__/ValidationMessage.spec.tsx.snap +++ b/src/core/client/ui/components/ValidationMessage/__snapshots__/ValidationMessage.spec.tsx.snap @@ -3,6 +3,7 @@ exports[`renders correctly 1`] = `
Date: Wed, 8 Aug 2018 13:23:20 -0300 Subject: [PATCH 2/3] Changes added --- .../client/ui/components/TextField/TextField.css | 12 ++++++++++-- .../client/ui/components/TextField/TextField.mdx | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/core/client/ui/components/TextField/TextField.css b/src/core/client/ui/components/TextField/TextField.css index 924d6483a..eb8ac9ee9 100644 --- a/src/core/client/ui/components/TextField/TextField.css +++ b/src/core/client/ui/components/TextField/TextField.css @@ -8,7 +8,7 @@ } .colorRegular { - backgroun-color: var(--palette-common-white); + background-color: var(--palette-common-white); color: var(--palette-common-black); border: 1px solid var(--palette-grey-light); } @@ -16,10 +16,18 @@ .colorError { background-color: var(--palette-common-white); border-color: var(--palette-error-main); - border: 2px solid #FA4643; + border: 2px solid var(--palette-error-darkest); } .fullWidth { width: 100%; } +::placeholder { + font-family: var(--font-family); + font-style: normal; + font-weight: normal; + line-height: normal; + font-size: calc(16rem / var(--rem-base)); + color: var(--palette-grey-lighter); +} diff --git a/src/core/client/ui/components/TextField/TextField.mdx b/src/core/client/ui/components/TextField/TextField.mdx index 82196c778..bbfceb20d 100644 --- a/src/core/client/ui/components/TextField/TextField.mdx +++ b/src/core/client/ui/components/TextField/TextField.mdx @@ -12,6 +12,7 @@ import Flex from '../Flex' ## Basic Use + From b5d626ad8c086efc55bb822cea92af5f42a97262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bel=C3=A9n=20Curcio?= Date: Thu, 9 Aug 2018 09:45:29 -0300 Subject: [PATCH 3/3] Updated code, and snapshots --- src/core/client/ui/components/TextField/TextField.css | 2 +- .../ValidationMessage/ValidationMessage.css | 2 +- .../ValidationMessage/ValidationMessage.spec.tsx | 1 - .../__snapshots__/ValidationMessage.spec.tsx.snap | 1 - src/core/client/ui/shared/typography.css | 11 ++++++++++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/core/client/ui/components/TextField/TextField.css b/src/core/client/ui/components/TextField/TextField.css index eb8ac9ee9..335fc3734 100644 --- a/src/core/client/ui/components/TextField/TextField.css +++ b/src/core/client/ui/components/TextField/TextField.css @@ -27,7 +27,7 @@ font-family: var(--font-family); font-style: normal; font-weight: normal; - line-height: normal; + line-height: calc(16rem / var(--rem-base)); font-size: calc(16rem / var(--rem-base)); color: var(--palette-grey-lighter); } diff --git a/src/core/client/ui/components/ValidationMessage/ValidationMessage.css b/src/core/client/ui/components/ValidationMessage/ValidationMessage.css index 330281ad4..b3d6a6290 100644 --- a/src/core/client/ui/components/ValidationMessage/ValidationMessage.css +++ b/src/core/client/ui/components/ValidationMessage/ValidationMessage.css @@ -1,5 +1,5 @@ .root { - composes: validationMessage from "talk-ui/shared/typography.css"; + composes: alertMessage from "talk-ui/shared/typography.css"; position: relative; display: inline-flex; justify-content: flex-start; diff --git a/src/core/client/ui/components/ValidationMessage/ValidationMessage.spec.tsx b/src/core/client/ui/components/ValidationMessage/ValidationMessage.spec.tsx index ddd3d343e..f336fb06e 100644 --- a/src/core/client/ui/components/ValidationMessage/ValidationMessage.spec.tsx +++ b/src/core/client/ui/components/ValidationMessage/ValidationMessage.spec.tsx @@ -8,7 +8,6 @@ import ValidationMessage from "./ValidationMessage"; it("renders correctly", () => { const props: PropTypesOf = { className: "custom", - color: "error", children: "Hello World", }; const renderer = TestRenderer.create(); diff --git a/src/core/client/ui/components/ValidationMessage/__snapshots__/ValidationMessage.spec.tsx.snap b/src/core/client/ui/components/ValidationMessage/__snapshots__/ValidationMessage.spec.tsx.snap index b26303e81..2a80be622 100644 --- a/src/core/client/ui/components/ValidationMessage/__snapshots__/ValidationMessage.spec.tsx.snap +++ b/src/core/client/ui/components/ValidationMessage/__snapshots__/ValidationMessage.spec.tsx.snap @@ -3,7 +3,6 @@ exports[`renders correctly 1`] = `