From 4e17aab96a6e6b764de3d742dcf6164e20669893 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 9 Feb 2020 17:47:41 -0500 Subject: [PATCH] [frio] Prevent more action menu to be clipped by the post box - Address https://friendica.mrpetovan.com/display/0b6b25a8-615e-3dda-937e-21e937937450 - Move external link back to the post top right - Prevent more action menu to become semi-transparent on post mouseout --- view/theme/frio/css/style.css | 41 +--- view/theme/frio/templates/wall_thread.tpl | 224 +++++++++++----------- 2 files changed, 120 insertions(+), 145 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 1595403b5d..f3dfe38161 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -524,17 +524,6 @@ nav.navbar .nav > li > button:focus top: 4px; right: -2px; background-color: #ff8989; - -/* text-transform: uppercase; - display: inline-block; - padding: 3px 5px 4px; - font-weight: 600; - font-size: 10px!important; - color: #fff!important; - vertical-align: baseline; - white-space: nowrap; - text-shadow: none; - display: none;*/ } #topbar-first #intro-update{ cursor: pointer; @@ -961,19 +950,6 @@ nav.navbar .nav > li > button:focus color: #555; margin-bottom: 15px; } -.nav-pills.preferences .dropdown .dropdown-toggle, -.nav-pills.preferences > li > .btn { - color: #bebebe; -} -.nav-pills.preferences .dropdown.open .dropdown-toggle, -.nav-pills.preferences .dropdown.open .dropdown-toggle:hover { - background-color: $nav_bg; -} - -.nav-pills.preferences .dropdown .dropdown-toggle, -.nav-pills.preferences > li > .btn { - padding: 2px 10px; -} #newmember-tab > a { font-size: 1.2em; @@ -1681,13 +1657,13 @@ aside .panel-body { } /* wall items action dropdown menu */ -.nav-pills.preferences { +.preferences { position: absolute; right: 15px; top: 10px; } -.comment .nav-pills.preferences { - right: 5px; +.comment .preferences { + right: 10px; top: 5px; } .wall-item-network { @@ -1931,6 +1907,9 @@ code > .hl-main { .wall-item-actions .separator { margin: 0 .3em; } +.wall-item-actions .more-links { + position: absolute; +} .wall-item-responses > div > p { margin: 0; @@ -1938,7 +1917,7 @@ code > .hl-main { /* wall item hover effects */ .wall-item-container .wall-item-links, -.wall-item-container .wall-item-actions, +.wall-item-container .wall-item-actions button, .wall-item-container .body-attach > a { opacity: 0.3; -webkit-transition: all 0.25s ease-in-out; @@ -1948,7 +1927,7 @@ code > .hl-main { transition: all 0.25s ease-in-out; } .wall-item-container:hover .wall-item-links, -.wall-item-container:hover .wall-item-actions, +.wall-item-container:hover .wall-item-actions button, .wall-item-container:hover .body-attach > a { opacity: 1; -webkit-transition: all 0.25s ease-in-out; @@ -1962,7 +1941,7 @@ code > .hl-main { } /* -/* Comments +* Comments */ .well { border: none; @@ -3523,7 +3502,7 @@ section .profile-match-wrapper { margin-top: 0; } - .nav-pills.preferences { + .preferences { right: 10px; } diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index d6c7f43a3e..8e058c30f6 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -208,13 +208,19 @@ as the value of $top_child_total (this is done at the end of this file) {{/if}} - +
+ {{if $item.network_icon != ""}} + + {{else}} + {{$item.network_name}} + {{/if}} + {{if $item.plink}} {{*link to the original source of the item *}} +   + + + + {{/if}} +
@@ -263,118 +269,108 @@ as the value of $top_child_total (this is done at the end of this file)
{{* Action buttons to interact with the item (like: like, dislike, share and so on *}} - - {{if $item.threaded}}{{/if}} - - {{* Buttons for like and dislike *}} - {{if $item.vote}} - {{if $item.vote.like}} - - {{/if}} - {{if $item.vote.like AND $item.vote.dislike}} - - {{/if}} - {{if $item.vote.dislike}} - - {{/if}} - - {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}} - - {{/if}} + {{* Buttons for like and dislike *}} + {{if $item.vote}} + {{if $item.vote.like}} + {{/if}} - - {{* Button to open the comment text field *}} - {{if $item.comment}} - - {{/if}} - - {{* Button for sharing the item *}} - {{if $item.vote}} - {{if $item.vote.share}} - {{if $item.vote.like OR $item.vote.dislike OR $item.comment}} - - {{/if}} - - {{/if}} - {{/if}} - - {{* Put additional actions in a dropdown menu *}} - {{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer || $item.subthread}} + {{if $item.vote.like AND $item.vote.dislike}} - - - - {{/if}} + {{if $item.vote.dislike}} + + {{/if}} + + {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}} + + {{/if}} + {{/if}} + + {{* Button to open the comment text field *}} + {{if $item.comment}} + + {{/if}} + + {{* Button for sharing the item *}} + {{if $item.vote}} + {{if $item.vote.share}} + {{if $item.vote.like OR $item.vote.dislike OR $item.comment}} + + {{/if}} + + {{/if}} + {{/if}} + + {{* Put additional actions in a dropdown menu *}} + {{if $item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.subthread || $item.ignore || $item.drop.dropping}} + + + + + + + {{else}} + {{/if}} +