From 6786fd323e47343cd663c3ac730082d590c0122a Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 8 Sep 2015 15:01:39 +0200 Subject: [PATCH 1/2] adjust table ticket number row to have a base of 60px instead of 8% because with the variable width the row gets to small in modal windows (ticket merge) --- app/assets/javascripts/app/models/ticket.js.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/models/ticket.js.coffee b/app/assets/javascripts/app/models/ticket.js.coffee index e87e0f3f3..7b6343b96 100644 --- a/app/assets/javascripts/app/models/ticket.js.coffee +++ b/app/assets/javascripts/app/models/ticket.js.coffee @@ -3,7 +3,7 @@ class App.Ticket extends App.Model @extend Spine.Model.Ajax @url: @apiPath + '/tickets' @configure_attributes = [ - { name: 'number', display: '#', tag: 'input', type: 'text', limit: 100, null: true, read_only: true, style: 'width: 8%' }, + { name: 'number', display: '#', tag: 'input', type: 'text', limit: 100, null: true, read_only: true, style: 'width: 60px' }, { name: 'customer_id', display: 'Customer', tag: 'input', type: 'text', limit: 100, null: false, autocapitalize: false, relation: 'User' }, { name: 'organization_id', display: 'Organization', relation: 'Organization', tagreadonly: 1 }, { name: 'group_id', display: 'Group', tag: 'select', multiple: false, limit: 100, null: false, relation: 'Group', style: 'width: 10%', edit: true }, From b14a48b12f6ef0e09e6bcd00f145c4ad1ff56161 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 8 Sep 2015 15:07:03 +0200 Subject: [PATCH 2/2] gemfile.lock --- Gemfile.lock | 3 --- 1 file changed, 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 512fb978c..638c48bec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -309,6 +309,3 @@ DEPENDENCIES twitter (~> 5.13.0) uglifier writeexcel - -BUNDLED WITH - 1.10.5