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/login/about/pixelated-welcome.scss | 49 ---------------------- web-ui/src/login/about/pixelated_welcome.js | 2 +- web-ui/src/login/about/pixelated_welcome.scss | 49 ++++++++++++++++++++++ web-ui/src/login/error/auth-error.scss | 29 ------------- web-ui/src/login/error/auth_error.js | 2 +- web-ui/src/login/error/auth_error.scss | 29 +++++++++++++ web-ui/src/login/error/generic-error.scss | 59 --------------------------- web-ui/src/login/error/generic_error.js | 2 +- web-ui/src/login/error/generic_error.scss | 59 +++++++++++++++++++++++++++ 9 files changed, 140 insertions(+), 140 deletions(-) delete mode 100644 web-ui/src/login/about/pixelated-welcome.scss create mode 100644 web-ui/src/login/about/pixelated_welcome.scss delete mode 100644 web-ui/src/login/error/auth-error.scss create mode 100644 web-ui/src/login/error/auth_error.scss delete mode 100644 web-ui/src/login/error/generic-error.scss create mode 100644 web-ui/src/login/error/generic_error.scss (limited to 'web-ui/src/login') diff --git a/web-ui/src/login/about/pixelated-welcome.scss b/web-ui/src/login/about/pixelated-welcome.scss deleted file mode 100644 index 17d05f13..00000000 --- a/web-ui/src/login/about/pixelated-welcome.scss +++ /dev/null @@ -1,49 +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"; - -.pixelated-welcome { - display: none; -} - -@media only screen and (min-width : 960px) { - .pixelated-welcome { - font-size: 0.9em; - color: $medium_grey; - display: flex; - font-weight: 300; - flex-direction: column; - align-self: flex-end; - order: 2; - width: 34%; - margin-right: 8%; - margin-top: -20.5em; - - h3 { - font-weight: normal; - font-size: 1.2em; - margin-top: 0; - } - } - - .welcome-logo { - order: 1; - width: 90%; - height: 15em; - } -} diff --git a/web-ui/src/login/about/pixelated_welcome.js b/web-ui/src/login/about/pixelated_welcome.js index 82a7d7d0..7437ab72 100644 --- a/web-ui/src/login/about/pixelated_welcome.js +++ b/web-ui/src/login/about/pixelated_welcome.js @@ -18,7 +18,7 @@ import React from 'react'; import { translate } from 'react-i18next'; -import './pixelated-welcome.scss'; +import './pixelated_welcome.scss'; export const PixelatedWelcome = ({ t }) => (
diff --git a/web-ui/src/login/about/pixelated_welcome.scss b/web-ui/src/login/about/pixelated_welcome.scss new file mode 100644 index 00000000..17d05f13 --- /dev/null +++ b/web-ui/src/login/about/pixelated_welcome.scss @@ -0,0 +1,49 @@ +/* + * 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"; + +.pixelated-welcome { + display: none; +} + +@media only screen and (min-width : 960px) { + .pixelated-welcome { + font-size: 0.9em; + color: $medium_grey; + display: flex; + font-weight: 300; + flex-direction: column; + align-self: flex-end; + order: 2; + width: 34%; + margin-right: 8%; + margin-top: -20.5em; + + h3 { + font-weight: normal; + font-size: 1.2em; + margin-top: 0; + } + } + + .welcome-logo { + order: 1; + width: 90%; + height: 15em; + } +} diff --git a/web-ui/src/login/error/auth-error.scss b/web-ui/src/login/error/auth-error.scss deleted file mode 100644 index f6256be4..00000000 --- a/web-ui/src/login/error/auth-error.scss +++ /dev/null @@ -1,29 +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"; - -.auth-error { - color: $error; - margin: -1em 0 1em 0; -} - -@media only screen and (min-width : 960px) { - .auth-error { - margin: -2em 0 1em 0; - } -} diff --git a/web-ui/src/login/error/auth_error.js b/web-ui/src/login/error/auth_error.js index ceeaf42b..5dbbc3e7 100644 --- a/web-ui/src/login/error/auth_error.js +++ b/web-ui/src/login/error/auth_error.js @@ -18,7 +18,7 @@ import React from 'react'; import { translate } from 'react-i18next'; -import './auth-error.scss'; +import './auth_error.scss'; export const AuthError = ({ t }) => (

{t('error.auth')}

diff --git a/web-ui/src/login/error/auth_error.scss b/web-ui/src/login/error/auth_error.scss new file mode 100644 index 00000000..f6256be4 --- /dev/null +++ b/web-ui/src/login/error/auth_error.scss @@ -0,0 +1,29 @@ +/* + * 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"; + +.auth-error { + color: $error; + margin: -1em 0 1em 0; +} + +@media only screen and (min-width : 960px) { + .auth-error { + margin: -2em 0 1em 0; + } +} diff --git a/web-ui/src/login/error/generic-error.scss b/web-ui/src/login/error/generic-error.scss deleted file mode 100644 index 5a077f32..00000000 --- a/web-ui/src/login/error/generic-error.scss +++ /dev/null @@ -1,59 +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"; - -.generic-error { - font-size: 0.9em; - color: $medium_grey; - display: flex; - padding: 0 1.5em; - font-weight: 300; - - h2 { - font-weight: normal; - font-size: 1.4em; - } -} - -.dead-mail { - width: 20%; - margin-right: 1.5em; - margin-top: 1.7em; - align-self: flex-start; -} - -@media only screen and (min-width : 960px) { - .generic-error { - flex-direction: column; - align-self: flex-end; - order: 2; - width: 34%; - margin-right: 8%; - margin-top: -19.5em; - padding: 0; - - h2 { - margin: 0; - } - } - - .dead-mail { - order: 1; - width: 30%; - } -} diff --git a/web-ui/src/login/error/generic_error.js b/web-ui/src/login/error/generic_error.js index 023e1bcf..b233d5bb 100644 --- a/web-ui/src/login/error/generic_error.js +++ b/web-ui/src/login/error/generic_error.js @@ -18,7 +18,7 @@ import React from 'react'; import { translate } from 'react-i18next'; -import './generic-error.scss'; +import './generic_error.scss'; export const GenericError = ({ t }) => (
diff --git a/web-ui/src/login/error/generic_error.scss b/web-ui/src/login/error/generic_error.scss new file mode 100644 index 00000000..5a077f32 --- /dev/null +++ b/web-ui/src/login/error/generic_error.scss @@ -0,0 +1,59 @@ +/* + * 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"; + +.generic-error { + font-size: 0.9em; + color: $medium_grey; + display: flex; + padding: 0 1.5em; + font-weight: 300; + + h2 { + font-weight: normal; + font-size: 1.4em; + } +} + +.dead-mail { + width: 20%; + margin-right: 1.5em; + margin-top: 1.7em; + align-self: flex-start; +} + +@media only screen and (min-width : 960px) { + .generic-error { + flex-direction: column; + align-self: flex-end; + order: 2; + width: 34%; + margin-right: 8%; + margin-top: -19.5em; + padding: 0; + + h2 { + margin: 0; + } + } + + .dead-mail { + order: 1; + width: 30%; + } +} -- cgit v1.2.3