aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-06-19 15:49:06 +0200
committerMario Vavti <mario@mariovavti.com>2015-06-19 15:49:06 +0200
commit8b563951ff9019e6a0c3a459ad5b768826a2017c (patch)
treed2589e1fadc7ace9a8c0bdbad6be1d8f257ec8fc /view
parent1432b1e83f522f453d9777045cd710442a65d2ea (diff)
downloadvolse-hubzilla-8b563951ff9019e6a0c3a459ad5b768826a2017c.tar.gz
volse-hubzilla-8b563951ff9019e6a0c3a459ad5b768826a2017c.tar.bz2
volse-hubzilla-8b563951ff9019e6a0c3a459ad5b768826a2017c.zip
more generic-content-wrapper and some css fixes
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css14
-rwxr-xr-xview/tpl/photo_view.tpl17
-rw-r--r--view/tpl/sharedwithme.tpl48
3 files changed, 44 insertions, 35 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 946e2d7d7..ad203867c 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1889,7 +1889,6 @@ nav .dropdown-menu {
color: #31708f;
background-color: #d9edf7;
margin-bottom: 3px;
- border-radius: $radiuspx;
text-align: center;
}
@@ -1898,7 +1897,6 @@ nav .dropdown-menu {
color: #8a6d3b;
background-color: #fcf8e3;
margin-bottom: 3px;
- border-radius: $radiuspx;
text-align: center;
}
@@ -1907,10 +1905,20 @@ nav .dropdown-menu {
color: #a94442;
background-color: #f2dede;
margin-bottom: 3px;
- border-radius: $radiuspx;
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 {
padding: 7px 10px;
background-color: $comment_item_colour;
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 1054d5e3a..63d5ad778 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -1,6 +1,5 @@
<div id="live-photos"></div>
<div class="generic-content-wrapper">
-
<div class="section-title-wrapper">
<div class="pull-right">
@@ -155,17 +154,17 @@
{{/if}}
<div class="clear"></div>
</div>
-</div>
-{{$comments}}
+ {{$comments}}
-{{if $commentbox}}
-<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
- {{$commentbox}}
-</div>
-{{/if}}
+ {{if $commentbox}}
+ <div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
+ {{$commentbox}}
+ </div>
+ {{/if}}
-<div class="clear"></div>
+ <div class="clear"></div>
+</div>
{{$paginate}}
diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl
index cb365ed05..4ffacc241 100644
--- a/view/tpl/sharedwithme.tpl
+++ b/view/tpl/sharedwithme.tpl
@@ -1,24 +1,26 @@
-<div class="section-title-wrapper">
- <a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="icon-trash"></i>&nbsp;{{$dropall}}</a>
- <h2>{{$header}}</h2>
-</div>
-<div class="generic-content-wrapper section-content-wrapper-np">
- <table id="cloud-index">
- <tr>
- <th width="1%"></th>
- <th width="92%">{{$name}}</th>
- <th width="1%"></th>
- <th width="1%" class="hidden-xs">{{$size}}</th>
- <th width="1%" class="hidden-xs">{{$lastmod}}</th>
- </tr>
- {{foreach $items as $item}}
- <tr id="cloud-index-{{$item.id}}">
- <td><i class="{{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></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="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.objfilesize}}</td>
- <td class="hidden-xs">{{$item.objedited}}</td>
- </tr>
- {{/foreach}}
- </table>
+<div class="generic-content-wrapper">
+ <div class="section-title-wrapper">
+ <a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="icon-trash"></i>&nbsp;{{$dropall}}</a>
+ <h2>{{$header}}</h2>
+ </div>
+ <div class="section-content-wrapper-np">
+ <table id="cloud-index">
+ <tr>
+ <th width="1%"></th>
+ <th width="92%">{{$name}}</th>
+ <th width="1%"></th>
+ <th width="1%" class="hidden-xs">{{$size}}</th>
+ <th width="1%" class="hidden-xs">{{$lastmod}}</th>
+ </tr>
+ {{foreach $items as $item}}
+ <tr id="cloud-index-{{$item.id}}">
+ <td><i class="{{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></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="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.objfilesize}}</td>
+ <td class="hidden-xs">{{$item.objedited}}</td>
+ </tr>
+ {{/foreach}}
+ </table>
+ </div>
</div>