paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 01:16:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix display of invite-only streams in new design.

Browse Source 
(imported from commit 9960acc7a5c9415c137a36b2e0ac8296346e922b)
This commit is contained in:
Tim Abbott
2013-06-13 11:41:45 -04:00
parent 9e8b997508
commit deb89a9c9e
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zephyr/static/styles/zephyr.css
View File

@@ -1174,7 +1174,7 @@ table.floating_recipient {
vertical-align: middle; vertical-align: middle;
} }
.subscription_name { #subscriptions_table .subscription_block {
padding-left: 0.5em; padding-left: 0.5em;
vertical-align: middle; vertical-align: middle;
display: inline-block; display: inline-block;
@@ -1182,8 +1182,8 @@ table.floating_recipient {
height: 16px; height: 16px;
} }
#stream_filters .subscription_name { #stream_filters .subscription_block {
padding: 0px; padding-bottom: 4px;
display: inline-block; display: inline-block;
line-height: 12px; line-height: 12px;
width: 100%; width: 100%;
@@ -1193,6 +1193,15 @@ table.floating_recipient {
text-overflow: ellipsis; text-overflow: ellipsis;
} }
#stream_filters .subscription_block .icon-lock {
display: inline-block;
vertical-align: middle;
margin-top: 0px;
margin-left: 3px;
position: absolute;
top: 2px;
}
.subscription_settings { .subscription_settings {
margin-left: 35px; margin-left: 35px;
margin-right: 35px; margin-right: 35px;

10
zephyr/static/templates/stream_sidebar_row.handlebars
View File

@@ -10,12 +10,14 @@
<span id="stream_sidebar_swatch_{{id}}" class="streamlist_swatch" <span id="stream_sidebar_swatch_{{id}}" class="streamlist_swatch"
style="background-color: {{color}}">&nbsp;</span> style="background-color: {{color}}">&nbsp;</span>
<a href="{{uri}}" class="subscription_name">{{name}}<span class="count">(<span class="value"></span>)</span></a> <span class="subscription_block">
<a href="{{uri}}" class="subscription_name">{{name}}
<span class="arrow"><i class="icon-vector-chevron-down"></i></span> <span class="count">(<span class="value"></span>)</span>
</a>
{{#if invite_only}} {{#if invite_only}}
<i class="icon-lock"></i> <i class="icon-lock"></i>
{{/if}} {{/if}}
</span>
<span class="arrow"><i class="icon-vector-chevron-down"></i></span>
</li> </li>

2
zephyr/static/templates/subscription.handlebars
View File

@@ -5,8 +5,10 @@
<td> <td>
<div class="subscription_table_elem subscription_header" data-toggle="collapse" data-target="#subscription_settings_{{id}}"> <div class="subscription_table_elem subscription_header" data-toggle="collapse" data-target="#subscription_settings_{{id}}">
<span class="color_swatch fade {{#subscribed}}in{{/subscribed}}" style="background-color: {{color}}"></span> <span class="color_swatch fade {{#subscribed}}in{{/subscribed}}" style="background-color: {{color}}"></span>
<span class="subscription_block">
<span class="subscription_name">{{name}}</span> <span class="subscription_name">{{name}}</span>
{{#if invite_only}}<i class="icon-lock"></i>{{/if}} {{#if invite_only}}<i class="icon-lock"></i>{{/if}}
</span>
<button class="btn sub_unsub_button {{^subscribed}}btn-primary{{/subscribed}}" <button class="btn sub_unsub_button {{^subscribed}}btn-primary{{/subscribed}}"
type="button" name="subscription"> type="button" name="subscription">
{{#subscribed}} {{#subscribed}}