diff options
author | Vitaliy @blackst0ne Klachkov <blackst0ne.ru@gmail.com> | 2017-11-13 12:38:09 +0300 |
---|---|---|
committer | Vitaliy @blackst0ne Klachkov <blackst0ne.ru@gmail.com> | 2017-11-13 12:38:09 +0300 |
commit | 6062635ec1b4be8311f27682095aa5b924ce01d9 (patch) | |
tree | e21d195ee0f71284d04234ba7398d0cb5eb10bbb | |
parent | ec0b7eb8657ae3c8020c872bad6c640babf3eb14 (diff) |
Refactor UI
-rw-r--r-- | app/assets/javascripts/create_merge_request_dropdown.js | 5 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 4 | ||||
-rw-r--r-- | app/views/projects/issues/_new_branch.html.haml | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/app/assets/javascripts/create_merge_request_dropdown.js b/app/assets/javascripts/create_merge_request_dropdown.js index cbd25eecf8a..2c13f00c468 100644 --- a/app/assets/javascripts/create_merge_request_dropdown.js +++ b/app/assets/javascripts/create_merge_request_dropdown.js @@ -65,7 +65,6 @@ export default class CreateMergeRequestDropdown { bindEvents() { this.createMergeRequestButton.addEventListener('click', this.onClickCreateMergeRequestButton.bind(this)); this.createTargetButton.addEventListener('click', this.onClickCreateMergeRequestButton.bind(this)); - this.dropdownToggle.addEventListener('click', this.onClickSetFocusOnBranchNameInput.bind(this)); this.branchInput.addEventListener('keyup', this.onChangeInput.bind(this)); this.refInput.addEventListener('keyup', this.onChangeInput.bind(this)); this.refInput.addEventListener('keydown', CreateMergeRequestDropdown.processTab.bind(this)); @@ -324,10 +323,6 @@ export default class CreateMergeRequestDropdown { this.disable(); } - onClickSetFocusOnBranchNameInput() { - this.branchInput.focus(); - } - // `TAB` autocompletes the source. static processTab(event) { if (event.keyCode !== 9) return; diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index a72129f58b5..2ef285ff26e 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -310,6 +310,10 @@ ul.related-merge-requests > li { font-weight: $gl-font-weight-bold; } } + + input { + margin: 3px 0; + } } } diff --git a/app/views/projects/issues/_new_branch.html.haml b/app/views/projects/issues/_new_branch.html.haml index cd4553a98af..19bea2a1122 100644 --- a/app/views/projects/issues/_new_branch.html.haml +++ b/app/views/projects/issues/_new_branch.html.haml @@ -1,6 +1,6 @@ - can_create_merge_request = can?(current_user, :create_merge_request, @project) - data_action = can_create_merge_request ? 'create-mr' : 'create-branch' -- value = can_create_merge_request ? 'Create merge request' : 'Create a branch' +- value = can_create_merge_request ? 'Create merge request' : 'Create branch' - if can?(current_user, :push_code, @project) - can_create_path = can_create_branch_project_issue_path(@project, @issue) @@ -23,12 +23,12 @@ %ul#create-merge-request-dropdown.create-merge-request-dropdown-menu.dropdown-menu.dropdown-menu-align-right.gl-show-field-errors{ data: { dropdown: true } } - if can_create_merge_request - %li.create-item.droplab-item-selected{ role: 'button', data: { value: 'create-mr', text: 'Create a merge request' } } + %li.create-item.droplab-item-selected{ role: 'button', data: { value: 'create-mr', text: 'Create merge request' } } .menu-item .icon-container= icon('check') .description.droplab-item-ignore-hiding Create merge request and branch - %li.create-item{ class: [!can_create_merge_request && 'droplab-item-selected'], role: 'button', data: { value: 'create-branch', text: 'Create a branch' } } + %li.create-item{ class: [!can_create_merge_request && 'droplab-item-selected'], role: 'button', data: { value: 'create-branch', text: 'Create branch' } } .menu-item .icon-container= icon('check') .description.droplab-item-ignore-hiding Create branch |