[IMPROVE] Unused styles (RocketChat#17554)

wuxj · May 15, 2020 · 811688e · 811688e
1 parent 84ccdd0
commit 811688e
Show file tree

Hide file tree

Showing 60 changed files with 1,076 additions and 2,850 deletions.
diff --git a/.postcssrc b/.postcssrc
@@ -10,7 +10,6 @@
 		"autoprefixer": {}
 	},
 	"excludedPackages": [
-		"deepwell:bootstrap-datepicker2",
-		"smoral:sweetalert"
+		"deepwell:bootstrap-datepicker2"
 	]
 }
diff --git a/.storybook/mocks/decorators.js b/.storybook/mocks/decorators.js
@@ -24,7 +24,7 @@ export const rocketChatDecorator = (fn) => {
 			}
 		`}</style>
 		<div dangerouslySetInnerHTML={{ __html: icons }} />
-		<div className='global-font-family color-primary-font-color'>
+		<div className='color-primary-font-color'>
 			{fn()}
 		</div>
 	</MeteorProviderMock>;

diff --git a/app/apps/client/admin/appManage.html b/app/apps/client/admin/appManage.html
@@ -359,8 +359,8 @@ <h2> {{_ "Settings"}} </h2>
 																	</div>
 																	{{> CodeMirror name=id options=getEditorOptions code=value }}
 																	<div class="buttons">
-																		<button class="button primary button-fullscreen">{{_ "Full_Screen"}}</button>
-																		<button class="button primary button-restore">{{_ "Exit_Full_Screen"}}</button>
+																		<button class="rc-button rc-button--primary button-fullscreen">{{_ "Full_Screen"}}</button>
+																		<button class="rc-button rc-button--primary button-restore">{{_ "Exit_Full_Screen"}}</button>
 																	</div>
 																</div>
 																{{/if}}
@@ -463,7 +463,7 @@ <h2> {{_ "Settings"}} </h2>
 															{{#if hasChanges section}}
 															<span style="line-height: 40px" class="secondary-font-color">{{_ "Save_to_enable_this_action"}}</span>
 															{{else}}
-															<button type="button" class="button primary action" data-setting="{{id}}" data-action="{{value}}">{{_ actionText}}</button>
+															<button type="button" class="rc-button rc-button--primary action" data-setting="{{id}}" data-action="{{value}}">{{_ actionText}}</button>
 															{{/if}}
 														{{/if}}
 
@@ -472,14 +472,14 @@ <h2> {{_ "Settings"}} </h2>
 															<div class="settings-file-preview">
 																<div class="preview" style="background-image:url({{value.url}}?_dc={{random}});"></div>
 																<div class="action">
-																	<button type="button" class="button danger delete-asset"><i class="icon-trash secondary-font-color"></i>{{_ 'Delete'}}</button>
+																	<button type="button" class="rc-button rc-button--danger delete-asset"><i class="icon-trash secondary-font-color"></i>{{_ 'Delete'}}</button>
 																</div>
 															</div>
 															{{else}}
 															<div class="settings-file-preview">
 																<div class="preview no-file background-transparent-light secondary-font-color"><i class="icon-upload secondary-font-color"></i></div>
 																<div class="action">
-																	<div class="button primary">{{_ 'Select_file'}}
+																	<div class="rc-button rc-button--primary">{{_ 'Select_file'}}
 																		<input type="file" accept="{{assetAccept fileConstraints}}" />
 																	</div>
 																</div>

diff --git a/app/autotranslate/client/views/autoTranslateFlexTab.html b/app/autotranslate/client/views/autoTranslateFlexTab.html
@@ -30,8 +30,8 @@ <h2>{{_ "Auto_Translate"}}</h2>
 									<div class="alert">
 										{{_ "AutoTranslate_Change_Language_Description"}}
 									</div>
-									<button type="button" class="button cancel">{{_ "Cancel"}}</button>
-									<button type="button" class="button primary save">{{_ "Save"}}</button>
+									<button type="button" class="rc-button rc-button--cancel">{{_ "Cancel"}}</button>
+									<button type="button" class="rc-button rc-button--primary save">{{_ "Save"}}</button>
 								{{else}}
 									<span class="current-setting">{{languageName autoTranslateLanguage}} <i class="icon-pencil" data-edit="autoTranslateLanguage"></i></span>
 								{{/if}}

diff --git a/app/chatpal-search/client/template/admin.html b/app/chatpal-search/client/template/admin.html
@@ -37,7 +37,7 @@
 							</div>
 						</fieldset>
 						<div class="submit">
-							<button class="button primary send"><span>{{_ "Chatpal_create_key"}}</span></button>
+							<button class="rc-button rc-button--primary send"><span>{{_ "Chatpal_create_key"}}</span></button>
 						</div>
 					</div>
 				</form>

diff --git a/app/integrations/client/views/integrationsIncoming.html b/app/integrations/client/views/integrationsIncoming.html
@@ -82,8 +82,8 @@
 											</div>
 											{{> CodeMirror name="script" options=editorOptions code=data.script }}
 											<div class="buttons">
-												<button class="button primary button-fullscreen">{{_ "Full_Screen"}}</button>
-												<button class="button primary button-restore">{{_ "Exit_Full_Screen"}}</button>
+												<button class="rc-button rc-button--primary button-fullscreen">{{_ "Full_Screen"}}</button>
+												<button class="rc-button rc-button--primary button-restore">{{_ "Exit_Full_Screen"}}</button>
 											</div>
 										</div>
 										{{#if data.hasScriptError }}

diff --git a/app/integrations/client/views/integrationsOutgoing.html b/app/integrations/client/views/integrationsOutgoing.html
@@ -18,7 +18,7 @@
 						<div class="section-title">
 							<div class="section-title-text">{{_ "Webhook Details"}}</div>
 							<div class="section-title-right">
-								<button class="button primary collapse"><span>{{_ "Collapse"}}</span></button>
+								<button class="rc-button rc-button--primary collapse"><span>{{_ "Collapse"}}</span></button>
 							</div>
 						</div>
 						<div class="section-content">
@@ -148,8 +148,8 @@
 											</div>
 											{{> CodeMirror name="script" options=editorOptions code=data.script }}
 											<div class="buttons">
-												<button class="button primary button-fullscreen">{{_ "Full_Screen"}}</button>
-												<button class="button primary button-restore">{{_ "Exit_Full_Screen"}}</button>
+												<button class="rc-button rc-button--primary button-fullscreen">{{_ "Full_Screen"}}</button>
+												<button class="rc-button rc-button--primary button-restore">{{_ "Exit_Full_Screen"}}</button>
 											</div>
 										</div>
 										{{#if data.hasScriptError }}
@@ -181,7 +181,7 @@
 							<div class="section-title">
 								<div class="section-title-text">{{_ "Integration_Advanced_Settings"}}</div>
 								<div class="section-title-right">
-									<button class="button primary expand"><span>{{_ "Expand"}}</span></button>
+									<button class="rc-button rc-button--primary expand"><span>{{_ "Expand"}}</span></button>
 								</div>
 							</div>
 							<div class="section-content">

diff --git a/app/integrations/client/views/integrationsOutgoingHistory.html b/app/integrations/client/views/integrationsOutgoingHistory.html
@@ -21,8 +21,8 @@
 									{{formatDate history._createdAt}}
 								</div>
 								<div class="section-title-right">
-									<button class="button replay" data-history-id="{{ history._id }}">Replay</button>
-									<button class="button primary expand">
+									<button class="rc-button rc-button--secondary replay" data-history-id="{{ history._id }}">Replay</button>
+									<button class="rc-button rc-button--primary expand">
 										<span>{{_ "Expand"}}</span>
 									</button>
 								</div>

diff --git a/app/livechat/client/views/app/integrations/livechatIntegrationFacebook.html b/app/livechat/client/views/app/integrations/livechatIntegrationFacebook.html
@@ -4,10 +4,10 @@
 			<fieldset class="rc-form-legend">
 				<div class="rc-form-group">
 					{{#if enabled}}
-						<button class="button reload">{{_ "Reload_Pages"}}</button>
-						<button class="button danger disable">{{_ "Disable"}}</button>
+						<button class="rc-button rc-button--secondary reload">{{_ "Reload_Pages"}}</button>
+						<button class="rc-button rc-button--danger disable">{{_ "Disable"}}</button>
 					{{else}}
-						<button class="button primary enable" {{enableButtonDisabled}}>{{_ "Enable"}}</button>
+						<button class="rc-button rc-button--primary enable" {{enableButtonDisabled}}>{{_ "Enable"}}</button>
 						{{#unless hasToken}}
 							<div class="rc-input__wrapper">
 								<p>{{_ "You_have_to_set_an_API_token_first_in_order_to_use_the_integration"}}</p>

diff --git a/app/livechat/client/views/app/livechatAgents.html b/app/livechat/client/views/app/livechatAgents.html
@@ -62,7 +62,7 @@
 								<tr class="rc-table-tr user-info row-link" data-id="{{_id}}">
 									<td>
 										<div class="rc-table-wrapper">
-											<div class="rc-table-avatar user-image status-{{status}}">{{> avatar username=username}}</div>
+											<div class="rc-table-avatar">{{> avatar username=username}}</div>
 											<div class="rc-table-info">
 												<span class="rc-table-title">
 													{{name}}

diff --git a/app/livechat/client/views/app/livechatManagers.html b/app/livechat/client/views/app/livechatManagers.html
@@ -57,7 +57,7 @@
 						<tr class="rc-table-tr user-info row-link" data-id="{{_id}}">
 							<td>
 								<div class="rc-table-wrapper">
-									<div class="rc-table-avatar user-image status-{{status}}">{{> avatar username=username}}</div>
+									<div class="rc-table-avatar">{{> avatar username=username}}</div>
 									<div class="rc-table-info">
 										<span class="rc-table-title">
 											{{name}}

diff --git a/app/livechat/client/views/app/livechatQueue.html b/app/livechat/client/views/app/livechatQueue.html
@@ -84,7 +84,7 @@
 					<tr class="rc-table-tr manage row-link" data-name="{{user.username}}">
 						<td>
 							<div class="rc-table-wrapper">
-								<div class="rc-table-avatar user-image status-{{status}}">{{> avatar username=user.username}}</div>
+								<div class="rc-table-avatar">{{> avatar username=user.username}}</div>
 								<div class="rc-table-info">
 									<span class="rc-table-title">{{user.username}}</span>
 								</div>

diff --git a/app/livechat/client/views/app/tabbar/visitorInfo.html b/app/livechat/client/views/app/tabbar/visitorInfo.html
@@ -64,10 +64,10 @@ <h3>{{_ "Conversation"}}</h3>
 						<button class='button button-block close-livechat'><span><i class='icon-download'></i> {{_ "Close"}}</span></button>
 					{{/if}}
 					{{#if canForwardGuest}}
-						<button class="button button-block forward-livechat"><span><i class="icon-forward"></i> {{_ "Forward"}}</span></button>
+						<button class="rc-button rc-button--secondary button-block forward-livechat"><span><i class="icon-forward"></i> {{_ "Forward"}}</span></button>
 					{{/if}}
 					{{#if canReturnQueue}}
-						<button class="button button-block return-inquiry"><span><i class="icon-ccw"></i> {{_ "Return"}}</span></button>
+						<button class="rc-button rc-button--secondary button-block return-inquiry"><span><i class="icon-ccw"></i> {{_ "Return"}}</span></button>
 					{{/if}}
 				{{/if}}
 			</nav>

diff --git a/app/models/server/models/Settings.js b/app/models/server/models/Settings.js
@@ -58,7 +58,7 @@ export class Settings extends Base {
 			filter._id = { $in: ids };
 		}
 
-		return this.find(filter, { fields: { _id: 1, value: 1 } });
+		return this.find(filter, { fields: { _id: 1, value: 1, editor: 1 } });
 	}
 
 	findNotHiddenPublicUpdatedAfter(updatedAt) {
@@ -70,7 +70,7 @@ export class Settings extends Base {
 			},
 		};
 
-		return this.find(filter, { fields: { _id: 1, value: 1 } });
+		return this.find(filter, { fields: { _id: 1, value: 1, editor: 1 } });
 	}
 
 	findNotHiddenPrivate() {

diff --git a/app/oauth2-server-config/client/admin/views/oauthApp.html b/app/oauth2-server-config/client/admin/views/oauthApp.html
@@ -60,9 +60,9 @@
 				</div>
 				<div class="submit">
 					{{#if data.clientId}}
-						<button class="button danger delete"><i class="icon-trash"></i><span>{{_ "Delete"}}</span></button>
+						<button class="rc-button rc-button--danger delete"><i class="icon-trash"></i><span>{{_ "Delete"}}</span></button>
 					{{/if}}
-					<button class="button primary save"><i class="icon-send"></i><span>{{_ "Save_changes"}}</span></button>
+					<button class="rc-button rc-button--primary save"><i class="icon-send"></i><span>{{_ "Save_changes"}}</span></button>
 				</div>
 			</div>
 		{{else}}

diff --git a/app/oauth2-server-config/client/oauth/oauth2-client.html b/app/oauth2-server-config/client/oauth/oauth2-client.html
@@ -30,9 +30,9 @@ <h1>{{currentUser.username}}</h1>
 				<input type="hidden" name="redirect_uri" value="{{redirect_uri}}">
 				<input type="hidden" name="response_type" value="code">
 				<div class="buttons-group">
-					<button id="logout-oauth" class="button danger logout">{{_ "Logout"}}</button>
-					<button id="cancel-oauth" type="button" class="button cancel">{{_ "Cancel"}}</button>
-					<button type="submit" class="button primary save">{{_ "Authorize"}}</button>
+					<button id="logout-oauth" class="rc-button rc-button--danger logout">{{_ "Logout"}}</button>
+					<button id="cancel-oauth" type="button" class="rc-button rc-button--cancel">{{_ "Cancel"}}</button>
+					<button type="submit" class="rc-button rc-button--primary save">{{_ "Authorize"}}</button>
 				</div>
 			</form>
 			{{#unless Template.subscriptionsReady}}

diff --git a/app/otr/client/rocketchat.otr.room.js b/app/otr/client/rocketchat.otr.room.js
@@ -71,13 +71,9 @@ OTR.Room = class {
 			if (this.established.get()) {
 				if ($room.length && $title.length && !$('.otr-icon', $title).length) {
 					$title.prepend('<i class=\'otr-icon icon-key\'></i>');
-					$('.input-message-container').addClass('otr');
-					$('.inner-right-toolbar').prepend('<i class=\'otr-icon icon-key\'></i>');
 				}
 			} else if ($title.length) {
 				$('.otr-icon', $title).remove();
-				$('.input-message-container').removeClass('otr');
-				$('.inner-right-toolbar .otr-icon').remove();
 			}
 		});
 

diff --git a/app/otr/client/stylesheets/otr.css b/app/otr/client/stylesheets/otr.css
@@ -27,21 +27,3 @@
 		}
 	}
 }
-
-.input-message-container.otr {
-	& .input-message {
-		padding-right: 48px;
-	}
-
-	& .inner-right-toolbar {
-		& .otr-icon {
-			display: inline-block;
-
-			margin-top: 2px;
-
-			vertical-align: top;
-
-			color: green;
-		}
-	}
-}
diff --git a/app/otr/client/views/otrFlexTab.html b/app/otr/client/views/otrFlexTab.html
@@ -9,15 +9,15 @@ <h2>{{_ "Off_the_record_conversation"}}</h2>
 					{{#if userIsOnline}}
 						{{#if established}}
 							<div class="buttons-group">
-								<button class="button refresh"><span>{{_ "Refresh_keys"}}</span></button>
+								<button class="rc-button rc-button--secondary refresh"><span>{{_ "Refresh_keys"}}</span></button>
 							</div>
 							<div class="buttons-group">
-								<button class="button end"><span>{{_ "End_OTR"}}</span></button>
+								<button class="rc-button rc-button--secondary end"><span>{{_ "End_OTR"}}</span></button>
 							</div>
 						{{else}} {{#if establishing}}
 							{{_ "Please_wait_while_OTR_is_being_established"}}
 						{{else}}
-							<button class="button start"><span>{{_ "Start_OTR"}}</span></button>
+							<button class="rc-button rc-button--secondary start"><span>{{_ "Start_OTR"}}</span></button>
 						{{/if}} {{/if}}
 					{{else}}
 						<h2>{{_ "OTR_is_only_available_when_both_users_are_online"}}</h2>

diff --git a/app/theme/client/imports/general/base.css b/app/theme/client/imports/general/base.css
@@ -29,6 +29,7 @@ body {
 
 	background-color: var(--rc-color-primary);
 
+	font-family: var(--body-font-family);
 	font-size: var(--text-small-size);
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;