Commit f40fdd29 authored by Audrey Hamelers's avatar Audrey Hamelers
Browse files

Merge branch 'master' into 'dev'

# Conflicts:
#   app/react-mathjax-preview-local/es/index.js
#   app/react-mathjax-preview-local/lib/index.js
#   package.json
parents 46a1f6c0 c65ec81c
Pipeline #12796 passed with stages
in 1 minute and 19 seconds
......@@ -319,9 +319,9 @@ class SearchSelect extends React.Component {
<Dropdown
className={this.state.inFocus ? 'focus' : ''}
id={`${this.inputId}select`}
innerRef={this.setFocusRef}
onBlur={this.unFocus}
onClick={this.addFocus}
ref={this.setFocusRef}
>
<DropdownText
className={disabled ? 'disabled' : ''}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment