Skip to content

input styling overrides input:not(.form-control) styling #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

input styling overrides input:not(.form-control) styling #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dist/react-numeric-input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
},
type: 'text',
style: noStyle ? null : _extends({}, css.input, !hasFormControl ? css['input:not(.form-control)'] : {}, this._inputFocus ? css['input:focus'] : {})
style: noStyle ? null : _extends({}, css.input, !hasFormControl && !style.input ? css['input:not(.form-control)'] : {}, this._inputFocus ? css['input:focus'] : {})
}, rest),
btnUp: {
onMouseEnter: undefined,
Expand Down Expand Up @@ -1231,7 +1231,7 @@ return /******/ (function(modules) { // webpackBootstrap
fontSize: 'inherit'
},

// The input with bootstrap class
// The input without bootstrap class
'input:not(.form-control)': {
border: '1px solid #ccc',
borderRadius: 2,
Expand Down
4 changes: 2 additions & 2 deletions docs/react-numeric-input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
},
type: 'text',
style: noStyle ? null : _extends({}, css.input, !hasFormControl ? css['input:not(.form-control)'] : {}, this._inputFocus ? css['input:focus'] : {})
style: noStyle ? null : _extends({}, css.input, !hasFormControl && !style.input ? css['input:not(.form-control)'] : {}, this._inputFocus ? css['input:focus'] : {})
}, rest),
btnUp: {
onMouseEnter: undefined,
Expand Down Expand Up @@ -1231,7 +1231,7 @@ return /******/ (function(modules) { // webpackBootstrap
fontSize: 'inherit'
},

// The input with bootstrap class
// The input without bootstrap class
'input:not(.form-control)': {
border: '1px solid #ccc',
borderRadius: 2,
Expand Down
2 changes: 1 addition & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ module.exports =
}
},
type: 'text',
style: noStyle ? null : _extends({}, css.input, !hasFormControl ? css['input:not(.form-control)'] : {}, this._inputFocus ? css['input:focus'] : {})
style: noStyle ? null : _extends({}, css.input, !hasFormControl && !style.input ? css['input:not(.form-control)'] : {}, this._inputFocus ? css['input:focus'] : {})
}, rest),
btnUp: {
onMouseEnter: undefined,
Expand Down
4 changes: 2 additions & 2 deletions src/NumericInput.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ class NumericInput extends Component
fontSize : 'inherit'
},

// The input with bootstrap class
// The input without bootstrap class
'input:not(.form-control)': {
border : '1px solid #ccc',
borderRadius : 2,
Expand Down Expand Up @@ -894,7 +894,7 @@ class NumericInput extends Component
style: noStyle ? null : Object.assign(
{},
css.input,
!hasFormControl ?
!hasFormControl && !style.input ?
css['input:not(.form-control)'] :
{},
this._inputFocus ? css['input:focus'] : {}
Expand Down