Skip to content

Commit

Permalink
feat: add group size info (#3411)
Browse files Browse the repository at this point in the history
  • Loading branch information
AndyLnd committed May 22, 2018
1 parent cb4d2d4 commit 93a07f0
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 0 deletions.
1 change: 1 addition & 0 deletions app/page/template/modal/group-creation.htm
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
data-uie-name="enter-group-name">
<div class="group-creation-error" data-bind="text: nameError, visible: nameError().length" data-uie-name="error-group-name"></div>
<!-- ko if: isTeam -->
<div class="group-size-info" data-bind="l10n_text: z.string.groupSizeInfo"></div>
<guest-mode-toggle params="isChecked: isGuestRoom, onToggle: clickOnToggleGuestMode, extendedInfo: true"></guest-mode-toggle>
<!-- /ko -->
<!-- /ko -->
Expand Down
3 changes: 3 additions & 0 deletions app/page/template/panel/conversation-details.htm
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
</span>
<!-- /ko -->
</div>
<!-- ko if: isTeam() -->
<div class="conversation-details__group-size-info" data-bind="l10n_text: z.string.groupSizeInfo"></div>
<!-- /ko -->
<!-- /ko -->
<!-- ko if: isSingleUserMode() && userName() -->
<div class="conversation-details__user-name" data-bind="text: userName()" data-uie-name="status-username"></div>
Expand Down
1 change: 1 addition & 0 deletions app/script/localization/webapp.js
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ z.string.groupCreationParticipantsActionSkip = 'Skip';
z.string.groupCreationParticipantsHeader = 'Add people';
z.string.groupCreationParticipantsHeaderWithCounter = 'Add people ({{number}})';
z.string.groupCreationParticipantsPlaceholder = 'Search by name';
z.string.groupSizeInfo = 'Up to 128 people can join a group conversation. Video calls work in groups of 4 or less.';

// Guest room
z.string.guestRoomConversationName = 'Guest room';
Expand Down
7 changes: 7 additions & 0 deletions app/style/modal/group-creation.less
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@
margin: 8px;
}

.group-size-info {
margin: 16px 16px 0;
color: @graphite;
font-size: @font-size-xs;
line-height: @line-height-sm;
}

.group-creation-list-wrapper {
position: absolute;
right: -16px;
Expand Down
6 changes: 6 additions & 0 deletions app/style/panel/conversation-details.less
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,10 @@
font-weight: @font-weight-bold;
text-transform: uppercase;
}
&__group-size-info {
margin: 8px 0 0;
color: @graphite;
font-size: @font-size-xs;
line-height: @line-height-sm;
}
}

0 comments on commit 93a07f0

Please sign in to comment.