Merge pull request #7650 from opf/styling/30941/harmonize-drag-icons

[30941] Use same icon for drag & drop

[ci skip]
pull/7654/head
Oliver Günther 5 years ago committed by GitHub
commit a321e57d9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/views/custom_fields/_custom_options.html.erb
  2. 2
      frontend/src/app/components/wp-fast-table/builders/drag-and-drop/drag-drop-handle-builder.ts
  3. 4
      frontend/src/app/modules/admin/types/attribute-group.component.html
  4. 2
      frontend/src/app/modules/admin/types/query-group.component.html
  5. 2
      frontend/src/app/modules/admin/types/type-form-configuration.html
  6. 2
      spec/features/work_packages/details/details_refreshing_spec.rb

@ -80,7 +80,7 @@ See docs/COPYRIGHT.rdoc for more details.
<%= f.fields_for :custom_options, custom_option do |co_f| %>
<tr class="dragula-element custom-option-row">
<td>
<span class="dragula-handle icon icon-table icon-toggle"></span>
<span class="dragula-handle icon icon-table icon-drag-handle"></span>
<%= co_f.hidden_field :id, class: 'custom-option-id' %>
<%= co_f.text_field :value,
container_class: 'custom-option-value',

@ -33,7 +33,7 @@ export class DragDropHandleBuilder {
// Wrap handle as span
let span = document.createElement('span');
span.classList.add('wp-table--drag-and-drop-handle', 'icon-toggle');
span.classList.add('wp-table--drag-and-drop-handle', 'icon-drag-handle');
td.appendChild(span);
if (RENDER_DRAG_AND_DROP_POSITION) {

@ -1,6 +1,6 @@
<div class="type-form-conf-group">
<div class="group-head">
<span class="group-handle icon-toggle"></span>
<span class="group-handle icon-drag-handle"></span>
<group-edit-in-place
[name]="group.name"
(onValueChange)="rename($event)"
@ -12,7 +12,7 @@
<div *ngFor="let attribute of group.attributes"
class="type-form-conf-attribute"
[attr.data-key]="attribute.key">
<span class="attribute-handle icon-toggle"></span>
<span class="attribute-handle icon-drag-handle"></span>
<span class="attribute-name">
{{ attribute.translation }}
<span class="attribute-cf-label"

@ -1,6 +1,6 @@
<div class="type-form-conf-group type-form-query-group">
<div class="group-head">
<span class="group-handle icon-toggle"></span>
<span class="group-handle icon-drag-handle"></span>
<group-edit-in-place
[name]="group.name"
(onValueChange)="rename($event)"

@ -63,7 +63,7 @@
<div *ngFor="let inactive_attribute of inactives"
class="type-form-conf-attribute"
[attr.data-key]="inactive_attribute.key">
<span class="attribute-handle icon-toggle"></span>
<span class="attribute-handle icon-drag-handle"></span>
<span class="attribute-name">
{{ inactive_attribute.translation }}
<span *ngIf="inactive_attribute.is_cf"

@ -47,7 +47,7 @@ describe 'Work package table refreshing due to split view', js: true do
wp_table.expect_work_package_listed work_package
page.within wp_table.row(work_package) do
expect(page).to have_selector('.wp-table--drag-and-drop-handle.icon-toggle', visible: :all)
expect(page).to have_selector('.wp-table--drag-and-drop-handle.icon-drag-handle', visible: :all)
end
end
end

Loading…
Cancel
Save