diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-18 18:36:26 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-18 18:36:26 +0000 |
| commit | 96b6cf9308a90457e436b8e304cfd9bbd19641a7 (patch) | |
| tree | 564fb3209be6b196c3757460a38e59bc9aeb8fe2 | |
| parent | ec74ae0616a13e227d94bb127df2f63832229a21 (diff) | |
| parent | fcf0612f38b719212a7b40cdaf6b026f5b5f59e7 (diff) | |
| download | gitlab-ce-96b6cf9308a90457e436b8e304cfd9bbd19641a7.tar.gz | |
Merge branch 'note-form-focus-color' into 'master'
Updated note form focus to better match form-control focus
See merge request !3739
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 07c707e7b77..c2371d79989 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -61,11 +61,11 @@ padding: $gl-padding-top $gl-padding; border: 1px solid $note-form-border-color; border-radius: $border-radius-base; + transition: border-color ease-in-out 0.15s, + box-shadow ease-in-out 0.15s; &.is-focused { - border-color: $focus-border-color; - box-shadow: 0 0 2px $black-transparent, - 0 0 4px rgba($focus-border-color, .4); + @extend .form-control:focus; .comment-toolbar, .nav-links { |