1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00

More bootstrap5 layout fixes

This commit is contained in:
Cameron 2021-10-18 09:53:49 -07:00
parent 95ea56bb89
commit d49f53677b
2 changed files with 45 additions and 45 deletions

View File

@ -306,10 +306,10 @@ $FORUM_VIEWFORUM_TEMPLATE['item'] = "<tr>
<td>{ICON}</td> <td>{ICON}</td>
<td> <td>
<div class='row'> <div class='row'>
<div class='col-xs-12 col-md-9'> <div class='col-12 col-xs-12 col-md-9'>
{THREADNAME} {THREADNAME}
<div><small>{LAN=FORUM_1004}: {POSTER} {THREADTIMELAPSE} &nbsp;</small></div> <div><small>{LAN=FORUM_1004}: {POSTER} {THREADTIMELAPSE} &nbsp;</small></div>
</div><div class='col-xs-12 col-md-3 text-right'> {PAGESX}</div> </div><div class='col-12 col-xs-12 col-md-3 text-right'> {PAGESX}</div>
</div> </div>
</td> </td>
<td class='text-center'>{REPLIESX}</td><td class='hidden-xs text-center'>{VIEWSX}</td> <td class='text-center'>{REPLIESX}</td><td class='hidden-xs text-center'>{VIEWSX}</td>
@ -372,17 +372,17 @@ $FORUM_VIEWFORUM_TEMPLATE['end'] = "</div>\n<!--- END --> \n";
// define {ICONKEY} // define {ICONKEY}
$FORUM_VIEWFORUM_TEMPLATE['iconkey'] = " $FORUM_VIEWFORUM_TEMPLATE['iconkey'] = "
<div class='row' > <div class='row' >
<div class='col-sm-3 col-xs-6'>{ICON: type=new} {LAN=FORUM_0039}</div> <div class='col-sm-3 col-6 col-xs-6'>{ICON: type=new} {LAN=FORUM_0039}</div>
<div class='col-sm-3 col-xs-6'>{ICON: type=nonew} {LAN=FORUM_0040}</div> <div class='col-sm-3 col-6 col-xs-6'>{ICON: type=nonew} {LAN=FORUM_0040}</div>
<div class='col-sm-3 col-xs-6'>{ICON: type=sticky} {LAN=FORUM_1011}</div> <div class='col-sm-3 col-6 col-xs-6'>{ICON: type=sticky} {LAN=FORUM_1011}</div>
<div class='col-sm-3 col-xs-6'>{ICON: type=announce} {LAN=FORUM_1013}</div> <div class='col-sm-3 col-6 col-xs-6'>{ICON: type=announce} {LAN=FORUM_1013}</div>
</div> </div>
<div class='row' > <div class='row' >
<div class='col-sm-3 col-xs-6'>{ICON: type=new_popular} {LAN=FORUM_0039} {LAN=FORUM_1010}</div> <div class='col-sm-3 col-6 col-xs-6'>{ICON: type=new_popular} {LAN=FORUM_0039} {LAN=FORUM_1010}</div>
<div class='col-sm-3 col-xs-6'>{ICON: type=nonew_popular} {LAN=FORUM_0040} {LAN=FORUM_1010}</div> <div class='col-sm-3 col-6 col-xs-6'>{ICON: type=nonew_popular} {LAN=FORUM_0040} {LAN=FORUM_1010}</div>
<div class='col-sm-3 col-xs-6'>{ICON: type=noreplies} {LAN=FORUM_1021}</div> <div class='col-sm-3 col-6 col-xs-6'>{ICON: type=noreplies} {LAN=FORUM_1021}</div>
<div class='col-sm-3 col-xs-6'>{ICON: type=closed} {LAN=FORUM_1014}</div> <div class='col-sm-3 col-6 col-xs-6'>{ICON: type=closed} {LAN=FORUM_1014}</div>
</div> </div>
"; ";

View File

