diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index f50365b2b..74224d82e 100644 --- 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 095b38968..591871073 100644 --- 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}} - + + {{/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}} {{/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}} - + diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 08057a1a9..f2429a78b 100644 --- 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)