diff --git a/frontend/src/metabase/admin/datamodel/components/FormInput.jsx b/frontend/src/metabase/admin/datamodel/components/FormInput.jsx index 9058e9dbc666724dc004a1b9b8a8088ad649cb71..0cb6812714174fec17835e381f7893e0079f50a6 100644 --- a/frontend/src/metabase/admin/datamodel/components/FormInput.jsx +++ b/frontend/src/metabase/admin/datamodel/components/FormInput.jsx @@ -12,7 +12,7 @@ export default class FormInput extends Component { <input type="text" placeholder={placeholder} - className={cx("input full text-default h4", { "border-error": !field.active && field.visited && field.invalid }, className)} + className={cx("input full", { "border-error": !field.active && field.visited && field.invalid }, className)} {...formDomOnlyProps(field)} /> ); diff --git a/frontend/src/metabase/admin/datamodel/components/FormTextArea.jsx b/frontend/src/metabase/admin/datamodel/components/FormTextArea.jsx index c692ee948896302aba07e536de4c71b074839715..e440768bc3e53ce118678d438daba3ba15b9d6b2 100644 --- a/frontend/src/metabase/admin/datamodel/components/FormTextArea.jsx +++ b/frontend/src/metabase/admin/datamodel/components/FormTextArea.jsx @@ -12,7 +12,7 @@ export default class FormTextArea extends Component { return ( <textarea placeholder={placeholder} - className={cx("input full text-default h4", { "border-error": !field.active && field.visited && field.invalid }, className)} + className={cx("input full", { "border-error": !field.active && field.visited && field.invalid }, className)} {...formDomOnlyProps(field)} /> ); diff --git a/frontend/src/metabase/admin/datamodel/components/ObjectRetireModal.jsx b/frontend/src/metabase/admin/datamodel/components/ObjectRetireModal.jsx index 06ac5d4348f9045770d9677c52274176753314e4..14d02f5fff6286da79450775959a4b91c4376ab0 100644 --- a/frontend/src/metabase/admin/datamodel/components/ObjectRetireModal.jsx +++ b/frontend/src/metabase/admin/datamodel/components/ObjectRetireModal.jsx @@ -40,7 +40,7 @@ export default class ObjectRetireModal extends Component { <p>If you're sure you want to retire this {objectType}, please write a quick explanation of why it's being retired:</p> <textarea ref="revision_message" - className="input full text-default h4" + className="input full" placeholder={"This will show up in the activity feed and in an email that will be sent to anyone on your team who created something that uses this " + objectType + "."} onChange={(e) => this.setState({ valid: !!e.target.value })} /> diff --git a/frontend/src/metabase/css/core/inputs.css b/frontend/src/metabase/css/core/inputs.css index 0dd52730685c54a5f5f160833ed52da14ad8ba60..25b8f141ecc95c4e4226630dc04d06026fe78b88 100644 --- a/frontend/src/metabase/css/core/inputs.css +++ b/frontend/src/metabase/css/core/inputs.css @@ -5,10 +5,12 @@ } .input, :local(.input) { + color: var(--dark-color); + font-size: 1.12em; + padding: 0.75rem 0.75rem; border: 1px solid var(--input-border-color); - padding: 0.8rem 1rem; - transition: border .3s linear; border-radius: var(--input-border-radius); + transition: border .3s linear; } .input--small { diff --git a/frontend/src/metabase/pulse/components/CardPicker.jsx b/frontend/src/metabase/pulse/components/CardPicker.jsx index 98af5782b246646ab6dab521485e07545217b56c..1891c520ec5387ee5ad399f04ebde157b0087969 100644 --- a/frontend/src/metabase/pulse/components/CardPicker.jsx +++ b/frontend/src/metabase/pulse/components/CardPicker.jsx @@ -101,7 +101,7 @@ export default class CardPicker extends Component { <div className="CardPicker flex-full"> <input ref="input" - className="input no-focus full h4 text-bold" + className="input no-focus full text-bold" placeholder="Type a question name to filter" value={this.inputValue} onFocus={this.onInputFocus} diff --git a/frontend/src/metabase/pulse/components/PulseEditName.jsx b/frontend/src/metabase/pulse/components/PulseEditName.jsx index dcb9e3a4cc0105443024cac9c45acae8505f679a..c3c0cbacecf4af47b203cea549a8df20981d0c98 100644 --- a/frontend/src/metabase/pulse/components/PulseEditName.jsx +++ b/frontend/src/metabase/pulse/components/PulseEditName.jsx @@ -36,7 +36,7 @@ export default class PulseEditName extends Component { <div className="my3"> <input ref="name" - className={cx("input h4 text-bold text-default", { "border-error": !this.state.valid })} + className={cx("input text-bold", { "border-error": !this.state.valid })} style={{"width":"400px"}} value={pulse.name || ""} onChange={this.setName} diff --git a/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.jsx b/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.jsx index f839d50d360b27be4a0a0d41c48dc8a860776502..9f3f8dfab3613602fee6969c31983f301a06fd04 100644 --- a/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.jsx +++ b/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.jsx @@ -235,7 +235,7 @@ export default class ExpressionEditorTextfield extends Component { <div className={cx(S.editor, "relative")}> <TokenizedInput ref="input" - className={cx(S.input, "my1 p1 input block full h4 text-dark", { "border-error": errorMessage })} + className={cx(S.input, "my1 input block full", { "border-error": errorMessage })} type="text" placeholder={placeholder} value={this.state.expressionString} diff --git a/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget.jsx b/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget.jsx index 6db2d44e51cd499dc5b62b37e1f75e7719a7e112..8cc4de9121d0d79e1bcb29f14fd67f720997ea35 100644 --- a/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget.jsx +++ b/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget.jsx @@ -62,7 +62,7 @@ export default class ExpressionWidget extends Component { <div className="mt3 h5 text-uppercase text-grey-3 text-bold">Give it a name</div> <div> <input - className="my1 p1 input block full h4 text-dark" + className="my1 input block full" type="text" value={this.state.name} placeholder="Something nice and descriptive"