mirror of
https://github.com/friendica/friendica
synced 2024-12-23 15:20:17 +00:00
Reverted original display for item action links + jot bbcode buttons
- Cleaned useless CSS
This commit is contained in:
Hypolite Petovan
parent
077c4cadf1
commit
214c76fec7
5 changed files with 49 additions and 40 deletions
|
|
@ -51,7 +51,10 @@ body a[name]:not([href]) {
|
|||
visibility: hidden;
|
||||
}
|
||||
|
||||
body a:hover, body a:focus, body a:active, body a.active, body .btn-link:hover{
|
||||
body a:hover, body .btn-link:hover,
|
||||
body a:focus, body .btn-link:focus,
|
||||
body a:active, body .btn-link:active,
|
||||
body a.active, body .btn-link.active {
|
||||
/*color: #59d6e4;*/
|
||||
color: $link_hover_color;
|
||||
text-decoration: none;
|
||||
|
|
@ -1322,8 +1325,6 @@ section #jotOpen {
|
|||
.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;
|
||||
|
|
@ -1334,7 +1335,6 @@ section #jotOpen {
|
|||
}
|
||||
|
||||
.toplevel_item:hover .fakelink, .wall-item-container:hover .fakelink,
|
||||
.toplevel_item:hover .wall-item-container:hover :not(.dropdown):not([role=menuitem]) > .btn-link,
|
||||
.toplevel_item:hover .wall-item-container:hover .wall-item-responses a,
|
||||
.toplevel_item:hover .wall-item-content a,
|
||||
.toplevel_item:hover .wall-item-name,
|
||||
|
|
@ -1550,19 +1550,19 @@ code > .hl-main {
|
|||
}
|
||||
|
||||
/* item social action buttons */
|
||||
.wall-item-actions, .wall-item-actions a {
|
||||
.wall-item-actions, .wall-item-actions a, .wall-item-actions button {
|
||||
font-size: 13px;
|
||||
color: #555;
|
||||
margin-top: 15px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.wall-item-actions a.active {
|
||||
.wall-item-actions .active {
|
||||
font-weight: bold;
|
||||
}
|
||||
.wall-item-actions a:hover {
|
||||
.wall-item-actions :hover {
|
||||
color: #555;
|
||||
}
|
||||
.wall-item-actions a.active:hover {
|
||||
.wall-item-actions .active:hover {
|
||||
color: $link_color;
|
||||
}
|
||||
.wall-item-actions-left {
|
||||
|
|
|
|||
|
|
@ -84,33 +84,33 @@
|
|||
</li>
|
||||
*}}
|
||||
<li>
|
||||
<button type="button" class="btn btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="desc">
|
||||
<button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="desc">
|
||||
<i class="fa fa-link"></i>
|
||||
</button>
|
||||
</li>
|
||||
<li>
|
||||
<button type="button" class="btn btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="desc">
|
||||
<button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="desc">
|
||||
<i class="fa fa-video-camera"></i>
|
||||
</button>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<button type="button" class="btn btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="desc">
|
||||
<button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="desc">
|
||||
<i class="fa fa-underline"></i>
|
||||
</button>
|
||||
</li>
|
||||
<li>
|
||||
<button type="button" class="btn btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="desc">
|
||||
<button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="desc">
|
||||
<i class="fa fa-italic"></i>
|
||||
</button>
|
||||
</li>
|
||||
<li>
|
||||
<button type="button" class="btn btn-link icon bold" style="cursor: pointer;" title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="desc">
|
||||
<button type="button" class="btn-link icon bold" style="cursor: pointer;" title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="desc">
|
||||
<i class="fa fa-bold"></i>
|
||||
</button>
|
||||
</li>
|
||||
<li>
|
||||
<button type="button" class="btn btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="desc">
|
||||
<button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="desc">
|
||||
<i class="fa fa-quote-left"></i>
|
||||
</button>
|
||||
</li>
|
||||
|
|
@ -125,39 +125,39 @@
|
|||
<ul id="comment-tools-loc" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
|
||||
{{* commented out because it isn't implemented yet
|
||||
<li>
|
||||
<button type="button" class="btn btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
|
||||
<button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
|
||||
<i class="fa fa-picture-o"></i>
|
||||
</button>
|
||||
</li>
|
||||
*}}
|
||||
<li>
|
||||
<button type="button" class="btn btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc">
|
||||
<button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc">
|
||||
<i class="fa fa-link"></i>
|
||||
</button>
|
||||
</li>
|
||||
<li>
|
||||
<button type="button" class="btn btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
|
||||
<button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
|
||||
<i class="fa fa-video-camera"></i>
|
||||
</button>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<button type="button" class="btn btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
|
||||
<button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
|
||||
<i class="fa fa-underline"></i>
|
||||
</button>
|
||||
</li>
|
||||
<li>
|
||||
<button type="button" class="btn btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
|
||||
<button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
|
||||
<i class="fa fa-italic"></i>
|
||||
</button>
|
||||
</li>
|
||||
<li>
|
||||
<button type="button" class="btn btn-link icon bold" style="cursor: pointer;" title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
|
||||
<button type="button" class="btn-link icon bold" style="cursor: pointer;" title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
|
||||
<i class="fa fa-bold"></i>
|
||||
</button>
|
||||
</li>
|
||||
<li>
|
||||
<button type="button" class="btn btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
|
||||
<button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
|
||||
<i class="fa fa-quote-left"></i>
|
||||
</button>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -91,13 +91,13 @@
|
|||
{{* uncomment the button for "wall-immage-upload" because we have integrated it directly in the jot modal
|
||||
<li><a href="#" id="wall-image-upload" title="{{$upload}}"><i class="fa fa-picture-o"></i></a></li>
|
||||
*}}
|
||||
<li><button type="button" class="btn btn-link" id="wall-file-upload" title="{{$attach}}"><i class="fa fa-paperclip"></i></button></li>
|
||||
<li><button type="button" class="btn btn-link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" title="{{$weblink}}"><i class="fa fa-link"></i></button></li>
|
||||
<li><button type="button" class="btn btn-link" id="profile-video" onclick="jotVideoURL();" title="{{$video}}"><i class="fa fa-film"></i></button></li>
|
||||
<li><button type="button" class="btn btn-link" id="profile-audio" onclick="jotAudioURL();" title="{{$audio}}"><i class="fa fa-music"></i></button></li>
|
||||
<li><button type="button" class="btn btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker"></i></button></li>
|
||||
<li><button type="button" class="btn-link" id="wall-file-upload" title="{{$attach}}"><i class="fa fa-paperclip"></i></button></li>
|
||||
<li><button type="button" class="btn-link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" title="{{$weblink}}"><i class="fa fa-link"></i></button></li>
|
||||
<li><button type="button" class="btn-link" id="profile-video" onclick="jotVideoURL();" title="{{$video}}"><i class="fa fa-film"></i></button></li>
|
||||
<li><button type="button" class="btn-link" id="profile-audio" onclick="jotAudioURL();" title="{{$audio}}"><i class="fa fa-music"></i></button></li>
|
||||
<li><button type="button" class="btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker"></i></button></li>
|
||||
<!-- TODO: waiting for a better placement
|
||||
<li><button type="button" class="btn btn-link" id="profile-nolocation" onclick="jotClearLocation();" title="{{$noloc}}">{{$shortnoloc}}</button></li>
|
||||
<li><button type="button" class="btn-link" id="profile-nolocation" onclick="jotClearLocation();" title="{{$noloc}}">{{$shortnoloc}}</button></li>
|
||||
-->
|
||||
|
||||
<li class="pull-right"><button class="btn btn-primary" id="jot-submit" type="submit" id="profile-jot-submit" name="submit" ><i class="fa fa-slideshare fa-fw"></i> {{$share}}</button></li>
|
||||
|
|
|
|||
|
|
@ -83,8 +83,8 @@
|
|||
|
||||
{{* contact info header*}}
|
||||
<div role="heading " class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
|
||||
<h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name btn-link {{$item.sparkle}}">{{$item.name}}</span></a>
|
||||
{{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name{{$item.osparkle}} btn-link" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
|
||||
<h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span></a>
|
||||
{{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
|
||||
{{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event, {{$item.id}});" title="{{$item.lock}}"> <small><i class="fa fa-lock"></i></small></span>{{/if}}
|
||||
|
||||
<div class="additional-info text-muted">
|
||||
|
|
@ -161,7 +161,7 @@
|
|||
<div class="wall-item-actions-left pull-left">
|
||||
<!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
|
||||
<div id="button-reply" class="pull-left">
|
||||
<span class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
|
||||
<button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
|
||||
</div>
|
||||
{{/if}}{{/if}}-->
|
||||
|
||||
|
|
|
|||
|
|
@ -40,11 +40,11 @@ as the value of $top_child_total (this is done at the end of this file)
|
|||
|
||||
{{if $item.thread_level<3}}
|
||||
<div class="hide-comments-outer-wrapper">
|
||||
<div class="hide-comments-outer btn-link" onclick="showHideComments({{$item.id}});">
|
||||
<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
|
||||
<span id="hide-comments-total-{{$item.id}}"
|
||||
class="hide-comments-total">{{$item.num_comments}}</span>
|
||||
<span id="hide-comments-{{$item.id}}"
|
||||
class="hide-comments fakelink">{{$item.hide_text}}</span>
|
||||
class="hide-comments">{{$item.hide_text}}</span>
|
||||
</div>
|
||||
<hr />
|
||||
</div>
|
||||
|
|
@ -184,8 +184,8 @@ as the value of $top_child_total (this is done at the end of this file)
|
|||
{{* contact info header*}}
|
||||
{{if $item.thread_level==1}}
|
||||
<div role="heading " aria-level="{{$item.thread_level}}" class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
|
||||
<h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name btn-link {{$item.sparkle}}">{{$item.name}}</span></a>
|
||||
{{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name{{$item.osparkle}} btn-link" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
|
||||
<h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span></a>
|
||||
{{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
|
||||
{{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event,{{$item.id}});" title="{{$item.lock}}" data-toggle="tooltip"> <small><i class="fa fa-lock"></i></small></span>{{/if}}
|
||||
</h4>
|
||||
|
||||
|
|
@ -220,7 +220,7 @@ as the value of $top_child_total (this is done at the end of this file)
|
|||
<div class="media-body">{{*this is the media body for comments - this div must be closed at the end of the file *}}
|
||||
<div role="heading " aria-level="{{$item.thread_level}}" class="contact-info-comment">
|
||||
<h5 class="media-heading">
|
||||
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="btn-link">{{$item.name}}</span></a>
|
||||
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="fakelink">{{$item.name}}</span></a>
|
||||
<span class="text-muted">
|
||||
<small><span title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span> {{if $item.location}} — ({{$item.location}}){{/if}}</small>
|
||||
</span>
|
||||
|
|
@ -278,7 +278,7 @@ as the value of $top_child_total (this is done at the end of this file)
|
|||
<div class="wall-item-actions-left pull-left">
|
||||
<!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
|
||||
<div id="button-reply" class="pull-left">
|
||||
<span class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
|
||||
<button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
|
||||
</div>
|
||||
{{/if}}{{/if}}-->
|
||||
|
||||
|
|
@ -287,23 +287,32 @@ as the value of $top_child_total (this is done at the end of this file)
|
|||
{{* Buttons for like and dislike *}}
|
||||
{{if $item.vote}}
|
||||
{{if $item.vote.like}}
|
||||
<button type="button" class="btn btn-xs btn-default button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like');" data-toggle="button"><i class="fa fa-thumbs-up"></i> {{$item.vote.like.1}}</button>
|
||||
<button type="button" class="btn-link button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like');" data-toggle="button"><i class="fa fa-thumbs-up"></i> {{$item.vote.like.1}}</button>
|
||||
{{/if}}
|
||||
{{if $item.vote.like AND $item.vote.dislike}}
|
||||
<span role="presentation" class="separator">•</span>
|
||||
{{/if}}
|
||||
{{if $item.vote.dislike}}
|
||||
<button type="button" class="btn btn-xs btn-default button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike');" data-toggle="button"><i class="fa fa-thumbs-down"></i> {{$item.vote.dislike.1}}</button>
|
||||
<button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike');" data-toggle="button"><i class="fa fa-thumbs-down"></i> {{$item.vote.dislike.1}}</button>
|
||||
{{/if}}
|
||||
|
||||
{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
|
||||
<span role="presentation" class="separator">•</span>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{* Button to open the comment text field *}}
|
||||
{{if $item.comment}}
|
||||
<button type="button" class="btn btn-xs btn-default button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting"></i> {{$item.switchcomment}}</button>
|
||||
<button type="button" class="btn-link button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting"></i> {{$item.switchcomment}}</button>
|
||||
{{/if}}
|
||||
|
||||
{{* Button for sharing the item *}}
|
||||
{{if $item.vote}}
|
||||
{{if $item.vote.share}}
|
||||
<button type="button" class="btn btn-xs btn-default button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i> {{$item.vote.share.1}}</a>
|
||||
{{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
|
||||
<span role="presentation" class="separator">•</span>
|
||||
{{/if}}
|
||||
<button type="button" class="btn-link button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i> {{$item.vote.share.1}}</a>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue