diff options
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/diabook/style.css | 7 | ||||
| -rw-r--r-- | view/theme/diabook/wall_item.tpl | 7 | ||||
| -rw-r--r-- | view/theme/diabook/wallwall_item.tpl | 9 |
3 files changed, 20 insertions, 3 deletions
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index ad7119c2a..c9be0111d 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -484,6 +484,9 @@ code { #sidebar-group-list .tool:hover { background: #EEE; } +#sidebar-pages-list .tool:hover { + background: #EEE; +} .tool .label { float: left; } @@ -1290,14 +1293,14 @@ section { } .tag { /*background: url("../../../images/tag_b.png") repeat-x center left;*/ - color: #3465A4; + color: #999; padding-left: 3px; font-size: 12px; } .tag a { padding-right: 5px; /*background: url("../../../images/tag.png") no-repeat center right;*/ - color: #3465A4; + color: #999; } .wwto { position: absolute !important; diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index ebe40fd4e..6cbab0a71 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -46,7 +46,10 @@ </div> <div class="wall-item-actions"> +<<<<<<< HEAD:view/theme/diabook/wall_item.tpl +======= +>>>>>>> upstream/master:view/theme/diabook/wall_item.tpl <div class="wall-item-actions-social"> @@ -82,7 +85,11 @@ <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> {{ endif }} </div> +<<<<<<< HEAD:view/theme/diabook/wall_item.tpl + <div class="wall-item-location">$item.location </div> +======= <div class="wall-item-location">$item.location </div> +>>>>>>> upstream/master:view/theme/diabook/wall_item.tpl </div> </div> <div class="wall-item-bottom"> diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl index e02e5a8be..4f0a2e25f 100644 --- a/view/theme/diabook/wallwall_item.tpl +++ b/view/theme/diabook/wallwall_item.tpl @@ -52,7 +52,10 @@ </div> <div class="wall-item-actions"> +<<<<<<< HEAD:view/theme/diabook/wallwall_item.tpl +======= +>>>>>>> upstream/master:view/theme/diabook/wallwall_item.tpl <div class="wall-item-actions-social"> @@ -89,6 +92,10 @@ {{ endif }} </div> <div class="wall-item-location">$item.location </div> +<<<<<<< HEAD:view/theme/diabook/wallwall_item.tpl + +======= +>>>>>>> upstream/master:view/theme/diabook/wallwall_item.tpl </div> </div> <div class="wall-item-bottom"> @@ -100,4 +107,4 @@ <div class="wall-item-comment-wrapper" > $item.comment -</div>
\ No newline at end of file +</div> |