simplifying css

packages/rocketchat-theme/assets/stylesheets/base.less

@@ -541,12 +541,6 @@ textarea[disabled] {
 }
 
 .form-group {
-	.-btn {
-		margin-left: 2px;
-		&:nth-child(1) {
-			margin-left: 3px;
-		}
-	}
 	.input-group {
 		padding: 2px 0;
 	}

packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less

@@ -9,7 +9,6 @@
 @pending-color: #fcb316;
 @component-color: @input-font-color;
 @selection-color: @info-active-font-color;
-
 @primary-background-contrast: contrast(@primary-background-color, #444);
 @primary-action-contrast: contrast(@primary-action-color, #444);
 @secondary-action-contrast: contrast(@secondary-action-color, #444);
@@ -231,28 +230,13 @@ label.required:after {
 // new layout buttons
 .button {
 	.buttonColors(@secondary-action-contrast, @secondary-action-color);
-	&.button-primary,
-	&.primary,
-	&.save,
-	&.send,
-	&.start {
+	&.primary {
 		.buttonColors(@primary-action-contrast, @primary-action-color);
 	}
-	// TODO: Secondary button usage needs refactor and guidelines to be consistent
-	// &.back,
-	// &.cancel,
-	// &.secondary {
-	// 	.buttonColors(@secondary-action-contrast,@secondary-action-color);
-	// }
-	&.danger,
-	&.delete,
-	&.delete-role,
-	&.end,
-	&.logout,
-	&.mute-user,
-	&.remove,
-	&.remove-user,
-	&.stop-call {
+	&.secondary {
+		.buttonColors(@secondary-action-contrast, @secondary-action-color);
+	}
+	&.danger {
 		.buttonColors(@error-contrast, @error-color);
 	}
 	&.external-login {
@@ -1254,10 +1238,6 @@ a.github-fork {
 	color: white;
 }
 
-.green {
-	color: green;
-}
-
 .flex-tab-bar {
 	background: #FCFCFC;
 	.tab-button {

packages/rocketchat-ui/views/cmsPage.html

 <template name="cmsPage">
 	<div class="cms-page">
 		<div class="cms-page-close">
-			<a href="/login" class="button button-primary"><i class="icon-cancel"></i></a>
+			<a href="/login" class="button primary"><i class="icon-cancel"></i></a>
 		</div>
 		{{{page}}}
 	</div>