From 7e0fc3d94d9898ccd86608125ac5441c947382bb Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Tue, 13 Nov 2018 03:06:07 -0200
Subject: [PATCH 1/8] Updating admin style

---
 .../rocketchat-apps/client/admin/appLogs.html |  2 +-
 .../client/views/integrations.html            |  2 +-
 .../client/views/integrationsNew.html         |  2 +-
 .../client/views/integrationsOutgoing.html    |  2 +-
 .../views/integrationsOutgoingHistory.html    |  2 +-
 .../rocketchat-ui-admin/client/admin.html     | 20 ++++-----
 .../client/imports/general/base_old.css       | 44 +++++++++----------
 7 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/packages/rocketchat-apps/client/admin/appLogs.html b/packages/rocketchat-apps/client/admin/appLogs.html
index 431f9a85eef29..a41ac81412e71 100644
--- a/packages/rocketchat-apps/client/admin/appLogs.html
+++ b/packages/rocketchat-apps/client/admin/appLogs.html
@@ -18,7 +18,7 @@ <h2>
 					</h2>
 				{{/if}}
 			</header>
-			<div class="content background-transparent-dark">
+			<div class="content">
 				{{#if isReady}}
 					<div class="rocket-form">
 						{{#each log in logs}}
diff --git a/packages/rocketchat-integrations/client/views/integrations.html b/packages/rocketchat-integrations/client/views/integrations.html
index e966adfb2fa8a..0a39da5ae2784 100644
--- a/packages/rocketchat-integrations/client/views/integrations.html
+++ b/packages/rocketchat-integrations/client/views/integrations.html
@@ -9,7 +9,7 @@
 			{{/if}}
 		{{/header}}
 
-		<div class="content background-transparent-dark">
+		<div class="content">
 			{{#unless hasPermission}}
 				<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
 			{{else}}
diff --git a/packages/rocketchat-integrations/client/views/integrationsNew.html b/packages/rocketchat-integrations/client/views/integrationsNew.html
index 7ec48b94d3b23..7ff4230ce8bea 100644
--- a/packages/rocketchat-integrations/client/views/integrationsNew.html
+++ b/packages/rocketchat-integrations/client/views/integrationsNew.html
@@ -1,7 +1,7 @@
 <template name="integrationsNew">
 	<section class="page-container page-home page-static page-settings">
 		{{> header sectionName=pageTitle}}
-		<div class="content background-transparent-dark">
+		<div class="content">
 			<a href="{{pathFor "admin-integrations"}}"><i class="icon-angle-left"></i> {{_ "Back_to_integrations"}}</a><br><br>
 			{{#if hasPermission}}
 
diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoing.html b/packages/rocketchat-integrations/client/views/integrationsOutgoing.html
index 7388eb1ff5a64..5be2a9bd38346 100644
--- a/packages/rocketchat-integrations/client/views/integrationsOutgoing.html
+++ b/packages/rocketchat-integrations/client/views/integrationsOutgoing.html
@@ -8,7 +8,7 @@
 			</div>
 		{{/header}}
 
-		<div class="content background-transparent-dark">
+		<div class="content">
 			<a href="{{pathFor "admin-integrations"}}"><i class="icon-angle-left"></i> {{_ "Back_to_integrations"}}</a><br><br>
 			{{#unless hasPermission}}
 				<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.html b/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.html
index 5d88d5b44a1ec..39f56e0835549 100644
--- a/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.html
+++ b/packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.html
@@ -6,7 +6,7 @@
 			</div>
 		{{/header}}
 
-		<div class="content background-transparent-dark">
+		<div class="content">
 			{{#unless hasPermission}}
 				<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
 			{{else}}
diff --git a/packages/rocketchat-ui-admin/client/admin.html b/packages/rocketchat-ui-admin/client/admin.html
index 2a90fd7492166..dab83673ce67b 100644
--- a/packages/rocketchat-ui-admin/client/admin.html
+++ b/packages/rocketchat-ui-admin/client/admin.html
@@ -16,7 +16,7 @@
 					{{/if}}
 				</div>
 			{{/header}}
-			<div class="content background-transparent-dark">
+			<div class="content">
 				{{#unless hasPermission 'view-privileged-setting'}}
 					<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
 				{{else}}
@@ -34,7 +34,7 @@
 											{{translateSection section}}
 										</div>
 										<div class="section-title-right">
-											<button class="button primary expand"><span>{{_ "Expand"}}</span></button>
+											<button class="rc-button expand"><span>{{_ "Expand"}}</span></button>
 										</div>
 									</div>
 								{{/if}}
@@ -138,8 +138,8 @@
 															{{> CodeMirror name=_id options=getEditorOptions code=value }}
 															{{setEditorOnBlur _id}}
 															<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}}
@@ -149,7 +149,7 @@
 													{{#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}}" {{isDisabled}} >{{_ actionText}}</button>
+														<button type="button" class="rc-button rc-button--primary action" data-setting="{{_id}}" data-action="{{value}}" {{isDisabled}} >{{_ actionText}}</button>
 													{{/if}}
 												{{/if}}
 
@@ -158,14 +158,14 @@
 														<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--cancel 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>
@@ -192,7 +192,7 @@
 												{{/if}}
 											</div>
 											{{#if showResetButton}}
-												<button text="{{_ 'Reset'}}" data-setting="{{_id}}" class="reset-setting button danger">
+												<button text="{{_ 'Reset'}}" data-setting="{{_id}}" class="reset-setting rc-button rc-button--cancel">
 													<i class="icon-ccw secondary-font-color color-error-contrast"></i>
 												</button>
 											{{/if}}
@@ -203,7 +203,7 @@
 										<div class="input-line double-col">
 											<label class="setting-label">{{_ "Reset_section_settings"}}</label>
 											<div class="setting-field">
-												<button data-section="{{section}}" class="reset-group button danger">
+												<button data-section="{{section}}" class="reset-group rc-button rc-button--cancel">
 													{{_ "Reset"}}
 												</button>
 											</div>
@@ -213,7 +213,7 @@
 									{{#if section}}
 										{{#if sectionIsCustomOAuth section}}
 											<div class="submit">
-												<button class="button danger remove-custom-oauth"><span>{{_ "Remove_custom_oauth"}}</span></button>
+												<button class="rc-button rc-button--cancel remove-custom-oauth"><span>{{_ "Remove_custom_oauth"}}</span></button>
 											</div>
 										{{/if}}
 									{{/if}}
diff --git a/packages/rocketchat_theme/client/imports/general/base_old.css b/packages/rocketchat_theme/client/imports/general/base_old.css
index fe61d13a9f153..55b1e2dedc2c9 100644
--- a/packages/rocketchat_theme/client/imports/general/base_old.css
+++ b/packages/rocketchat_theme/client/imports/general/base_old.css
@@ -371,7 +371,7 @@
 		& > div {
 			float: left;
 
-			width: 67%;
+			width: 70%;
 
 			& label {
 				display: inline-block;
@@ -1777,7 +1777,6 @@ rc-old select,
 
 .rc-old .page-settings {
 	& .content {
-		padding: 20px 0;
 
 		& h2 {
 			margin-bottom: 2rem;
@@ -1798,12 +1797,9 @@ rc-old select,
 	}
 
 	& .section {
-		margin: 20px;
-		padding: 20px;
+		padding: 20px 0;
 
-		border: 1px solid #dddddd;
-		border-radius: 4px;
-		background-color: var(--color-white);
+		border-bottom: 2px solid #dddddd;
 
 		&.section-collapsed .section-content {
 			display: none;
@@ -1813,12 +1809,12 @@ rc-old select,
 	& .section-title {
 		display: flex;
 
-		font-size: 24px;
-		font-weight: 600;
-		line-height: 40px;
-
 		& .section-title-text {
 			flex-grow: 1;
+
+			font-size: 1rem;
+    		font-weight: 500;
+		    line-height: 3rem;
 		}
 
 		& .section-title-right {
@@ -1836,9 +1832,8 @@ rc-old select,
 			display: flex;
 
 			margin-bottom: 0;
-			padding: 20px 0;
+			padding: 10px 0;
 
-			border-bottom: 1px solid #eeeeee;
 			align-items: flex-start;
 
 			&:last-child {
@@ -1865,13 +1860,12 @@ rc-old select,
 		}
 
 		& .setting-label {
-			width: 25%;
+			width: 30%;
 
 			text-align: left;
 
-			font-size: 16px;
 			font-weight: 500;
-			line-height: 20px;
+			line-height: 16px;
 		}
 
 		& .settings-description {
@@ -5383,13 +5377,20 @@ body:not(.is-cordova) {
 		text-align: right;
 	}
 
+	& .CodeMirror {
+		border-width: var(--input-border-width);
+		border-color: var(--input-border-color);
+		border-radius: var(--input-border-radius);
+	}
+
 	&.code-mirror-box-fullscreen {
 		position: fixed;
 		z-index: 100;
-		top: 61px;
-		right: 40px;
+		top: 0;
+		right: 0;
 		bottom: 0;
-		left: 260px;
+		left: 0;
+		padding: 40px;
 
 		display: flex;
 		flex-direction: column;
@@ -5404,11 +5405,8 @@ body:not(.is-cordova) {
 
 		& .title {
 			display: initial;
-
-			padding-left: 10px;
-
 			font-size: 16px;
-			line-height: 30px;
+			line-height: 50px;
 		}
 
 		& .button-fullscreen {

From 445e7877f99bde7731c92f62a15f3154cc76e4d1 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Tue, 13 Nov 2018 03:09:43 -0200
Subject: [PATCH 2/8] Updating admin style

---
 .../rocketchat_theme/client/imports/general/base_old.css  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/rocketchat_theme/client/imports/general/base_old.css b/packages/rocketchat_theme/client/imports/general/base_old.css
index 55b1e2dedc2c9..ba1a84e28e3fa 100644
--- a/packages/rocketchat_theme/client/imports/general/base_old.css
+++ b/packages/rocketchat_theme/client/imports/general/base_old.css
@@ -1777,7 +1777,6 @@ rc-old select,
 
 .rc-old .page-settings {
 	& .content {
-
 		& h2 {
 			margin-bottom: 2rem;
 		}
@@ -1810,11 +1809,12 @@ rc-old select,
 		display: flex;
 
 		& .section-title-text {
+			font-size: 1rem;
+			font-weight: 500;
+
 			flex-grow: 1;
 
-			font-size: 1rem;
-    		font-weight: 500;
-		    line-height: 3rem;
+			line-height: 3rem;
 		}
 
 		& .section-title-right {

From 18a1f59bb41867cbbdfcb8307273a79bdb8fdb96 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Tue, 13 Nov 2018 03:13:17 -0200
Subject: [PATCH 3/8] Updating admin style

---
 .../rocketchat_theme/client/imports/general/base_old.css  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat_theme/client/imports/general/base_old.css b/packages/rocketchat_theme/client/imports/general/base_old.css
index ba1a84e28e3fa..0a08ffb38448d 100644
--- a/packages/rocketchat_theme/client/imports/general/base_old.css
+++ b/packages/rocketchat_theme/client/imports/general/base_old.css
@@ -1812,9 +1812,9 @@ rc-old select,
 			font-size: 1rem;
 			font-weight: 500;
 
-			flex-grow: 1;
-
 			line-height: 3rem;
+
+			flex-grow: 1;
 		}
 
 		& .section-title-right {
@@ -5390,9 +5390,10 @@ body:not(.is-cordova) {
 		right: 0;
 		bottom: 0;
 		left: 0;
+		display: flex;
+
 		padding: 40px;
 
-		display: flex;
 		flex-direction: column;
 
 		width: auto;
@@ -5405,6 +5406,7 @@ body:not(.is-cordova) {
 
 		& .title {
 			display: initial;
+
 			font-size: 16px;
 			line-height: 50px;
 		}

From 54a8c1e0691ae5f82a8f5fc743eadc5238f8aebe Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Tue, 13 Nov 2018 03:15:10 -0200
Subject: [PATCH 4/8] Updating admin style

---
 .../rocketchat_theme/client/imports/general/base_old.css     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat_theme/client/imports/general/base_old.css b/packages/rocketchat_theme/client/imports/general/base_old.css
index 0a08ffb38448d..fb9b716eee451 100644
--- a/packages/rocketchat_theme/client/imports/general/base_old.css
+++ b/packages/rocketchat_theme/client/imports/general/base_old.css
@@ -5390,12 +5390,13 @@ body:not(.is-cordova) {
 		right: 0;
 		bottom: 0;
 		left: 0;
-		display: flex;
 
-		padding: 40px;
+		display: flex;
 
 		flex-direction: column;
 
+		padding: 40px;
+
 		width: auto;
 		height: auto;
 		align-items: stretch;

From 4e595f1ca7a93acc02cc77f4de2e63735c664520 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Tue, 13 Nov 2018 03:19:09 -0200
Subject: [PATCH 5/8] Updating admin style

---
 .../rocketchat_theme/client/imports/general/base_old.css | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/rocketchat_theme/client/imports/general/base_old.css b/packages/rocketchat_theme/client/imports/general/base_old.css
index fb9b716eee451..5e62d7ce06114 100644
--- a/packages/rocketchat_theme/client/imports/general/base_old.css
+++ b/packages/rocketchat_theme/client/imports/general/base_old.css
@@ -5390,17 +5390,16 @@ body:not(.is-cordova) {
 		right: 0;
 		bottom: 0;
 		left: 0;
-
 		display: flex;
 
-		flex-direction: column;
-
-		padding: 40px;
-
 		width: auto;
 		height: auto;
 		align-items: stretch;
 
+		flex-direction: column;
+
+		padding: 40px;
+
 		& .buttons {
 			border-width: 0;
 		}

From a7199e5ba3e1e04ce13a9d334f0bd234a63854c1 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Tue, 13 Nov 2018 03:20:38 -0200
Subject: [PATCH 6/8] Updating admin style

---
 .../rocketchat_theme/client/imports/general/base_old.css     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat_theme/client/imports/general/base_old.css b/packages/rocketchat_theme/client/imports/general/base_old.css
index 5e62d7ce06114..74cdf9fc82efb 100644
--- a/packages/rocketchat_theme/client/imports/general/base_old.css
+++ b/packages/rocketchat_theme/client/imports/general/base_old.css
@@ -5390,14 +5390,15 @@ body:not(.is-cordova) {
 		right: 0;
 		bottom: 0;
 		left: 0;
+
 		display: flex;
 
+		flex-direction: column;
+
 		width: auto;
 		height: auto;
 		align-items: stretch;
 
-		flex-direction: column;
-
 		padding: 40px;
 
 		& .buttons {

From dbb7b2d7db5f99a64ea245ac8d46570c3fd6a0e1 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Tue, 13 Nov 2018 03:22:14 -0200
Subject: [PATCH 7/8] Updating admin style

---
 packages/rocketchat_theme/client/imports/general/base_old.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat_theme/client/imports/general/base_old.css b/packages/rocketchat_theme/client/imports/general/base_old.css
index 74cdf9fc82efb..1b06d0f1db4d5 100644
--- a/packages/rocketchat_theme/client/imports/general/base_old.css
+++ b/packages/rocketchat_theme/client/imports/general/base_old.css
@@ -5397,10 +5397,11 @@ body:not(.is-cordova) {
 
 		width: auto;
 		height: auto;
-		align-items: stretch;
 
 		padding: 40px;
 
+		align-items: stretch;
+
 		& .buttons {
 			border-width: 0;
 		}

From 4037be83e30aaec0b1e09d92b450920252c6a10b Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Tue, 13 Nov 2018 03:51:35 -0200
Subject: [PATCH 8/8] Updating admin style

---
 tests/pageobjects/administration.page.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/pageobjects/administration.page.js b/tests/pageobjects/administration.page.js
index bccd94a26038d..ad4275e18b240 100644
--- a/tests/pageobjects/administration.page.js
+++ b/tests/pageobjects/administration.page.js
@@ -65,13 +65,13 @@ class Administration extends Page {
 	// settings
 	get buttonSave() { return browser.element('button.save'); }
 
-	get generalButtonExpandIframe() { return browser.element('.section:nth-of-type(4) .button.expand'); }
-	get generalButtonExpandNotifications() { return browser.element('.section:nth-of-type(5) .button.expand'); }
-	get generalButtonExpandRest() { return browser.element('.section:nth-of-type(6) .button.expand'); }
-	get generalButtonExpandReporting() { return browser.element('.section:nth-of-type(7) .button.expand'); }
-	get generalButtonExpandStreamCast() { return browser.element('.section:nth-of-type(8) .button.expand'); }
-	get generalButtonExpandTranslations() { return browser.element('.section:nth-of-type(9) .button.expand'); }
-	get generalButtonExpandUTF8() { return browser.element('.section:nth-of-type(10) .button.expand'); }
+	get generalButtonExpandIframe() { return browser.element('.section:nth-of-type(4) button.expand'); }
+	get generalButtonExpandNotifications() { return browser.element('.section:nth-of-type(5) button.expand'); }
+	get generalButtonExpandRest() { return browser.element('.section:nth-of-type(6) button.expand'); }
+	get generalButtonExpandReporting() { return browser.element('.section:nth-of-type(7) button.expand'); }
+	get generalButtonExpandStreamCast() { return browser.element('.section:nth-of-type(8) button.expand'); }
+	get generalButtonExpandTranslations() { return browser.element('.section:nth-of-type(9) button.expand'); }
+	get generalButtonExpandUTF8() { return browser.element('.section:nth-of-type(10) button.expand'); }
 
 	get generalSiteUrl() { return browser.element('[name="Site_Url"]'); }
 	get generalSiteUrlReset() { return browser.element('.reset-setting[data-setting="Site_Url"]'); }
@@ -123,8 +123,8 @@ class Administration extends Page {
 	get generalUTF8NamesSlugReset() { return browser.element('.reset-setting[data-setting="UTF8_Names_Slugify"]'); }
 
 	// accounts
-	get accountsButtonExpandDefaultUserPreferences() { return browser.element('.section:nth-of-type(2) .button.expand'); }
-	get accountsButtonCollapseDefaultUserPreferences() { return browser.element('.section:nth-of-type(2) .button.collapse'); }
+	get accountsButtonExpandDefaultUserPreferences() { return browser.element('.section:nth-of-type(2) button.expand'); }
+	get accountsButtonCollapseDefaultUserPreferences() { return browser.element('.section:nth-of-type(2) button.collapse'); }
 
 	get accountsEnableAutoAwayTrue() { return browser.element('label:nth-of-type(1) [name="Accounts_Default_User_Preferences_enableAutoAway"]'); }
 	get accountsEnableAutoAwayFalse() { return browser.element('label:nth-of-type(2) [name="Accounts_Default_User_Preferences_enableAutoAway"]'); }