fix some selectors

packages/rocketchat-channel-settings/client/stylesheets/channel-settings.less

@@ -3,18 +3,14 @@
 		ul {
 			li {
 				margin-bottom: 20px;
-
-				> div {
-					position: relative;
-					font-size: 0;
-
-					label {
-						font-weight: 300;
-					}
-				}
 			}
 		}
 
+		.setting-block {
+			position: relative;
+			font-size: 0;
+		}
+
 		label {
 			display: block;
 			font-weight: bold;
@@ -49,7 +45,6 @@
 			bottom: 0;
 			right: 10px;
 			border-radius: 0 4px 4px 0;
-			background: black;
 
 			.button {
 				padding: 8px;

packages/rocketchat-channel-settings/client/views/channelSettings.html

@@ -17,7 +17,7 @@
 											{{#if $eq $value.type 'text'}}
 												{{#if editing $key}}
 													{{#if $value.canEdit room}}
-														<input type="text" name="{{$key}}" value="{{value}}" class="editing" />
+														<input type="text" name="{{$key}}" value="{{value}}" class="content-background-color editing" />
 													{{/if}}
 												{{else}}
 													<span class='current-setting' data-edit="{{#if $value.canEdit room}}{{$key}}{{else}}false{{/if}}">{{value}}</span>
@@ -27,7 +27,7 @@
 											{{#if $eq $value.type 'markdown'}}
 												{{#if editing $key}}
 													{{#if $value.canEdit room}}
-														<input type="text" name="{{$key}}" value="{{unscape value}}" class="editing" />
+														<input type="text" name="{{$key}}" value="{{unscape value}}" class="content-background-color editing" />
 													{{/if}}
 												{{else}}
 													<span class='current-setting' data-edit="{{#if $value.canEdit room}}{{$key}}{{else}}false{{/if}}">{{{RocketChatMarkdown value}}}</span>

packages/rocketchat-emoji-custom/admin/emojiEdit.html

@@ -11,11 +11,11 @@
 				{{/if}}
 				<div class="input-line">
 					<label for="name">{{_ "Name"}}</label>
-					<input type="text" id="name" autocomplete="off" value="{{emoji.name}}">
+					<input type="text" id="name" autocomplete="off" value="{{emoji.name}}" class="content-background-color">
 				</div>
 				<div class="input-line">
 					<label for="aliases">{{_ "Aliases"}}</label>
-					<input type="text" id="aliases" autocomplete="off" value="{{emoji.aliases}}">
+					<input type="text" id="aliases" autocomplete="off" value="{{emoji.aliases}}"  class="content-background-color">
 				</div>
 				<div class="input-line">
 					<label for="image">{{_ "Image"}}</label>

packages/rocketchat-integrations/client/views/integrationsIncoming.html

@@ -84,7 +84,7 @@
 								</div>
 								{{#if data.scriptError}}
 									<div class="code-error-box">
-										<div class="title">
+										<div class="title color-content-background-color">
 											{{data.scriptError.name}}
 										</div>
 										<pre class="script-error background-transparent-lightest error-color error-border">{{data.scriptError.message}}</pre>

packages/rocketchat-integrations/client/views/integrationsOutgoing.html

@@ -110,7 +110,7 @@
 								</div>
 								{{#if data.scriptError}}
 									<div class="code-error-box">
-										<div class="title">
+										<div class="title color-content-background-color">
 											{{data.scriptError.name}}
 										</div>
 										<pre class="script-error background-transparent-lightest error-color error-border">{{data.scriptError.message}}</pre>

packages/rocketchat-logger/client/views/viewLogs.coffee

@@ -14,7 +14,7 @@ Template.viewLogs.helpers
 
 	ansispan: (string) ->
 		string = ansispan(string.replace(/\s/g, '&nbsp;').replace(/(\\n|\n)/g, '<br>'))
-		string = string.replace(/(.\d{8}-\d\d:\d\d:\d\d\.\d\d\d\(?.{0,2}\)?)/, '<span class="time secondary-font-color">$1</span>')
+		string = string.replace(/(.\d{8}-\d\d:\d\d:\d\d\.\d\d\d\(?.{0,2}\)?)/, '<span class="terminal-time">$1</span>')
 		return string
 
 	formatTS: (date) ->

packages/rocketchat-logger/client/views/viewLogs.html

@@ -2,8 +2,8 @@
 	{{#if hasPermission}}
 		<div class="section terminal">
 			{{#each logs}}
-				<div>
-					<!-- <span class="time secondary-font-color">{{formatTS ts}}</span>  -->
+				<div class="terminal-line">
+					{{!-- <span class="terminal-time">{{formatTS ts}}</span> --}}
 					{{{ansispan string}}}
 				</div>
 			{{/each}}

packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.html

@@ -15,9 +15,9 @@
 								<label><input type="radio" name="desktopNotifications" value="nothing" checked="{{$eq desktopNotifications 'nothing'}}" /> {{_ "Nothing"}}</label>
 								<br />
 								{{#if desktopNotificationDuration}}
-									<label>{{_ "Duration"}} ({{_ "seconds"}}) <input type="number" name="duration" min="0" value="{{desktopNotificationDuration}}"></label>
+									<label>{{_ "Duration"}} ({{_ "seconds"}}) <input type="number" name="duration" min="0" value="{{desktopNotificationDuration}}" class="content-background-color"></label>
 								{{else}}
-									<label>{{_ "Duration"}} ({{_ "seconds"}}) <input type="number" name="duration" min="0" value="" placeholder="{{_ "Use_User_Preferences_or_Global_Settings"}}"></label>
+									<label>{{_ "Duration"}} ({{_ "seconds"}}) <input type="number" name="duration" min="0" value="" placeholder="{{_ "Use_User_Preferences_or_Global_Settings"}}" class="content-background-color"></label>
 								{{/if}}
 
 								<button type="button" class="button cancel">{{_ "Cancel"}}</button>

packages/rocketchat-theme/client/imports/base.less

@@ -332,6 +332,10 @@ blockquote {
 			}
 		}
 	}
+
+	table {
+		overflow: hidden;
+	}
 }
 
 .input-line {
@@ -4689,22 +4693,23 @@ body:not(.is-cordova) {
 	padding: 8px 10px !important;
 	font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 	font-weight: 500;
-	-webkit-user-select: text;
-	-moz-user-select: text;
-	-ms-user-select: text;
-	user-select: text;
 	margin-bottom: 0 !important;
+	background-color: #444444 !important;
+	color: #ffffff;
+}
 
-	* {
-		-webkit-user-select: text;
-		-moz-user-select: text;
-		-ms-user-select: text;
-		user-select: text;
-	}
+.terminal-line {
+	word-break: break-all;
+}
 
-	> div {
-		word-break: break-all;
-	}
+.terminal-time {
+	color: #7f7f7f;
+}
+
+.code-colors {
+	background-color: #f8f8f8;
+	border-color: #cccccc;
+	color: #333333;
 }
 
 .new-logs {

packages/rocketchat-theme/server/colors.less

@@ -15,9 +15,6 @@
 @error-contrast: contrast(@error-color);
 @pending-background: lighten(@pending-color, 45%);
 @pending-border: lighten(@pending-color, 30%);
-@code-background-color: #f8f8f8;
-@code-border-color: #cccccc;
-@code-font-color: #333333;
 
 /** ----------------------------------------------------------------------------
  * Transparency variables
@@ -40,6 +37,10 @@
 	background-color: @content-background-color;
 }
 
+.color-content-background-color {
+	color: @content-background-color;
+}
+
 .primary-background-color {
 	background-color: @primary-background-color;
 }
@@ -96,12 +97,6 @@
 	color: @pending-color;
 }
 
-.code-colors {
-	background-color: @code-background-color;
-	border-color: @code-border-color;
-	color: @code-font-color;
-}
-
 .color-info-font-color {
 	color: @info-font-color;
 }
@@ -221,10 +216,6 @@
  */
 
 .page-container {
-	table {
-		overflow: hidden;
-	}
-
 	tr:hover td {
 		background-color: @content-background-color;
 	}
@@ -311,9 +302,6 @@ input:-webkit-autofill {
 /** ----------------------------------------------------------------------------
  * Misc typography variants
  */
-a {
-	color: @primary-font-color;
-}
 
 a:active,
 a:hover {
@@ -339,12 +327,6 @@ a:hover {
 /** ----------------------------------------------------------------------------
  * Admin and settings styles
  */
-.page-settings {
-	.terminal {
-		background-color: #444444;
-		color: white;
-	}
-}
 
 .page-list,
 .page-settings {
@@ -372,7 +354,6 @@ a:hover {
 .code-error-box {
 	.title {
 		background-color: @error-color;
-		color: white;
 	}
 }
 
@@ -384,10 +365,6 @@ a:hover {
 }
 
 .avatar-suggestion-item {
-	.avatar {
-		background-size: cover;
-	}
-
 	.question-mark::before {
 		color: @secondary-font-color;
 	}
@@ -408,10 +385,6 @@ a:hover {
 	a:hover {
 		color: @primary-background-contrast;
 	}
-
-	.spinner > div {
-		background-color: @primary-background-contrast;
-	}
 }
 
 #login-card {
@@ -424,10 +397,6 @@ a:hover {
 	}
 }
 
-.dropzone.over .dropzone-overlay {
-	color: @content-background-color;
-}
-
 /** ----------------------------------------------------------------------------
  * Room components
  */
@@ -436,12 +405,8 @@ a:hover {
 	color: @component-color;
 }
 
-.container-bars {
-	.upload-progress {
-		.upload-progress-progress {
-			background-color: @success-background;
-		}
-	}
+.upload-progress-progress {
+	background-color: @success-background;
 }
 
 .messages-container {
@@ -452,26 +417,20 @@ a:hover {
 	.footer {
 		background: @content-background-color;
 	}
+}
 
-	.message-form {
-		.message-buttons {
-			.buttonColors(lighten(@primary-font-color, 25%), @secondary-background-color);
-
-			&:hover {
-				background-color: mix(@secondary-background-color, contrast(@primary-font-color), 20%);
-			}
-		}
+.message-form {
+	.message-buttons {
+		.buttonColors(lighten(@primary-font-color, 25%), @secondary-background-color);
 
-		textarea {
-			&.editing {
-				background-color: lighten(@pending-color, 40%);
-			}
+		&:hover {
+			background-color: mix(@secondary-background-color, contrast(@primary-font-color), 20%);
 		}
 	}
 
-	.messages-box {
-		&.selectable .selected {
-			background-color: @selection-background;
+	.message-form-text {
+		&.editing {
+			background-color: lighten(@pending-color, 40%);
 		}
 	}
 }
@@ -484,10 +443,14 @@ a:hover {
 }
 
 .messages-box {
-	.editing .body,
-	textarea.editing {
-		background-color: lighten(@pending-color, 40%);
+	&.selectable .selected {
+		background-color: @selection-background;
 	}
+
+	// .editing .body,
+	// textarea.editing {
+	// 	background-color: lighten(@pending-color, 40%);
+	// }
 }
 
 /** ----------------------------------------------------------------------------
@@ -614,8 +577,6 @@ a:hover {
 	input,
 	select,
 	textarea {
-		background-color: @content-background-color;
-
 		&:focus {
 			border-color: lighten(@secondary-background-contrast, 30%);
 		}
@@ -852,6 +813,7 @@ i.status-offline {
 
 .alert-warning {
 	color: darken(@pending-color, 25%);
+	background-color: @pending-background;
 }
 
 .alert-link {

packages/rocketchat-ui-admin/admin/rooms/adminRoomInfo.html

@@ -12,7 +12,7 @@
 								<label>{{_ "Name"}}</label>
 								<div>
 									{{#if editing 'roomName'}}
-										<input type="text" name="roomName" value="{{roomName}}" class="editing" />
+										<input type="text" name="roomName" value="{{roomName}}" class="content-background-color editing" />
 										<button type="button" class="button cancel">{{_ "Cancel"}}</button>
 										<button type="button" class="button primary save">{{_ "Save"}}</button>
 									{{else}}
@@ -25,7 +25,7 @@
 							<label>{{_ "Topic"}}</label>
 							<div>
 								{{#if editing 'roomTopic'}}
-									<input type="text" name="roomTopic" value="{{roomTopic}}" class="editing" />
+									<input type="text" name="roomTopic" value="{{roomTopic}}" class="content-background-color editing" />
 									<button type="button" class="button cancel">{{_ "Cancel"}}</button>
 									<button type="button" class="button primary save">{{_ "Save"}}</button>
 								{{else}}

packages/rocketchat-ui-admin/admin/users/adminInviteUser.html

@@ -5,7 +5,7 @@
 				<h3>{{_ "Send_invitation_email"}}</h3>
 				<div class="input-line">
 					<label for="inviteEmails">{{_ "Send_invitation_email_info"}}</label>
-					<textarea id="inviteEmails" rows="3" style="height: auto"></textarea>
+					<textarea id="inviteEmails" rows="3" style="height: auto" class="content-background-color"></textarea>
 				</div>
 			</form>
 		</div>

packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.html

@@ -11,7 +11,7 @@
 							<div class="control">
 								<div class="search-form">
 									<div class="input-line search">
-										{{> inputAutocomplete settings=autocompleteSettingsAddUser id="user-add-search" class="search" placeholder=tAddUsers}}
+										{{> inputAutocomplete settings=autocompleteSettingsAddUser id="user-add-search" class="search content-background-color" placeholder=tAddUsers}}
 										<i class="icon-plus secondary-font-color"></i>
 									</div>
 								</div>

packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.html

@@ -8,7 +8,7 @@
 			<div class="control">
 				<form class="search-form" role="form">
 					<div class="input-line search">
-						<input type="text" id="message-search" class="search" placeholder="{{tSearchMessages}}" autocomplete="off" />
+						<input type="text" id="message-search" class="search content-background-color" placeholder="{{tSearchMessages}}" autocomplete="off" />
 						<i class="icon-search secondary-font-color"></i>
 					</div>
 				</form>

packages/rocketchat-ui-message/message/messageBox.html

@@ -5,7 +5,7 @@
 			{{#if allowedToSend}}
 			<div class="message-input border-component-color">
 				<div class="input-message-container content-background-color">
-					<textarea dir="auto" name="msg" maxlength="{{maxMessageLength}}" class="input-message autogrow-short" placeholder="{{_ 'Message'}}"></textarea>
+					<textarea dir="auto" name="msg" maxlength="{{maxMessageLength}}" class="message-form-text input-message autogrow-short" placeholder="{{_ 'Message'}}"></textarea>
 
 					<div class="inner-left-toolbar">
 						<i class="emoji-picker-icon icon-people"></i>

packages/rocketchat-ui/views/app/room.html

 <template name="room">
 	<div class="dropzone">
-		<div class="dropzone-overlay background-transparent-darkest">
+		<div class="dropzone-overlay background-transparent-darkest color-content-background-color">
 			<div class="background-transparent-darkest">
 				{{_ "Drop_to_upload_file"}}
 			</div>