mirror of
https://github.com/friendica/friendica
synced 2024-11-18 15:03:41 +00:00
Turn action links into buttons
- Turns <a role="button"> into <button type="button"> for responses and dropdown menu in wall_thread.tpl - Removes extraneous decorations - Updates dropdown style to prevent hover shenanigans - Add theme color to active "btn-default" buttons - Add margin top to comment box that was stuck to the action buttons
This commit is contained in:
Hypolite Petovan
parent
4d591c4a07
commit
71f00eaf5f
2 changed files with 51 additions and 55 deletions
|
|
@ -185,6 +185,12 @@ a#item-delete-selected {
|
||||||
outline: 0;
|
outline: 0;
|
||||||
background: $btn_primary_hover_color !important;
|
background: $btn_primary_hover_color !important;
|
||||||
}
|
}
|
||||||
|
.btn-default:active, .btn-default.active {
|
||||||
|
color: $link_color;
|
||||||
|
}
|
||||||
|
.btn-default:active:hover, .btn-default.active:hover {
|
||||||
|
color: $link_hover_color;
|
||||||
|
}
|
||||||
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
|
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
|
||||||
.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
|
.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
|
||||||
.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
|
.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
|
||||||
|
|
@ -835,41 +841,41 @@ nav.navbar a {
|
||||||
.contact-photo-wrapper .dropdown-menu li {
|
.contact-photo-wrapper .dropdown-menu li {
|
||||||
border-left: 3px solid $nav_bg;
|
border-left: 3px solid $nav_bg;
|
||||||
}
|
}
|
||||||
.nav-pills .dropdown-menu li a,
|
.nav-pills .dropdown-menu li a, .nav-pills .dropdown-menu li .btn-link,
|
||||||
.nav-tabs .dropdown-menu li a,
|
.nav-tabs .dropdown-menu li a, .nav-tabs .dropdown-menu li .btn-link,
|
||||||
.account .dropdown-menu li a,
|
.account .dropdown-menu li a, .account .dropdown-menu li .btn-link,
|
||||||
.contact-photo-wrapper .dropdown-menu li a {
|
.contact-photo-wrapper .dropdown-menu li a, .contact-photo-wrapper .dropdown-menu li .btn-link {
|
||||||
color: $nav_icon_color;
|
color: $nav_icon_color;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
padding: 4px 15px;
|
padding: 4px 15px;
|
||||||
text-transform: capitalize;
|
text-transform: capitalize;
|
||||||
}
|
}
|
||||||
.nav-pills .dropdown-menu li a i,
|
.nav-pills .dropdown-menu li a i, .nav-pills .dropdown-menu li .btn-link i,
|
||||||
.nav-tabs .dropdown-menu li a i,
|
.nav-tabs .dropdown-menu li a i, .nav-tabs .dropdown-menu li .btn-link i,
|
||||||
.account .dropdown-menu li a i,
|
.account .dropdown-menu li a i, .account .dropdown-menu li .btn-link i,
|
||||||
.contact-photo-wrapper .dropdown-menu li a i {
|
.contact-photo-wrapper .dropdown-menu li a i, .contact-photo-wrapper .dropdown-menu li .btn-link i {
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 14px
|
width: 14px
|
||||||
}
|
}
|
||||||
.nav-pills .dropdown-menu li a:hover,
|
.nav-pills .dropdown-menu li a:hover, .nav-pills .dropdown-menu li .btn-link:hover,
|
||||||
.nav-tabs .dropdown-menu li a:hover,
|
.nav-tabs .dropdown-menu li a:hover, .nav-tabs .dropdown-menu li .btn-link:hover,
|
||||||
.account .dropdown-menu li a:hover,
|
.account .dropdown-menu li a:hover, .account .dropdown-menu li .btn-link:hover,
|
||||||
.contact-photo-wrapper .dropdown-menu li a:hover,
|
.contact-photo-wrapper .dropdown-menu li a:hover, .contact-photo-wrapper .dropdown-menu li .btn-link:hover,
|
||||||
.nav-pills .dropdown-menu li a:visited,
|
.nav-pills .dropdown-menu li a:visited, .nav-pills .dropdown-menu li .btn-link:visited,
|
||||||
.nav-tabs .dropdown-menu li a:visited,
|
.nav-tabs .dropdown-menu li a:visited, .nav-tabs .dropdown-menu li .btn-link:visited,
|
||||||
.account .dropdown-menu li a:visited,
|
.account .dropdown-menu li a:visited, .account .dropdown-menu li .btn-link:visited,
|
||||||
.contact-photo-wrapper .dropdown-menu li a:visited,
|
.contact-photo-wrapper .dropdown-menu li a:visited, .contact-photo-wrapper .dropdown-menu li .btn-link:visited,
|
||||||
.nav-pills .dropdown-menu li a:hover,
|
.nav-pills .dropdown-menu li a:hover, .nav-pills .dropdown-menu li .btn-link:hover,
|
||||||
.nav-tabs .dropdown-menu li a:hover,
|
.nav-tabs .dropdown-menu li a:hover, .nav-tabs .dropdown-menu li .btn-link:hover,
|
||||||
.account .dropdown-menu li a:hover,
|
.account .dropdown-menu li a:hover, .account .dropdown-menu li .btn-link:hover,
|
||||||
.contact-photo-wrapper .dropdown-menu li a:hover,
|
.contact-photo-wrapper .dropdown-menu li a:hover, .contact-photo-wrapper .dropdown-menu li .btn-link:hover,
|
||||||
.nav-pills .dropdown-menu li a:focus,
|
.nav-pills .dropdown-menu li a:focus, .nav-pills .dropdown-menu li .btn-link:focus,
|
||||||
.nav-tabs .dropdown-menu li a:focus,
|
.nav-tabs .dropdown-menu li a:focus, .nav-tabs .dropdown-menu li .btn-link:focus,
|
||||||
.account .dropdown-menu li a:focus,
|
.account .dropdown-menu li a:focus, .account .dropdown-menu li .btn-link:focus,
|
||||||
.contact-photo-wrapper .dropdown-menu li a:focus {
|
.contact-photo-wrapper .dropdown-menu li a:focus, .contact-photo-wrapper .dropdown-menu li .btn-link:focus {
|
||||||
background: 0 0
|
background: 0 0
|
||||||
}
|
}
|
||||||
.nav-pills .dropdown-menu li:hover,
|
.nav-pills .dropdown-menu li:hover,
|
||||||
|
|
@ -1314,7 +1320,7 @@ section #jotOpen {
|
||||||
}
|
}
|
||||||
|
|
||||||
.toplevel_item:hover .fakelink, .wall-item-container:hover .fakelink,
|
.toplevel_item:hover .fakelink, .wall-item-container:hover .fakelink,
|
||||||
.toplevel_item:hover .wall-item-container:hover .btn-link,
|
.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-container:hover .wall-item-responses a,
|
||||||
.toplevel_item:hover .wall-item-content a,
|
.toplevel_item:hover .wall-item-content a,
|
||||||
.toplevel_item:hover .wall-item-name,
|
.toplevel_item:hover .wall-item-name,
|
||||||
|
|
@ -1563,8 +1569,6 @@ code > .hl-main {
|
||||||
.wall-item-actions .button-comments,
|
.wall-item-actions .button-comments,
|
||||||
.wall-item-actions .button-votes,
|
.wall-item-actions .button-votes,
|
||||||
.wall-item-actions .button-likes {
|
.wall-item-actions .button-likes {
|
||||||
padding-left: 0px;
|
|
||||||
padding-right: 0px;
|
|
||||||
text-transform: capitalize;
|
text-transform: capitalize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1638,6 +1642,9 @@ code > .hl-main {
|
||||||
/*
|
/*
|
||||||
* Comment Box
|
* Comment Box
|
||||||
*/
|
*/
|
||||||
|
.wall-item-comment-wrapper {
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
.thread_level_2 .wall-item-comment-wrapper {
|
.thread_level_2 .wall-item-comment-wrapper {
|
||||||
padding-right: 5px;
|
padding-right: 5px;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ as the value of $top_child_total (this is done at the end of this file)
|
||||||
|
|
||||||
{{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer}}
|
{{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer}}
|
||||||
<li class="dropdown">
|
<li class="dropdown">
|
||||||
<a class="dropdown-toggle" data-toggle="dropdown" id="dropdownMenuTools-{{$item.id}}" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></a>
|
<button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuTools-{{$item.id}}" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></button>
|
||||||
|
|
||||||
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
|
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
|
||||||
{{if $item.plink}} {{*link to the original source of the item *}}
|
{{if $item.plink}} {{*link to the original source of the item *}}
|
||||||
|
|
@ -91,26 +91,26 @@ as the value of $top_child_total (this is done at the end of this file)
|
||||||
|
|
||||||
{{if $item.edpost}} {{* edit the posting *}}
|
{{if $item.edpost}} {{* edit the posting *}}
|
||||||
<li role="menuitem">
|
<li role="menuitem">
|
||||||
<a onclick="editpost('{{$item.edpost.0}}?mode=none'); return false;" title="{{$item.edpost.1}}" class="navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</a>
|
<button type="button" onclick="editpost('{{$item.edpost.0}}?mode=none'); return false;" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</button>
|
||||||
</li>
|
</li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{if $item.tagger}} {{* tag the post *}}
|
{{if $item.tagger}} {{* tag the post *}}
|
||||||
<li role="menuitem">
|
<li role="menuitem">
|
||||||
<a id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</a>
|
<button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</button>
|
||||||
</li>
|
</li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{if $item.filer}}
|
{{if $item.filer}}
|
||||||
<li role="menuitem">
|
<li role="menuitem">
|
||||||
<a id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i> {{$item.filer}}</a>
|
<button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i> {{$item.filer}}</button>
|
||||||
</li>
|
</li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{if $item.star}}
|
{{if $item.star}}
|
||||||
<li role="menuitem">
|
<li role="menuitem">
|
||||||
<a id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i> {{$item.star.do}}</a>
|
<button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i> {{$item.star.do}}</button>
|
||||||
<a id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i> {{$item.star.undo}}</a>
|
<button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i> {{$item.star.undo}}</button>
|
||||||
</li>
|
</li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
|
|
@ -120,16 +120,16 @@ as the value of $top_child_total (this is done at the end of this file)
|
||||||
|
|
||||||
{{if $item.ignore}}
|
{{if $item.ignore}}
|
||||||
<li role="menuitem">
|
<li role="menuitem">
|
||||||
<a id="ignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;" class="{{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash"></i> {{$item.ignore.do}}</a>
|
<button type="button" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash"></i> {{$item.ignore.do}}</button>
|
||||||
</li>
|
</li>
|
||||||
<li role="menuitem">
|
<li role="menuitem">
|
||||||
<a id="unignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;" class="{{$item.ignore.classundo}}" title="{{$item.ignore.undo}}"><i class="fa fa-eye"></i> {{$item.ignore.undo}}</a>
|
<button type="button" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;" class="btn-link {{$item.ignore.classundo}}" title="{{$item.ignore.undo}}"><i class="fa fa-eye"></i> {{$item.ignore.undo}}</button>
|
||||||
</li>
|
</li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{if $item.drop.dropping}}
|
{{if $item.drop.dropping}}
|
||||||
<li role="menuitem">
|
<li role="menuitem">
|
||||||
<a class="navicon delete" onclick="dropItem('item/drop/{{$item.id}}', '#item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</a>
|
<button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', '#item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
|
||||||
</li>
|
</li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
@ -287,34 +287,23 @@ as the value of $top_child_total (this is done at the end of this file)
|
||||||
{{* Buttons for like and dislike *}}
|
{{* Buttons for like and dislike *}}
|
||||||
{{if $item.vote}}
|
{{if $item.vote}}
|
||||||
{{if $item.vote.like}}
|
{{if $item.vote.like}}
|
||||||
<a role="button" class="button-likes{{if $item.responses.like.self}} active{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;"><i class="fa fa-thumbs-up"></i> {{$item.vote.like.1}}</a>
|
<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'); return false;" data-toggle="button"><i class="fa fa-thumbs-up"></i> {{$item.vote.like.1}}</button>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{if $item.vote.like AND $item.vote.dislike}}
|
|
||||||
<span role="presentation" class="separator"> • </span>
|
|
||||||
{{/if}}
|
|
||||||
|
|
||||||
{{if $item.vote.dislike}}
|
{{if $item.vote.dislike}}
|
||||||
<a role="button" class="button-likes{{if $item.responses.dislike.self}} active{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;"><i class="fa fa-thumbs-down"></i> {{$item.vote.dislike.1}}</a>
|
<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'); return false;" data-toggle="button"><i class="fa fa-thumbs-down"></i> {{$item.vote.dislike.1}}</button>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
|
|
||||||
<span role="presentation" class="separator"> • </span>
|
|
||||||
{{/if}}
|
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{* Butten to open the comment text field *}}
|
{{* Button to open the comment text field *}}
|
||||||
{{if $item.comment}}
|
{{if $item.comment}}
|
||||||
<a role="button" class="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}}</a>
|
<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>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{* Button for sharing the item *}}
|
{{* Button for sharing the item *}}
|
||||||
{{if $item.vote}}
|
{{if $item.vote}}
|
||||||
{{if ($item.vote.like OR $item.vote.dislike OR $item.comment) AND $item.vote.share}}
|
|
||||||
<span role="presentation" class="separator"> • </span>
|
|
||||||
{{/if}}
|
|
||||||
{{if $item.vote.share}}
|
{{if $item.vote.share}}
|
||||||
<a role="button" class="button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i> {{$item.vote.share.1}}</a>
|
<button type="button" class="btn btn-xs btn-default button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i> {{$item.vote.share.1}}</a>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -323,9 +312,9 @@ as the value of $top_child_total (this is done at the end of this file)
|
||||||
{{* Event attendance buttons *}}
|
{{* Event attendance buttons *}}
|
||||||
{{if $item.isevent}}
|
{{if $item.isevent}}
|
||||||
<div class="vote-event">
|
<div class="vote-event">
|
||||||
<a role="button" class="button-event{{if $item.responses.attendyes.self}} active{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></a>
|
<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></button>
|
||||||
<a role="button" class="button-event{{if $item.responses.attendno.self}} active{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></a>
|
<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></button>
|
||||||
<a role="button" class="button-event{{if $item.responses.attendmaybe.self}} active{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></a>
|
<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></button>
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue