From: Moritz Bunkus Date: Thu, 12 Jan 2017 11:00:27 +0000 (+0100) Subject: ChartPicker: Lupe wie beim PartPicker stylen X-Git-Tag: release-3.5.4~1728 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a36da9088608bf556aefa46feb8c02b4d689d0d9;p=kivitendo-erp.git ChartPicker: Lupe wie beim PartPicker stylen --- diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css index df43f05e7..dd1ff541f 100644 --- a/css/kivitendo/main.css +++ b/css/kivitendo/main.css @@ -407,17 +407,16 @@ label { margin-right: 6px; } +.chart_picker, .part_picker { display: inline-block; } +.chart_picker:before, .part_picker:before { display: inline-block; vertical-align: middle; height: 100%; } -.chart_picker { - padding-right: 16px; -} .customer-vendor-picker-undefined, .chartpicker-undefined, .projectpicker-undefined, @@ -444,11 +443,13 @@ div.chart_picker_chart:hover { color: #FE5F14; } +div.cpc_block, div.ppp_block { overflow:hidden; float:left; width: 350px; } +span.cpc_popup_button, span.ppp_popup_button { display: inline-block; vertical-align: middle; @@ -459,12 +460,14 @@ span.ppp_popup_button { background: url("../../image/search.svg") no-repeat center right; background-size: contain; } +span.chart_picker input, span.part_picker input { padding-right: 20px; box-sizing: padding-box; -moz-box-sizing: padding-box; -webkit-box-sizing: padding-box; } +span.chart_picker, span.part_picker { white-space: nowrap; } diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css index 90b5be576..f9e490dbe 100644 --- a/css/lx-office-erp/main.css +++ b/css/lx-office-erp/main.css @@ -391,11 +391,9 @@ label { margin-right: 6px; } +.chart_picker, .part_picker { } -.chart_picker { - padding-right: 16px; -} .customer-vendor-picker-undefined, .chartpicker-undefined, .projectpicker-undefined, @@ -422,11 +420,13 @@ div.chart_picker_chart:hover { border-color: gray; } +div.cpc_block, div.ppp_block { overflow:hidden; float:left; width: 350px; } +span.cpc_popup_button, span.ppp_popup_button { display: inline-block; position: relative; @@ -437,12 +437,15 @@ span.ppp_popup_button { cursor: pointer; } +td span.cpc_popup_button, +th span.cpc_popup_button, td span.ppp_popup_button, th span.ppp_popup_button { height: 9px; width: 9px; margin-left: -13px; } +span.chart_picker input, span.part_picker input { padding-right: 20px; background: white url("../../image/search.svg") no-repeat center right; @@ -452,11 +455,14 @@ span.part_picker input { -webkit-box-sizing: padding-box; } +td span.chart_picker input, +th span.chart_picker input, td span.part_picker input, th span.part_picker input { padding-right: 15px; } +span.chart_picker, span.part_picker { /* white-space: nowrap;*/ } diff --git a/js/autocomplete_chart.js b/js/autocomplete_chart.js index bded6dbf2..c3d4cbd2e 100644 --- a/js/autocomplete_chart.js +++ b/js/autocomplete_chart.js @@ -254,11 +254,9 @@ namespace('kivi', function(k){ }); // now add a picker div after the original input - var pcont = $('').addClass('position-absolute'); - var picker = $('
'); - $dummy.after(pcont); - pcont.append(picker); - picker.addClass('icon16 search').click(open_dialog); + var popup_button = $('').addClass('cpc_popup_button'); + $dummy.after(popup_button); + popup_button.click(open_dialog); var cp = { real: function() { return $real },