Various fixes

- Removed superfluous CSS rule
- Fixed whitespace
- Restored separators in search_item.tpl

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index f50365b2b01969ff3485dce29f2aeefa3941c422..74224d82e3786b01b4314e119909e85252b77a79 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -658,6 +658,8 @@ nav.navbar a, nav.navbar .btn-link {
 }
 #topbar-first .dropdown.account > a,
 #topbar-first .dropdown.account.open > a,
+#topbar-first .dropdown.account > button,
+#topbar-first .dropdown.account.open > button,
 #topbar-first .dropdown.account > :hover,
 #topbar-first .dropdown.account.open > :hover {
     background-color: $nav_bg;
@@ -846,16 +848,6 @@ nav.navbar a, nav.navbar .btn-link {
 .nav-pills > li > .btn-link {
     border-radius: 4px;
 }
-.dropdown-menu > li > :focus,
-.dropdown-menu > li > :hover {
-    background-color: #e8e8e8;
-    background-image: -webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);
-    background-image: -o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);
-    background-image: -webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));
-    background-image: linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-    background-repeat: repeat-x;
-}
 .nav-pills .dropdown-menu,
 .nav-tabs .dropdown-menu,
 .account .dropdown-menu,

diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index 095b38968bffa455ab2c101bb4d26df1e3cd4bfe..59187107381fec34e5206a6eac5fb4f612d1430a 100644 (file)
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -169,26 +169,35 @@
                                        {{* Buttons for like and dislike *}}
                                        {{if $item.vote}}
                                                {{if $item.vote.like}}
-                                               <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doLikeAction({{$item.id}}, 'like');">{{$item.vote.like.0}}</button>
+                                       <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doLikeAction({{$item.id}}, 'like');">{{$item.vote.like.0}}</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-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}}, 'dislike');">{{$item.vote.dislike.0}}</button>
+                                       <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}}, 'dislike');">{{$item.vote.dislike.0}}</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-default" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button>
+                                               <button type="button" class="btn btn-default" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button>
                                        {{/if}}
 
                                        {{* Button for sharing the item *}}
                                        {{if $item.vote}}
                                                {{if $item.vote.share}}
-                                               <button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</button>
+                                               {{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
+                                       <span role="presentation" class="separator">•</span>
+                                               {{/if}}
+                                       <button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</button>
                                                {{/if}}
                                        {{/if}}
-                    <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+                                       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
                                </div>
 
 

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 08057a1a95daabc6d67fd51cc25a0fdaca66fc67..f2429a78b73f4abd90795fad9f39059f4599b470 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -314,7 +314,7 @@ as the value of $top_child_total (this is done at the end of this file)
                                        <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>&nbsp;{{$item.vote.share.1}}</a>
                                        {{/if}}
                                {{/if}}
-                <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+                               <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
                        </div>
 
                        <div class="wall-item-actions-right pull-right">