From add258ac08b058c8abc25d4023d765ff3ae8b0fe Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 28 May 2016 09:57:19 +0200 Subject: [PATCH 1/2] Frio: Like, Dislike and comment are having icons, links are underlined --- view/theme/frio/css/style.css | 14 ++++++++ view/theme/frio/templates/wall_thread.tpl | 44 ++++++++++++----------- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 2295429d5..3bf74d7fd 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -45,6 +45,10 @@ body a:hover, body a:focus, body a:active, body a.active, body .btn-link:hover{ text-decoration: none; } +.wall-item-container a:hover { + text-decoration: underline; +} + hr { margin-top: 10px; margin-bottom: 10px; @@ -1288,6 +1292,10 @@ blockquote.shared_content { color: #555; } +.wall-item-tags a:hover { + text-decoration: none; +} + /* item social action buttons */ .wall-item-actions, .wall-item-actions a { font-size: 13px; @@ -1314,6 +1322,12 @@ blockquote.shared_content { padding-left: 5px; padding-right: 5px; } +.wall-item-actions .button-comments, +.wall-item-actions .button-votes, +.wall-item-actions .button-likes { + padding-left: 0px; + padding-right: 10px; +} /* wall item hover effects */ .wall-item-container .wall-item-links, diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index cea58e18b..7ef178f83 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -72,14 +72,14 @@ as the value of $top_child_total (this is done at the end of this file)
{{/if}}
- {{* Put addional actions in a top-right dorpdown menu *}} + {{* Put addional actions in a top-right dropdown menu *}}
@@ -316,9 +318,9 @@ as the value of $top_child_total (this is done at the end of this file) {{* Event attendance buttons *}} {{if $item.isevent}}
- {{$item.attend.0}} - {{$item.attend.1}} - {{$item.attend.2}} + {{$item.attend.0}} + {{$item.attend.1}} + {{$item.attend.2}}
{{/if}} From 4a388e84af5f0cf44057f1b6f86f3f9e9e365749 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 28 May 2016 13:08:43 +0200 Subject: [PATCH 2/2] Frio: Adopt changes to search_item.tpl as well. --- include/conversation.php | 4 ++++ view/theme/frio/css/style.css | 2 ++ view/theme/frio/templates/search_item.tpl | 17 +++++++++++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index a52502ec3..d889ba002 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -668,10 +668,14 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $owner_name_e = $owner_name; } + if ($item['item_network'] == "") + $item['item_network'] = $item['network']; + $tmp_item = array( 'template' => $tpl, 'id' => (($preview) ? 'P0' : $item['item_id']), 'network' => $item['item_network'], + 'network_name' => network_to_name($item['item_network'], $profile_link), 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), 'profile_url' => $profile_link, 'item_photo_menu' => item_photo_menu($item), diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 3bf74d7fd..35c490738 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1092,9 +1092,11 @@ section #jotOpen { /* Thread hover effects */ .wall-item-container .wall-item-content a, +.wall-item-container a, .wall-item-container .fakelink, .toplevel_item .fakelink, .toplevel_item .wall-item-container .btn-link, +.wall-item-container .btn-link, .toplevel_item .wall-item-container .wall-item-responses a { color: #555; -webkit-transition: all 0.25s ease-in-out; diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl index 89c05b058..122a86ae8 100644 --- a/view/theme/frio/templates/search_item.tpl +++ b/view/theme/frio/templates/search_item.tpl @@ -10,13 +10,22 @@
- {{* Put addional actions in a top-right dorpdown menu *}} - {{if $item.star || $item.drop.dropping || $item.edpost}} + {{* Put additional actions in a top-right dropdown menu *}} +
    +
  • {{$item.network_name}}
    • + + {{if $item.plink || $item.star || $item.drop.dropping || $item.edpost}}
    • + {{/if}}
- {{/if}} {{* The avatar picture and the photo-menu *}}
@@ -80,7 +89,7 @@
- {{$item.ago}} + {{$item.ago}}
{{if $item.location}}