Merge pull request #9665 from RocketChat/room-info-contextualbar

[FIX] Wrong behavior of rooms info's *Read Only* and *Collaborative* buttons
RocketChat · Feb 21, 2018 · 8f89222 · 8f89222
2 parents 34340ca + b955a87
commit 8f89222
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.html b/packages/rocketchat-channel-settings/client/views/channelSettings.html
@@ -85,18 +85,18 @@
 							{{_ "Just_invited_people_can_access_this_channel"}}
 						</div>
 					</div>
-				
+
 				</div>
 			</div>
 		{{/with}}
 
 		{{#with settings.ro}}
 			<div class="rc-user-info__row rc-user-info__row--separator">
 				<div class="rc-switch-double">
-					<div class="rc-switch-double__label {{equal true value 'disabled'}}">
-						{{_ "Read_only"}}{{equal default value '*'}}
+					<div class="rc-switch-double__label  {{equal true value 'disabled'}}">
+						{{_ "Colaborative"}}{{equal default value '*'}}
 						<div class="rc-switch-double__description">
-							{{_ "Only_authorized_users_can_write_new_messages"}}
+							{{_ "All_users_in_the_channel_can_write_new_messages"}}
 						</div>
 					</div>
 					<div class="rc-switch rc-switch--blue">
@@ -107,10 +107,10 @@
 							</span>
 						</label>
 					</div>
-					<div class="rc-switch-double__label  {{equal false value 'disabled'}}">
-						{{_ "Colaborative"}}
+					<div class="rc-switch-double__label {{equal false value 'disabled'}}">
+						{{_ "Read_only"}}
 						<div class="rc-switch-double__description">
-							{{_ "All_users_in_the_channel_can_write_new_messages"}}
+							{{_ "Only_authorized_users_can_write_new_messages"}}
 						</div>
 					</div>
 				</div>

diff --git a/packages/rocketchat-theme/client/imports/components/userInfo.css b/packages/rocketchat-theme/client/imports/components/userInfo.css
@@ -143,6 +143,10 @@
 			}
 		}
 
+		& .rc-switch-double__label {
+			color: #a1a1a1;
+		}
+
 		&--separator {
 
 			margin: 14px 0;
@@ -311,7 +315,7 @@
 		}
 
 		&.disabled {
-			color: #a1a1a1;
+			color: inherit;
 		}
 	}