thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Differentiate active vs selected conversation states

Browse source 
// FREEBIE
This commit is contained in:
lilia 2016-04-01 11:04:20 -07:00
parent c3a7766dd4
commit 1aa975e199
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js/views/inbox_view.js
View file

@ -119,12 +119,12 @@
return; return;
} }
this.$('#header').addClass('inactive'); this.$('#header, .gutter').addClass('inactive');
this.$('.conversation-stack').removeClass('inactive'); this.$('.conversation-stack').removeClass('inactive');
}, },
focusHeader: function() { focusHeader: function() {
this.$('.conversation-stack').addClass('inactive'); this.$('.conversation-stack').addClass('inactive');
this.$('#header').removeClass('inactive'); this.$('#header, .gutter').removeClass('inactive');
this.$('.conversation:first .menu').trigger('close'); this.$('.conversation:first .menu').trigger('close');
}, },
reloadBackgroundPage: function() { reloadBackgroundPage: function() {

6
stylesheets/_global.scss
View file

@ -291,6 +291,10 @@ $avatar-size: 44px;
border: solid 1px rgba(255,255,255,0.6); border: solid 1px rgba(255,255,255,0.6);
} }
} }
.inactive .contact.selected {
padding-left: 7px;
border-left: 5px solid $blue;
}
.contact { .contact {
position: relative; position: relative;
padding: 12px; padding: 12px;
@ -301,8 +305,6 @@ $avatar-size: 44px;
&.selected { &.selected {
background: rgb(236, 243, 252); background: rgb(236, 243, 252);
padding-left: 7px;
border-left: 5px solid $blue;
} }
&:first-child { &:first-child {

8
stylesheets/manifest.css
View file

@ -243,6 +243,10 @@ img.emoji {
color: white; color: white;
border: solid 1px rgba(255, 255, 255, 0.6); } border: solid 1px rgba(255, 255, 255, 0.6); }
.inactive .contact.selected {
padding-left: 7px;
border-left: 5px solid #2090ea; }
.contact { .contact {
position: relative; position: relative;
padding: 12px; padding: 12px;
@ -251,9 +255,7 @@ img.emoji {
background: rgba(255, 255, 255, 0.6); background: rgba(255, 255, 255, 0.6);
margin: 1px; } margin: 1px; }
.contact.selected { .contact.selected {
background: #ecf3fc; background: #ecf3fc; }
padding-left: 7px;
border-left: 5px solid #2090ea; }
.contact:first-child { .contact:first-child {
margin-top: 0; } margin-top: 0; }
.contact:last-child::after { .contact:last-child::after {