diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-09 15:18:51 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-07-14 19:29:00 +0300 |
| commit | 7ef53317d8c425d18c85ed6c37f38c90085609f6 (patch) | |
| tree | 99fa21c471f7e0dbc74a5f26882209b5c3139fe8 | |
| parent | 7d793af7b83b44394439cf4ae2efef7367b6e8a0 (diff) | |
Changed editable indicator
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 22 | ||||
| -rw-r--r-- | app/views/projects/issues/_inline_edit.html.haml | 4 |
2 files changed, 9 insertions, 17 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index a6175ab8e1c..f0be5f26b5d 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -409,22 +409,14 @@ .inline-edit-box { position: relative; - &::before { - content: ''; - display: none; - position: absolute; - top: -3px; - right: -8px; - bottom: -3px; - left: -8px; - border: 1px solid $gray-dark; - border-radius: $border-radius-default; - pointer-events: none; - } - &:hover { - &::before { - display: block; + &::after { + content: ''; + position: absolute; + right: 0; + bottom: -2px; + left: 0; + border-top: 2px dashed $focus-border-color; } } } diff --git a/app/views/projects/issues/_inline_edit.html.haml b/app/views/projects/issues/_inline_edit.html.haml index b3f4a2080c4..4226ab70437 100644 --- a/app/views/projects/issues/_inline_edit.html.haml +++ b/app/views/projects/issues/_inline_edit.html.haml @@ -1,7 +1,7 @@ = form_for @issue, remote: true, html: { class: 'detail-page-description content-block common-note-form js-quick-submit js-issuable-inline-form', data: { type: "json" } } do |f| = hidden_field_tag :inline, true %h2.title - %span.inline-edit-box.has-tooltip.js-issuable-title{ title: "Edit title" }= markdown escape_once(@issue.title), pipeline: :single_line, author: @issue.author + %span.inline-edit-box.js-issuable-title= markdown escape_once(@issue.title), pipeline: :single_line, author: @issue.author = icon('spinner spin', class: 'js-issuable-title-loading hidden') .issuable-title-edit.js-issuable-edit-title.hidden = f.text_field :title, class: 'form-control js-issuable-title-field' @@ -12,7 +12,7 @@ Cancel - if @issue.description.present? .description{ class: can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : '' } - .wiki.inline-edit-box.has-tooltip.js-issuable-description{ title: "Edit description" } + .wiki.inline-edit-box.js-issuable-description = preserve do = markdown(@issue.description, cache_key: [@issue, "description"], author: @issue.author) .js-issuable-description-field.hidden |