From db8ded2876a981b259f2ccfc5b07133e6eec666b Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 23 Feb 2017 17:01:58 -0300 Subject: [#907] Normalizes scss file names with @thaissiqueira --- web-ui/src/common/input_field/input-field.scss | 73 -------------------------- web-ui/src/common/input_field/input_field.js | 2 +- web-ui/src/common/input_field/input_field.scss | 73 ++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 web-ui/src/common/input_field/input-field.scss create mode 100644 web-ui/src/common/input_field/input_field.scss (limited to 'web-ui/src/common/input_field') diff --git a/web-ui/src/common/input_field/input-field.scss b/web-ui/src/common/input_field/input-field.scss deleted file mode 100644 index dd8e8927..00000000 --- a/web-ui/src/common/input_field/input-field.scss +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2017 ThoughtWorks, Inc. - * - * Pixelated is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Pixelated is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Pixelated. If not, see . - */ - -@import "~scss/base/colors"; - -.input-field-group { - position:relative; - margin: 1.5em 0; - width: 100%; -} - -.input-field-label { - font-size: 0.9em; - margin-bottom: 10px; - display: inline-block; - color:#999; - position:absolute; - pointer-events:none; - left: 6px; - top:10px; - transition:0.2s ease all; -} - -.input-field { - display: block; - border: none; - border-bottom: solid 1px $dark_blue; - width: 100%; - height: auto; - padding: 0.3em 0px; - - &:focus { - outline:none; - border-width: 2px; - } -} - -.input-field:focus ~ .input-field-label, .input-field:valid ~ .input-field-label { - top:-12px; - left: 0; - font-size:0.7em; - color: $dark_blue; -} - -@media only screen and (min-width : 500px) { - .input-field-group { - width: 70%; - align-self: center; - } -} - -@media only screen and (min-width : 960px) { - .input-field-group { - width: 300px; - align-self: flex-start; - margin-top: 3em; - font-size: 1em; - } -} diff --git a/web-ui/src/common/input_field/input_field.js b/web-ui/src/common/input_field/input_field.js index d4876d9f..a92faeb9 100644 --- a/web-ui/src/common/input_field/input_field.js +++ b/web-ui/src/common/input_field/input_field.js @@ -17,7 +17,7 @@ import React from 'react'; -import './input-field.scss'; +import './input_field.scss'; const InputField = ({ label, name, type = 'text' }) => (
diff --git a/web-ui/src/common/input_field/input_field.scss b/web-ui/src/common/input_field/input_field.scss new file mode 100644 index 00000000..dd8e8927 --- /dev/null +++ b/web-ui/src/common/input_field/input_field.scss @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2017 ThoughtWorks, Inc. + * + * Pixelated is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pixelated is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pixelated. If not, see . + */ + +@import "~scss/base/colors"; + +.input-field-group { + position:relative; + margin: 1.5em 0; + width: 100%; +} + +.input-field-label { + font-size: 0.9em; + margin-bottom: 10px; + display: inline-block; + color:#999; + position:absolute; + pointer-events:none; + left: 6px; + top:10px; + transition:0.2s ease all; +} + +.input-field { + display: block; + border: none; + border-bottom: solid 1px $dark_blue; + width: 100%; + height: auto; + padding: 0.3em 0px; + + &:focus { + outline:none; + border-width: 2px; + } +} + +.input-field:focus ~ .input-field-label, .input-field:valid ~ .input-field-label { + top:-12px; + left: 0; + font-size:0.7em; + color: $dark_blue; +} + +@media only screen and (min-width : 500px) { + .input-field-group { + width: 70%; + align-self: center; + } +} + +@media only screen and (min-width : 960px) { + .input-field-group { + width: 300px; + align-self: flex-start; + margin-top: 3em; + font-size: 1em; + } +} -- cgit v1.2.3 From fec26b211a42b068e677ac5b43080bd4bf59e47a Mon Sep 17 00:00:00 2001 From: Thais Siqueira Date: Fri, 24 Feb 2017 14:27:31 -0300 Subject: [#907] Moves tests to directories components --- web-ui/src/common/input_field/input_field.spec.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 web-ui/src/common/input_field/input_field.spec.js (limited to 'web-ui/src/common/input_field') diff --git a/web-ui/src/common/input_field/input_field.spec.js b/web-ui/src/common/input_field/input_field.spec.js new file mode 100644 index 00000000..0c044ce1 --- /dev/null +++ b/web-ui/src/common/input_field/input_field.spec.js @@ -0,0 +1,20 @@ +import { shallow } from 'enzyme'; +import expect from 'expect'; +import React from 'react'; +import InputField from 'src/common/input_field/input_field'; + +describe('InputField', () => { + let inputField; + + beforeEach(() => { + inputField = shallow(); + }); + + it('renders an input of type text for email', () => { + expect(inputField.find('input[type="text"]').props().name).toEqual('email'); + }); + + it('renders a label for the email', () => { + expect(inputField.find('label').text()).toEqual('Email'); + }); +}); -- cgit v1.2.3