Skip to content

Commit

Permalink
PM minimizing: change color of PM header for new messages
Browse files Browse the repository at this point in the history
Also fixed some CSS rules to be consistent with the other rules
  • Loading branch information
Aeriit committed Jan 10, 2014
1 parent 3a7c847 commit c7efee1
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 6 deletions.
4 changes: 2 additions & 2 deletions js/client-mainmenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
}

if ($pmWindow.data('minimized') && name.substr(1) !== app.user.get('name')) {
$pmWindow.find('h3').prepend('<i class="icon-exclamation-sign" style="margin-right: 3px;"></i>');
$pmWindow.find('h3').addClass('pm-notifying');
}
},
openPM: function(name, dontFocus) {
Expand Down Expand Up @@ -251,7 +251,7 @@
$pmWindow.data('minimized', false);
}

$pmWindow.find('i.icon-exclamation-sign').remove();
$pmWindow.find('h3').removeClass('pm-notifying');
},
focusPM: function(name) {
this.openPM(name).prependTo(this.$pmBox).find('textarea[name=message]').focus();
Expand Down
20 changes: 16 additions & 4 deletions style/client.css
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,8 @@ a.subtle:hover {
.tabbar a.cur + .closebutton {
top: 4px;
}
.closebutton, .minimizebutton {
.closebutton,
.minimizebutton {
text-decoration: none;
font-size: 14px;
color: #999999;
Expand All @@ -304,10 +305,12 @@ a.subtle:hover {
background: transparent;
cursor: pointer;
}
.closebutton:hover, .minimizebutton:hover {
.closebutton:hover,
.minimizebutton:hover {
color: #BB2222;
}
.closebutton:active, .minimizebutton:active {
.closebutton:active,
.minimizebutton:active {
color: #661111;
}

Expand Down Expand Up @@ -602,7 +605,16 @@ p.or:after {
.pm-window h3.pm-minimized {
border-radius: 5px;
}
.pm-window h3 .closebutton, .pm-window h3 .minimizebutton {
.pm-window h3.pm-notifying {
border-color: #AA8866;
background: #E3C3A3;
}
.pm-window h3.pm-notifying:hover {
border-color: #604020;
background: #CFAF8F;
}
.pm-window h3 .closebutton,
.pm-window h3 .minimizebutton {
float: right;
padding-right: 1px;
}
Expand Down

0 comments on commit c7efee1

Please sign in to comment.