From 102886e23d2fe96fa5ccfe0ffaddc2cb155f39b7 Mon Sep 17 00:00:00 2001 From: yuri Date: Tue, 18 Apr 2017 12:06:50 +0300 Subject: [PATCH] fix firefox checkbox style --- client/res/templates/record/list.tpl | 4 ++-- client/src/views/record/list.js | 2 +- frontend/less/espo/custom.less | 17 +++++++++++++++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/client/res/templates/record/list.tpl b/client/res/templates/record/list.tpl index 33072bce51..e6014054db 100644 --- a/client/res/templates/record/list.tpl +++ b/client/res/templates/record/list.tpl @@ -42,8 +42,7 @@ {{#if checkboxes}} - - + {{#unless checkAllResultDisabled}}
@@ -54,6 +53,7 @@
{{/unless}} +
{{/if}} {{#each headerDefs}} diff --git a/client/src/views/record/list.js b/client/src/views/record/list.js index ace534d34c..d206c0cedb 100644 --- a/client/src/views/record/list.js +++ b/client/src/views/record/list.js @@ -845,7 +845,7 @@ Espo.define('views/record/list', 'view', function (Dep) { if (this.checkboxes) { layout.push({ - name: 'checkbox', + name: 'r-checkbox', template: 'record.list-checkbox' }); } diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less index 7615ad60b8..c8d8e66183 100644 --- a/frontend/less/espo/custom.less +++ b/frontend/less/espo/custom.less @@ -122,8 +122,7 @@ div.list-expanded > ul > li > div.expanded-row > .cell:first-child { .list .checkbox-dropdown { margin-right: -10px; - top: 1px; - margin-top: -2px; + float: right; } .list .checkbox-dropdown > a { @@ -696,6 +695,20 @@ table.list th { overflow: hidden; } +.list > table td[data-name="r-checkbox"] { + overflow: visible; +} + + +.list > table th[data-name="r-checkbox"] { + white-space: nowrap; + .select-all-container { + line-height: @line-height-base; + height: unit(@line-height-base, em); + } +} + + .list > table td > div.field { white-space: normal; }