@ -342,35 +342,35 @@ $FORUM_VIEWTOPIC_TEMPLATE['thread'] = "
<div class='hidden-xs row row-fluid btn-navbar navbar-btn'> <div class='hidden-xs row row-fluid btn-navbar navbar-btn'>
{SETIMAGE: w=100&h=100&crop=1} {SETIMAGE: w=100&h=100&crop=1}
<div class='col-xs-2 span2 left text-left'> <div class='col-2 col-xs-2 span2 left text-left'>
<div class='row'> <div class='row'>
<div class='col-xs-12 col-md-12 forum-user-combo'>{USERCOMBO}<br />{CUSTOMTITLE}</div> <div class='col-12 col-xs-12 col-md-12 forum-user-combo'>{USERCOMBO}<br />{CUSTOMTITLE}</div>
</div> </div>
{NEWFLAG} {ANON_IP}</div> {NEWFLAG} {ANON_IP}</div>
<div class='col-xs-4 col-sm-3 text-muted span4 text-muted muted'><small>{THREADDATESTAMP=relative}</small></div> <div class='col-4 col-xs-4 col-sm-3 text-muted span4 text-muted muted'><small>{THREADDATESTAMP=relative}</small></div>
<div class='col-xs-5 text-muted span5 text-muted muted right text-right'><small>{LASTEDIT}{LASTEDITBY=link}</small></div> <div class='col-5 col-xs-5 text-muted span5 text-muted muted right text-right'><small>{LASTEDIT}{LASTEDITBY=link}</small></div>
<div class='col-xs-3 col-sm-2 span1 right text-right'>{POSTOPTIONS}</div> <div class='col-3 col-xs-3 col-sm-2 span1 right text-right'>{POSTOPTIONS}</div>
</div> </div>
<div class='row row-fluid' > <div class='row row-fluid' >
<div class='col-xs-12 col-md-2 span2 left'> <div class='col-12 col-xs-12 col-md-2 span2 left'>
<div class='row'> <div class='row'>
<div class='col-xs-3 col-md-12 text-center'>{AVATAR: shape=rounded}</div> <div class='col-3 col-xs-3 col-md-12 text-center'>{AVATAR: shape=rounded}</div>
<div class='col-xs-6 visible-xs'>{USERCOMBO}<br />{CUSTOMTITLE}</div> <div class='col-6 col-xs-6 visible-xs d-block d-sm-none'>{USERCOMBO}<br />{CUSTOMTITLE}</div>
<div class='col-xs-6 col-md-12 hidden-xs'> <div class='col-6 col-xs-6 col-md-12 hidden-xs'>
<small> <small>
{LEVEL=badge} {LEVEL=glyph} {LEVEL=badge} {LEVEL=glyph}
</small> </small>
</div> </div>
<div class='visible-xs col-xs-3'><div class='clearfix'>{POSTOPTIONS}</div><div class='pull-right float-right float-end'><br /><small class='text-muted'>{THREADDATESTAMP=relative}</small></div></div> <div class='visible-xs d-block d-sm-none col-3 col-xs-3'><div class='clearfix'>{POSTOPTIONS}</div><div class='pull-right float-right float-end'><br /><small class='text-muted'>{THREADDATESTAMP=relative}</small></div></div>
</div> </div>
</div> </div>
<div class='visible-xs col-xs-12'><hr /></div> <div class='visible-xs d-block d-sm-none col-12 col-xs-12'><hr /></div>
<div class='col-xs-12 col-md-9 span9 forum-thread-text '> <div class='col-12 col-xs-12 col-md-9 span9 forum-thread-text '>
{POLL} {POLL}
{THREAD_TEXT} {THREAD_TEXT}
{ATTACHMENTS: modal=1} {ATTACHMENTS: modal=1}
@ -379,14 +379,14 @@ $FORUM_VIEWTOPIC_TEMPLATE['thread'] = "
<div class='row row-fluid'> <div class='row row-fluid'>
<div class='col-xs-2 span2 finfobar'> <div class='col-2 col-xs-2 span2 finfobar'>
&nbsp; &nbsp;
</div> </div>
<div class='col-xs-9 span9 finfobar' > <div class='col-9 col-xs-9 span9 finfobar' >
<small> {SIGNATURE=clean}</small> <small> {SIGNATURE=clean}</small>
</div> </div>
<div class='col-xs-3 span3'> <div class='col-3 col-xs-3 span3'>
</div> </div>
</div> </div>
@ -396,22 +396,22 @@ $FORUM_VIEWTOPIC_TEMPLATE['thread'] = "
"; ";
$FORUM_VIEWTOPIC_TEMPLATE['end'] = "</ul> $FORUM_VIEWTOPIC_TEMPLATE['end'] = "</ul>
<div class='col-xs-12'> <div class='col-12 col-xs-12'>
<hr /> <hr />
</div> </div>
<div class='row'> <div class='row'>
<div class='col-xs-12 col-md-4'></div> <div class='col-12 col-xs-12 col-md-4'></div>
<div class='col-xs-12 col-md-4 text-center'> <div class='col-12 col-xs-12 col-md-4 text-center'>
{GOTOPAGES} {GOTOPAGES}
</div> </div>
<div class='col-xs-12 col-md-4'> <div class='col-12 col-xs-12 col-md-4'>
<div class='pull-right float-right float-end'> <div class='pull-right float-right float-end'>
{BUTTONSX} {BUTTONSX}
</div> </div>
</div> </div>
</div> </div>
<div class='row'> <div class='row'>
<div class='col-xs-12 col-md-8 col-md-offset-2'> <div class='col-12 col-xs-12 col-md-8 col-md-offset-2'>
{QUICKREPLY} {QUICKREPLY}
</div> </div>
</div> </div>
@ -430,49 +430,49 @@ $FORUM_VIEWTOPIC_TEMPLATE['deleted'] = "
<div class='hidden-xs row row-fluid btn-navbar navbar-btn'> <div class='hidden-xs row row-fluid btn-navbar navbar-btn'>
{SETIMAGE: w=100&h=0&crop=0} {SETIMAGE: w=100&h=0&crop=0}
<div class='col-xs-2 span2 left text-left'> <div class='col-2 col-xs-2 span2 left text-left'>
<div class='row'> <div class='row'>
<div class='col-xs-12 col-md-12 forum-user-combo'>{USERCOMBO}<br />{CUSTOMTITLE}</div> <div class='col-12 col-xs-12 col-md-12 forum-user-combo'>{USERCOMBO}<br />{CUSTOMTITLE}</div>
</div> </div>
{NEWFLAG} {ANON_IP}</div> {NEWFLAG} {ANON_IP}</div>
<div class='col-xs-4 col-sm-3 text-muted span4 text-muted muted'><small>{THREADDATESTAMP=relative}</small></div> <div class='col-4 col-xs-4 col-sm-3 text-muted span4 text-muted muted'><small>{THREADDATESTAMP=relative}</small></div>
<div class='col-xs-5 text-muted span5 text-muted muted right text-right'><small>{LASTEDIT}{LASTEDITBY=link}</small></div> <div class='col-5 col-xs-5 text-muted span5 text-muted muted right text-right'><small>{LASTEDIT}{LASTEDITBY=link}</small></div>
<div class='col-xs-3 col-sm-2 span1 right text-right'>{POSTOPTIONS}</div> <div class='col-3 col-xs-3 col-sm-2 span1 right text-right'>{POSTOPTIONS}</div>
</div> </div>
<div class='row row-fluid' > <div class='row row-fluid' >
<div class='col-xs-12 col-md-2 span2 left'> <div class='col-12 col-xs-12 col-md-2 span2 left'>
<div class='row'> <div class='row'>
<div class='col-xs-3 col-md-12 text-center'>{AVATAR: shape=rounded}</div> <div class='col-3 col-xs-3 col-md-12 text-center'>{AVATAR: shape=rounded}</div>
<div class='col-xs-6 visible-xs'>{USERCOMBO}<br />{CUSTOMTITLE}</div> <div class='col-6 col-xs-6 visible-xs d-block d-sm-none'>{USERCOMBO}<br />{CUSTOMTITLE}</div>
<div class='col-xs-6 col-md-12 hidden-xs'> <div class='col-6 col-xs-6 col-md-12 hidden-xs'>
<small> <small>
{LEVEL=badge} {LEVEL=glyph} {LEVEL=badge} {LEVEL=glyph}
</small> </small>
</div> </div>
<div class='visible-xs col-xs-3'><div class='clearfix'>{POSTOPTIONS}</div><div class='pull-right float-right float-end'><br /><small class='text-muted'>{THREADDATESTAMP=relative}</small></div></div> <div class='visible-xs d-block d-sm-none col-3 col-xs-3'><div class='clearfix'>{POSTOPTIONS}</div><div class='pull-right float-right float-end'><br /><small class='text-muted'>{THREADDATESTAMP=relative}</small></div></div>
</div> </div>
</div> </div>
<div class='visible-xs col-xs-12'><hr /></div> <div class='visible-xs d-block d-sm-none col-12 col-xs-12'><hr /></div>
<div class='col-xs-12 col-md-9 span9 forum-thread-text '> <div class='col-12 col-xs-12 col-md-9 span9 forum-thread-text '>
{POSTDELETED} {POSTDELETED}
</div> </div>
</div> </div>
<div class='row row-fluid'> <div class='row row-fluid'>
<div class='col-xs-2 span2 finfobar'> <div class='col-2 col-xs-2 span2 finfobar'>
&nbsp; &nbsp;
</div> </div>
<div class='col-xs-9 span9 finfobar' > <div class='col-9 col-xs-9 span9 finfobar' >
<small> {SIGNATURE=clean}</small> <small> {SIGNATURE=clean}</small>
</div> </div>
<div class='col-xs-3 span3'> <div class='col-3 col-xs-3 span3'>
</div> </div>
</div> </div>