Skip to content

Commit 0d2896a

Browse files
committed
Views Browse & Edit - using flexbox rather than float for layout.
1 parent 6a7325a commit 0d2896a

3 files changed

Lines changed: 38 additions & 19 deletions

File tree

js/view-one/one.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -599,24 +599,24 @@ return Backbone.View.extend({
599599
var hidden= _.isUndefined(visible)?false:!visible;
600600
h.push('<div data-p-width="100" class="evol-pnl evo-p-wiz" style="width:100%;'+(hidden?'display:none;':'')+'">');
601601
}else{
602-
h.push('<div data-p-width="'+p.width+'" class="evol-pnl pull-left" style="width:'+p.width+'%">');
602+
h.push('<div data-p-width="'+p.width+'" class="evol-pnl" style="width:'+p.width+'%">');
603603
}
604604
h.push(eUI.HTMLPanelBegin(p, this.style||'panel-default'),
605-
'<fieldset data-pid="'+p.id+(p.readonly?'" disabled>':'">'));
605+
'<fieldset data-pid="'+p.id+(p.readonly?'" disabled>':'"><div class="evol-fset">'));
606606
_.each(p.elements, function (elem) {
607607
if(elem.type=='panel-list'){
608608
that._renderPanelList(h, elem, elem.readonly?'browse':mode);
609609
}else{
610610
if(elem.type==fts.hidden){
611611
h.push(uiInput.hidden(that.fieldViewId(elem.id), that.getModelFieldValue(elem.id, elem.defaultValue, mode)));
612612
}else{
613-
h.push('<div style="width:'+parseInt(elem.width||100, 10)+'%" class="pull-left evol-fld">');
613+
h.push('<div style="width:'+parseInt(elem.width||100, 10)+'%" class="evol-fld">');
614614
that.renderField(h, elem, mode, iconsPath);
615615
h.push("</div>");
616616
}
617617
}
618618
});
619-
h.push('</fieldset>'+
619+
h.push('</div></fieldset>'+
620620
eUI.HTMLPanelEnd()+
621621
'</div>');
622622
return this;
@@ -626,7 +626,7 @@ return Backbone.View.extend({
626626
var isEditable = p.readonly?false:(mode!=='browse'),
627627
vMode=isEditable?mode:'browse';
628628

629-
h.push('<div style="width:'+p.width+'%" class="evol-pnl pull-left" data-pid="'+p.id+'">',
629+
h.push('<div style="width:'+p.width+'%" class="evol-pnl" data-pid="'+p.id+'">',
630630
eUI.HTMLPanelBegin(p, this.style),
631631
'<table class="table" data-mid="'+(p.attribute || p.id)+'"><thead><tr>');
632632
_.each(p.elements, function (elem) {

less/one.less

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,24 @@
44
// Copyright (c) 2015, Olivier Giulieri
55

66
/* --- panels & tabs --- */
7-
.evol-pnl .table .evol-money{
8-
//TODO: better fix
9-
width: 200px;
10-
}
11-
.evol-pnl > div > fieldset{
12-
padding: 10px 10px 5px 2px;
13-
}
14-
.evol-pnl > .panel{
15-
margin-bottom: 12px;
16-
}
17-
.evol-fld{
18-
padding-left:10px !important;
19-
margin-bottom: 6px;
7+
.evol-pnls{
8+
.flex-holder()
9+
}
10+
.evol-pnl {
11+
.flex-item();
12+
.table .evol-money{
13+
//TODO: better fix
14+
width: 200px;
15+
}
16+
.evol-pnl {
17+
> .panel{
18+
margin-bottom: 12px;
19+
}
20+
> div > fieldset{
21+
padding: 10px 10px 5px 2px;
22+
}
23+
}
2024
}
21-
2225
.evol-pnl,
2326
.evol-pnl-lst{
2427
padding-left:10px !important;
@@ -44,6 +47,14 @@
4447
}
4548

4649
/* --- fields --- */
50+
.evol-fset{
51+
.flex-holder();
52+
}
53+
.evol-fld{
54+
.flex-item();
55+
padding-left:10px !important;
56+
margin-bottom: 6px;
57+
}
4758

4859
.evol-required,
4960
.evol-asterix{

less/variables.less

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,11 @@
4141
-moz-border-radius: @r;
4242
-webkit-border-radius: @r;
4343
}
44+
.flex-holder(){
45+
display: flex;
46+
flex-wrap: wrap;
47+
}
48+
.flex-item(){
49+
box-sizing: border-box;
50+
flex-grow: 1;
51+
}

0 commit comments

Comments
 (0)