From 292dc42d5288a03f0dc83935e28e85df656a6a98 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Mon, 30 Nov 2020 15:02:56 +0300 Subject: [PATCH] Web: Components : Input, Textarea : Fixed placeholder color --- .../src/components/text-input/index.js | 20 +++++++++++-------- .../src/components/textarea/index.js | 14 +++++++++---- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/web/ASC.Web.Components/src/components/text-input/index.js b/web/ASC.Web.Components/src/components/text-input/index.js index 7a5fdcac7e..f835d3e035 100755 --- a/web/ASC.Web.Components/src/components/text-input/index.js +++ b/web/ASC.Web.Components/src/components/text-input/index.js @@ -5,8 +5,7 @@ import commonInputStyle from "../text-input/common-input-styles"; import MaskedInput from "react-text-mask"; import isEqual from "lodash/isEqual"; -/* eslint-disable no-unused-vars */ -/* eslint-disable react/prop-types */ +/* eslint-disable no-unused-vars, react/prop-types */ const Input = ({ isAutoFocussed, isDisabled, @@ -25,8 +24,7 @@ const Input = ({ ) : ( ); -/* eslint-enable react/prop-types */ -/* eslint-enable no-unused-vars */ +/* eslint-enable react/prop-types, no-unused-vars */ const StyledInput = styled(Input).attrs((props) => ({ id: props.id, @@ -77,25 +75,31 @@ const StyledInput = styled(Input).attrs((props) => ({ transition: all 0.2s ease 0s; ::-webkit-input-placeholder { - color: ${(props) => (props.isDisabled ? "#A3A9AE" : "#D0D5DA")}; + color: "#A3A9AE"; font-family: "Open Sans", sans-serif; user-select: none; } :-moz-placeholder { - color: ${(props) => (props.isDisabled ? "#A3A9AE" : "#D0D5DA")}; + color: "#A3A9AE"; font-family: "Open Sans", sans-serif; user-select: none; } ::-moz-placeholder { - color: ${(props) => (props.isDisabled ? "#A3A9AE" : "#D0D5DA")}; + color: "#A3A9AE"; font-family: "Open Sans", sans-serif; user-select: none; } :-ms-input-placeholder { - color: ${(props) => (props.isDisabled ? "#A3A9AE" : "#D0D5DA")}; + color: "#A3A9AE"; + font-family: "Open Sans", sans-serif; + user-select: none; + } + + ::placeholder { + color: "#A3A9AE"; font-family: "Open Sans", sans-serif; user-select: none; } diff --git a/web/ASC.Web.Components/src/components/textarea/index.js b/web/ASC.Web.Components/src/components/textarea/index.js index a796243b9c..9e8dba87a5 100644 --- a/web/ASC.Web.Components/src/components/textarea/index.js +++ b/web/ASC.Web.Components/src/components/textarea/index.js @@ -56,25 +56,31 @@ const StyledTextarea = styled(ClearTextareaAutosize)` } ::-webkit-input-placeholder { - color: ${(props) => (props.isDisabled ? "#D0D5DA" : "#D0D5DA")}; + color: "#A3A9AE"; font-family: "Open Sans", sans-serif; user-select: none; } :-moz-placeholder { - color: ${(props) => (props.isDisabled ? "#D0D5DA" : "#D0D5DA")}; + color: "#A3A9AE"; font-family: "Open Sans", sans-serif; user-select: none; } ::-moz-placeholder { - color: ${(props) => (props.isDisabled ? "#D0D5DA" : "#D0D5DA")}; + color: "#A3A9AE"; font-family: "Open Sans", sans-serif; user-select: none; } :-ms-input-placeholder { - color: ${(props) => (props.isDisabled ? "#D0D5DA" : "#D0D5DA")}; + color: "#A3A9AE"; + font-family: "Open Sans", sans-serif; + user-select: none; + } + + ::placeholder { + color: "#A3A9AE"; font-family: "Open Sans", sans-serif; user-select: none; }