Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement display of starred conversations #362

Merged
merged 1 commit into from
Oct 25, 2017
Merged

Implement display of starred conversations #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/partials/messenger.navigation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<ul>
<li ng-repeat="conversation in ctrl.conversations() | filter:ctrl.searchConversation"
ng-class="{'unread': conversation.unreadCount > 0,
'starred': conversation.isStarred,
'active': ctrl.isActive(conversation)}"
ui-sref="messenger.home.conversation({ type: conversation.type, id: conversation.id, initParams: null })"
class="conversation" ng-if="ctrl.isVisible(conversation)">
Expand Down
1 change: 1 addition & 0 deletions src/sass/helpers/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
$status-ok: #4caf50;
$status-warning: #ff9800;
$status-error: #f44336;
$status-starred: #ffc107;
$border-grey: #dddddd;
$background-grey: lighten($border-grey, 7%);
$material-grey: rgba(0, 0, 0, 0.54);
Expand Down
42 changes: 31 additions & 11 deletions src/sass/sections/_navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@
}

#navigation-conversations {
$border-width: 4px;
$border-count: 2;
overflow-y: auto;
background-color: white;
flex: 1;
Expand All @@ -81,16 +83,39 @@
display: flex;
flex-direction: row;
align-items: center;
padding: (1.5 * $main-padding) $main-padding;
border-left: 4px solid white;

padding: (1.5 * $main-padding) $main-padding - ($border-width * ($border-count - 1));
border-left: $border-width * $border-count solid white;
border-bottom: 1px solid $border-grey;

&.active, &:hover {
background-color: $dark-background-color;
border-color: $dark-background-color;
}
&:hover:not(.active) {
@include mouse-hand;
}

// Only unread
&.unread {
border-left-color: $status-error;
border-image: linear-gradient(to right, $status-error, $status-error 50%, white 50%, white 100%) 1 100%;
&.active {
border-image: linear-gradient(to right, $status-error, $status-error 50%, $dark-background-color 50%, $dark-background-color 100%) 1 100%;
}
}

// Only starred
&.starred {
border-image: linear-gradient(to right, $status-starred, $status-starred 50%, white 50%, white 100%) 1 100%;
&.active {
border-image: linear-gradient(to right, $status-starred, $status-starred 50%, $dark-background-color 50%, $dark-background-color 100%) 1 100%;
}
}
&.active {
background-color: #f5f5f5;

// Both starred and unread
&.starred.unread {
border-image: linear-gradient(to right, $status-error, $status-error 50%, $status-starred 50%, $status-starred 100%) 1 100%;
}

.avatar-box {
margin-right: 8px;
position: relative;
Expand Down Expand Up @@ -232,11 +257,6 @@
margin-left: 4px;
}
}

.conversation:hover:not(.active) {
@include mouse-hand;
background-color: #f5f5f5;
}
}

#navigation-contacts {
Expand Down
1 change: 1 addition & 0 deletions src/threema.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ declare namespace threema {
receiver?: Receiver;
avatar?: ArrayBuffer;
isMuted?: boolean;
isStarred?: boolean;
}

/**
Expand Down