merge tootsuite prs #5895 and #5889 into glitch flavour

7 years ago · 4a5401a58e
parent 28423dd046
commit 4a5401a58e
2 changed files with 5 additions and 0 deletions
--- a/app/javascript/flavours/glitch/components/autosuggest_textarea.js
+++ b/app/javascript/flavours/glitch/components/autosuggest_textarea.js
@ -209,6 +209,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
            onBlur={this.onBlur}
            onPaste={this.onPaste}
            style={style}
 	    aria-autocomplete='list'
          />
        </label>
--- a/app/javascript/flavours/glitch/styles/components/index.scss
+++ b/app/javascript/flavours/glitch/styles/components/index.scss
@ -4854,6 +4854,10 @@ noscript {
    input {
      width: 100%;
      margin-bottom: 6px;
      &:focus {
        outline: 0;
      }
    }
  }