diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-05-10 22:22:56 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-05-10 22:22:56 +0300 |
| commit | bed783ac15453f60651f861803bba93c622625ba (patch) | |
| tree | d560107fff213edcc6abb51f215a029b1e5fd740 /app/views/discussions | |
| parent | e42f7e2a5a733d7c3682bd7d15e509e1943003bc (diff) | |
Rename btn-secondary to btn-default
Diffstat (limited to 'app/views/discussions')
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/discussions/_jump_to_next.html.haml b/app/views/discussions/_jump_to_next.html.haml index e3bb113768f..3db509f24a5 100644 --- a/app/views/discussions/_jump_to_next.html.haml +++ b/app/views/discussions/_jump_to_next.html.haml @@ -2,7 +2,7 @@ - if current_user %jump-to-discussion{ "inline-template" => true, ":discussion-id" => "'#{discussion.try(:id)}'" } .btn-group{ role: "group", "v-show" => "!allResolved", "v-if" => "showButton" } - %button.btn.btn-secondary.discussion-next-btn.has-tooltip{ "@click" => "jumpToNextUnresolvedDiscussion", + %button.btn.btn-default.discussion-next-btn.has-tooltip{ "@click" => "jumpToNextUnresolvedDiscussion", ":title" => "buttonText", ":aria-label" => "buttonText", data: { container: "body" } } diff --git a/app/views/discussions/_new_issue_for_all_discussions.html.haml b/app/views/discussions/_new_issue_for_all_discussions.html.haml index 74f52a4e312..50dd5864195 100644 --- a/app/views/discussions/_new_issue_for_all_discussions.html.haml +++ b/app/views/discussions/_new_issue_for_all_discussions.html.haml @@ -5,4 +5,4 @@ title: 'Resolve all discussions in new issue', aria: { label: 'Resolve all discussions in new issue' }, data: { container: 'body' }, - class: 'new-issue-for-discussion btn btn-secondary discussion-create-issue-btn has-tooltip' + class: 'new-issue-for-discussion btn btn-default discussion-create-issue-btn has-tooltip' diff --git a/app/views/discussions/_new_issue_for_discussion.html.haml b/app/views/discussions/_new_issue_for_discussion.html.haml index 9969fa68270..2bfe118c608 100644 --- a/app/views/discussions/_new_issue_for_discussion.html.haml +++ b/app/views/discussions/_new_issue_for_discussion.html.haml @@ -7,4 +7,4 @@ title: 'Resolve this discussion in a new issue', aria: { label: 'Resolve this discussion in a new issue' }, data: { container: 'body' }, - class: 'new-issue-for-discussion btn btn-secondary discussion-create-issue-btn has-tooltip' + class: 'new-issue-for-discussion btn btn-default discussion-create-issue-btn has-tooltip' diff --git a/app/views/discussions/_resolve_all.html.haml b/app/views/discussions/_resolve_all.html.haml index ad55ca25bfb..689a22acd27 100644 --- a/app/views/discussions/_resolve_all.html.haml +++ b/app/views/discussions/_resolve_all.html.haml @@ -3,6 +3,6 @@ ":can-resolve" => discussion.can_resolve?(current_user), "inline-template" => true } .btn-group{ role: "group", "v-if" => "showButton" } - %button.btn.btn-secondary{ type: "button", "@click" => "resolve", ":disabled" => "loading", "v-cloak" => "true" } + %button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading", "v-cloak" => "true" } = icon("spinner spin", "v-show" => "loading") {{ buttonText }} |