Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2024-11-27 14:30:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #212 from thelounge/astorije/improve-context-menu-design

Browse source 
Minor enhancements of the context menu UI
This commit is contained in:
Pavel Djundik 2016-03-20 23:47:20 +02:00
commit 7736d19ceb
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
client/css/style.css
View file

@ -1216,19 +1216,24 @@ button,
min-width: 160px; min-width: 160px;
font-size: 14px; font-size: 14px;
background-color: #fff; background-color: #fff;
box-shadow: 0 1px 2px rgba(0, 0, 0, .1); box-shadow: 0 3px 12px rgba(0, 0, 0, .15);
border: 1px solid rgba(61, 70, 77, .1); border: 1px solid rgba(0, 0, 0, .15);
border-radius: 2px;
} }
.context-menu-item:first-child { .context-menu-divider {
border-bottom: 1px solid rgba(61, 70, 77, .1); height: 1px;
margin: 6px 0;
background-color: rgba(0, 0, 0, .1);
} }
.context-menu-item { .context-menu-item {
cursor: pointer; cursor: pointer;
display: block; display: block;
padding: 6px 8px; padding: 4px 8px;
color: #333; color: #333;
margin-top: 6px;
margin-bottom: 6px;
} }
.context-menu-item:hover { .context-menu-item:hover {
@ -1239,6 +1244,8 @@ button,
font-family: FontAwesome; font-family: FontAwesome;
width: 20px; width: 20px;
display: inline-block; display: inline-block;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
} }
.context-menu-user:before { .context-menu-user:before {
@ -1250,7 +1257,7 @@ button,
} }
.context-menu-close:before { .context-menu-close:before {
content: "\f057"; content: "\f00d";
} }
/** /**

1
client/js/lounge.js
View file

@ -533,6 +533,7 @@ $(function() {
text: target.data("title"), text: target.data("title"),
data: target.data("target") data: target.data("target")
}); });
output += render("contextmenu_divider");
output += render("contextmenu_item", { output += render("contextmenu_item", {
class: "close", class: "close",
text: target.hasClass("lobby") ? "Disconnect" : target.hasClass("query") ? "Close" : "Leave", text: target.hasClass("lobby") ? "Disconnect" : target.hasClass("query") ? "Close" : "Leave",

1
client/views/contextmenu_divider.tpl Normal file
View file

@ -0,0 +1 @@
<li class="context-menu-divider" />