From f6ec501505d8531226cfd9a71cf66b5b19bc88c2 Mon Sep 17 00:00:00 2001
From: Allen Rabinovich <allenr@zulip.com>
Date: Tue, 27 Aug 2013 12:05:32 -0700
Subject: [PATCH] Modify lock icon styles to display it in the stream list
 swatch or to the right of the stream name in the list

(imported from commit b70ed2520b38229ccaed62ed84786cb9152e50a9)
---
 static/js/stream_list.js                       |  4 +++-
 static/styles/zulip.css                        | 16 ++++++++++++++--
 static/templates/stream_sidebar_row.handlebars |  2 +-
 static/templates/subscription.handlebars       |  2 +-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/static/js/stream_list.js b/static/js/stream_list.js
index 79210edc39..963479188d 100644
--- a/static/js/stream_list.js
+++ b/static/js/stream_list.js
@@ -96,7 +96,9 @@ function add_narrow_filter(name, type) {
                 uri: narrow.by_stream_uri(name),
                 not_in_home_view: (stream_data.in_home_view(name) === false),
                 invite_only: stream_data.get_sub(name).invite_only,
-                color: stream_data.get_color(name)};
+                color: stream_data.get_color(name)
+               };
+    args.dark_background = stream_color.get_color_class(args.color);
     var list_item = $(templates.render('stream_sidebar_row', args));
     $("#" + type + "_filters").append(list_item);
     return list_item;
diff --git a/static/styles/zulip.css b/static/styles/zulip.css
index 45b6212f10..2e1b4e8938 100644
--- a/static/styles/zulip.css
+++ b/static/styles/zulip.css
@@ -1843,9 +1843,21 @@ table.floating_recipient {
     display: inline-block;
     vertical-align: middle;
     margin-top: 0px;
-    margin-left: 3px;
     position: absolute;
-    top: 2px;
+    top: 4px;
+    left: 4px;
+    font-size: 12px;
+}
+
+.subscription_header .subscription_name {
+    display: inline-block;
+    width: auto;
+}
+
+.subscription_header .subscription_lock {
+    font-size: 12px;
+    display: inline-block;
+    vertical-align: top;
 }
 
 .subscription_settings {
diff --git a/static/templates/stream_sidebar_row.handlebars b/static/templates/stream_sidebar_row.handlebars
index 70b049a841..3ae6ff758f 100644
--- a/static/templates/stream_sidebar_row.handlebars
+++ b/static/templates/stream_sidebar_row.handlebars
@@ -18,7 +18,7 @@
       <div class="count"><div class="value"></div></div>
 
       {{#if invite_only}}
-      <i class="icon-vector-lock"></i>
+      <i class="icon-vector-lock {{dark_background}}"></i>
       {{/if}}
     </div>
     <span class="arrow"><i class="icon-vector-chevron-down"></i></span>
diff --git a/static/templates/subscription.handlebars b/static/templates/subscription.handlebars
index 9cb8f39d8d..edd65ef46b 100644
--- a/static/templates/subscription.handlebars
+++ b/static/templates/subscription.handlebars
@@ -6,7 +6,7 @@
       <span class="color_swatch fade {{#subscribed}}in{{/subscribed}}" style="background-color: {{color}}"></span>
       <span class="subscription_block">
       <span class="subscription_name">{{name}}</span>
-      {{#if invite_only}}<i class="icon-vector-lock"></i>{{/if}}
+      {{#if invite_only}}<span class="subscription_lock">&nbsp;&nbsp;<i class="icon-vector-lock"></i></span>{{/if}}
       </span>
       <span class="sub_arrow"><i class="icon-vector-chevron-down"></i></span>
       <button class="btn sub_unsub_button {{^subscribed}}btn-primary{{/subscribed}}"