Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 3ca17b1b

Von Moritz Bunkus vor mehr als 8 Jahren hinzugefügt

  • ID 3ca17b1b1db28ea6b1ddbb90b68d6a580f5fee87
  • Vorgänger 546829a0
  • Nachfolger 7a1bf140

Revert "Partpicker styling"

This reverts commit b9889576a1229f41edc2c1daf9b649d97fb7fd2e.

Grund: im Chrome (sowohl unter Linux als auch Windows) sieht das
Ergebnis ziemlich mies und hochgradig verwirrend aus. Im Internet
Explorer ist die Lupe zusätzlich zu weit unten positioniert (eher ein
Schönheitsfehler).

Unterschiede anzeigen:

css/kivitendo/main.css
392 392
}
393 393

  
394 394
.part_picker {
395
  padding-right: 16px;
395 396
}
396 397
.chart_picker {
397 398
  padding-right: 16px;
......
429 430
  float:left;
430 431
  width: 350px;
431 432
}
432
span.ppp_popup_button {
433
  position: absolute;
434
  margin-left: -24px;
435
  margin-top: 5px;
436
  width: 20px;
437
  height: 20px;
438
  cursor: pointer;
439
  background: url("../../image/search.svg") no-repeat center right;
440
  background-size: contain;
441
}
442
span.part_picker input {
443
  padding-right: 20px;
444
  box-sizing: padding-box;
445
  -moz-box-sizing: padding-box;
446
  -webkit-box-sizing: padding-box;
447
}
448
span.part_picker {
449
  white-space: nowrap;
450
}
451 433
/* div.cpc_block { */
452 434
/*   overflow:hidden; */
453 435
/*   float:left; */
css/lx-office-erp/main.css
25 25

  
26 26
select {
27 27
  -moz-appearance: none;
28
  -webkit-appearance: none;
29
  -o-appearance: none;
30 28
  appearance : none;
31 29
  background: white url('../../image/select-down.png') no-repeat scroll right center;
32 30
  padding: 0 14px 0 0;
......
391 389
}
392 390

  
393 391
.part_picker {
392
  padding-right: 16px;
394 393
}
395 394
.chart_picker {
396 395
  padding-right: 16px;
......
426 425
  float:left;
427 426
  width: 350px;
428 427
}
429
span.ppp_popup_button {
430
  display: inline-block;
431
  position: relative;
432
  margin-left: -18px;
433
  margin-top: 3px;
434
  height: 16px;
435
  width: 16px;
436
  cursor: pointer;
437
}
438

  
439
td span.ppp_popup_button,
440
th span.ppp_popup_button {
441
  height: 9px;
442
  width: 9px;
443
  margin-left: -13px;
444
}
445
span.part_picker input {
446
  padding-right: 20px;
447
  background: white url("../../image/search.svg") no-repeat center right;
448
  background-size: contain;
449
  box-sizing: padding-box;
450
  -moz-box-sizing: padding-box;
451
  -webkit-box-sizing: padding-box;
452
}
453

  
454
td span.part_picker input,
455
th span.part_picker input {
456
  padding-right: 15px;
457
}
458

  
459
span.part_picker {
460
 /* white-space: nowrap;*/
461
}
462

  
463 428
div.ppp_block span.ppp_block_number,
464 429
div.cpc_block span.cpc_block_number
465 430
{
......
516 481
       background-color:#FF0000;
517 482
       border:none;
518 483
}
519

  
image/search.svg
1
<svg xmlns="http://www.w3.org/2000/svg" width="1000px" height="1000px" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1000 1000" preserveAspectRatio="xMidYMid meet" zoomAndPan="disable" >
2
  <rect id="svgEditorBackground" x="0" y="0" width="1000" height="1000" style="fill: none; stroke: none;"/>
3
    <circle id="e2_circle" cx="600" cy="400" style="stroke-width: 30px; vector-effect: non-scaling-stroke;" stroke="grey" r="250" fill="grey"/>
4
    <circle id="e3_circle" cx="600" cy="400" style="stroke-width: 30px; vector-effect: non-scaling-stroke;" stroke="lightgrey" r="190" fill="white"/>
5
    <rect x="-250" y="475" style="stroke-width: 1px; vector-effect: non-scaling-stroke;" stroke="black" id="e4_rectangle" width="200" height="50" fill="grey" transform="matrix(1, -1, 1, 1, 0, 0)"/>
6
  </svg>
js/autocomplete_part.js
237 237
    });
238 238

  
239 239
    // now add a picker div after the original input
240
    var popup_button = $('<span>').addClass('ppp_popup_button');
241
    $dummy.after(popup_button);
242
    popup_button.click(open_dialog);
240
    var pcont  = $('<span>').addClass('position-absolute');
241
    var picker = $('<div>');
242
    $dummy.after(pcont);
243
    pcont.append(picker);
244
    picker.addClass('icon16 search').click(open_dialog);
243 245

  
244 246
    var pp = {
245 247
      real:           function() { return $real },
templates/webpages/part/test_page.html
1 1
[% USE L %]
2 2

  
3
<h1>Part Picker Testpage</h1>
3
<h1>Waren Picker Testpage</h1>
4 4

  
5 5
<br>
6 6
Alle: <br>
......
12 12
Waren und Dienstleistungen: <br>
13 13
[% L.part_picker('part_id4', undef, type='part,service') %]<br>
14 14

  
15
<h2>Styling</h2>
16

  
17
Ina span:
18
<span>Leading text: [% L.part_picker('p1', undef, type='part,service') %] and text after with spacing</span><br>
19
<span>Leading text:[% L.part_picker('p2', undef, type='part,service') %]and text after without spacing</span><br>
20
<div>Leading text: [% L.part_picker('p3', undef, type='part,service') %] and text after with spacing with div</div><br>
21
<div>Leading text:[% L.part_picker('p4', undef, type='part,service') %]and text after with spacing with div</div><br>
22

  
23
<span>Picker + input next to each other: [% L.part_picker('p5', undef, type='part,service', width="100%") %]<input type=text></span>
24

  
25
<div>[% L.part_picker('p6', undef, type='part,service', style="width:500px") %] 500px width</div>
26
<div>[% L.part_picker('p7', undef, type='part,service', style="width:200px") %] 200px width</div>
27
<div>[% L.part_picker('p8', undef, type='part,service', style="height:40px") %] 40px height</div>
28

  
29 15

  
30 16
[%# FOREACH i IN 1..50 %]
31 17
[%# L.part_picker('part_id_' _ i) %] <br>
32 18
[%# END %]
33

  
34
<h2>In tables</h2>
35

  
36
<p>No classes:</p>
37

  
38
<table>
39
 <tr>
40
  <th>Part picker in table heading</th>
41
  <th>[% L.part_picker('p9', undef, type='part,service') %]</th>
42
 </tr>
43
 <tr>
44
  <td>Part picker in table cell</td>
45
  <td>[% L.part_picker('p10', undef, type='part,service') %]</td>
46
 </tr>
47
</table>
48

  
49
<p>With classes:</p>
50

  
51
<table>
52
 <tr class=listheading>
53
  <th>Part picker in table heading</th>
54
  <th>[% L.part_picker('p11', undef, type='part,service') %]</th>
55
 </tr>
56
 <tr class=listrow>
57
  <td>Part picker in table cell</td>
58
  <td>[% L.part_picker('p12', undef, type='part,service') %]</td>
59
 </tr>
60
</table>

Auch abrufbar als: Unified diff