more generic-content-wrapper and some css fixes

This commit is contained in:
Mario Vavti 2015-06-19 15:49:06 +02:00
parent 1432b1e83f
commit 8b563951ff
3 changed files with 46 additions and 37 deletions

View File

@ -1889,7 +1889,6 @@ nav .dropdown-menu {
color: #31708f; color: #31708f;
background-color: #d9edf7; background-color: #d9edf7;
margin-bottom: 3px; margin-bottom: 3px;
border-radius: $radiuspx;
text-align: center; text-align: center;
} }
@ -1898,7 +1897,6 @@ nav .dropdown-menu {
color: #8a6d3b; color: #8a6d3b;
background-color: #fcf8e3; background-color: #fcf8e3;
margin-bottom: 3px; margin-bottom: 3px;
border-radius: $radiuspx;
text-align: center; text-align: center;
} }
@ -1907,10 +1905,20 @@ nav .dropdown-menu {
color: #a94442; color: #a94442;
background-color: #f2dede; background-color: #f2dede;
margin-bottom: 3px; margin-bottom: 3px;
border-radius: $radiuspx;
text-align: center; text-align: center;
} }
.section-content-tools-wrapper .section-content-info-wrapper,
.section-content-wrapper .section-content-info-wrapper,
.section-content-tools-wrapper .section-content-warning-wrapper,
.section-content-wrapper .section-content-warning-wrapper,
.section-content-tools-wrapper .section-content-danger-wrapper,
.section-content-wrapper .section-content-danger-wrapper {
margin-bottom: 0px;
border-radius: $radiuspx;
}
.section-content-wrapper { .section-content-wrapper {
padding: 7px 10px; padding: 7px 10px;
background-color: $comment_item_colour; background-color: $comment_item_colour;

View File

@ -1,6 +1,5 @@
<div id="live-photos"></div> <div id="live-photos"></div>
<div class="generic-content-wrapper"> <div class="generic-content-wrapper">
<div class="section-title-wrapper"> <div class="section-title-wrapper">
<div class="pull-right"> <div class="pull-right">
@ -155,17 +154,17 @@
{{/if}} {{/if}}
<div class="clear"></div> <div class="clear"></div>
</div> </div>
{{$comments}}
{{if $commentbox}}
<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
{{$commentbox}}
</div>
{{/if}}
<div class="clear"></div>
</div> </div>
{{$comments}}
{{if $commentbox}}
<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
{{$commentbox}}
</div>
{{/if}}
<div class="clear"></div>
{{$paginate}} {{$paginate}}

View File

@ -1,24 +1,26 @@
<div class="section-title-wrapper"> <div class="generic-content-wrapper">
<a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="icon-trash"></i>&nbsp;{{$dropall}}</a> <div class="section-title-wrapper">
<h2>{{$header}}</h2> <a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="icon-trash"></i>&nbsp;{{$dropall}}</a>
</div> <h2>{{$header}}</h2>
<div class="generic-content-wrapper section-content-wrapper-np"> </div>
<table id="cloud-index"> <div class="section-content-wrapper-np">
<tr> <table id="cloud-index">
<th width="1%"></th> <tr>
<th width="92%">{{$name}}</th> <th width="1%"></th>
<th width="1%"></th> <th width="92%">{{$name}}</th>
<th width="1%" class="hidden-xs">{{$size}}</th> <th width="1%"></th>
<th width="1%" class="hidden-xs">{{$lastmod}}</th> <th width="1%" class="hidden-xs">{{$size}}</th>
</tr> <th width="1%" class="hidden-xs">{{$lastmod}}</th>
{{foreach $items as $item}} </tr>
<tr id="cloud-index-{{$item.id}}"> {{foreach $items as $item}}
<td><i class="{{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td> <tr id="cloud-index-{{$item.id}}">
<td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}}&nbsp;<span class="label label-success">{{$label_new}}</span>{{/if}}</td> <td><i class="{{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td>
<td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> <td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}}&nbsp;<span class="label label-success">{{$label_new}}</span>{{/if}}</td>
<td class="hidden-xs">{{$item.objfilesize}}</td> <td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
<td class="hidden-xs">{{$item.objedited}}</td> <td class="hidden-xs">{{$item.objfilesize}}</td>
</tr> <td class="hidden-xs">{{$item.objedited}}</td>
{{/foreach}} </tr>
</table> {{/foreach}}
</table>
</div>
</div> </div>