diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-11 18:06:15 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-11 18:06:15 -0500 |
| commit | f2edb26a1e4b2587f6177af2232997bc2c6a902e (patch) | |
| tree | 73af4940c9f49e125c0a4a375929c31f7b240f6a /spec/javascripts/fixtures | |
| parent | ab9612df8dd97d83a94a8290f1530760e5cc7d2e (diff) | |
| parent | f2fab27a562dbb0e1522e388b5719d226ce66e4b (diff) | |
| download | gitlab-ce-f2edb26a1e4b2587f6177af2232997bc2c6a902e.tar.gz | |
fixes conflicts
Diffstat (limited to 'spec/javascripts/fixtures')
| -rw-r--r-- | spec/javascripts/fixtures/zen_mode.html.haml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/spec/javascripts/fixtures/zen_mode.html.haml b/spec/javascripts/fixtures/zen_mode.html.haml index e867e4de2b9..1701652c61e 100644 --- a/spec/javascripts/fixtures/zen_mode.html.haml +++ b/spec/javascripts/fixtures/zen_mode.html.haml @@ -1,9 +1,8 @@ .zennable - %input#zen-toggle-comment.zen-toggle-comment{ tabindex: '-1', type: 'checkbox' } .zen-backdrop - %textarea#note_note.js-gfm-input.markdown-area{placeholder: 'Leave a comment'} - %a.zen-enter-link{tabindex: '-1'} + %textarea#note_note.js-gfm-input.markdown-area + %a.js-zen-enter(tabindex="-1" href="#") %i.fa.fa-expand - Edit in fullscreen - %a.zen-leave-link + Edit in fullscreen + %a.js-zen-leave(tabindex="-1" href="#") %i.fa.fa-compress |