Fix logo spaces and sizes

RocketChat · Jul 19, 2018 · dad3129 · dad3129
1 parent 5b9fbc6
commit dad3129
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 35 deletions.
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
@@ -48,13 +48,11 @@
 		-webkit-user-drag: none;
 	}
 
-	&__footer {
+	&__footer:not(:empty) {
 		width: auto;
 		height: var(--sidebar-footer-height);
 		padding: var(--sidebar-extra-small-default-padding) var(--sidebar-default-padding);
 
-		text-align: center;
-
 		& img {
 			max-width: 100%;
 			height: 100%;

diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -4634,7 +4634,6 @@ body:not(.is-cordova) {
 
 			max-width: 100%;
 			max-height: 150px;
-			padding: 10px;
 		}
 	}
 
@@ -4652,6 +4651,9 @@ body:not(.is-cordova) {
 	& header {
 		position: relative;
 		z-index: 1;
+		width: 520px;
+		padding: 0 20px;
+		margin: auto;
 
 		display: block;
 	}

diff --git a/packages/rocketchat-theme/client/imports/general/variables.css b/packages/rocketchat-theme/client/imports/general/variables.css
@@ -164,7 +164,7 @@
 	--sidebar-default-padding: 24px;
 	--sidebar-small-default-padding: 16px;
 	--sidebar-extra-small-default-padding: 12px;
-	--sidebar-footer-height: 70px;
+	--sidebar-footer-height: 48px;
 	--sidebar-small-header-padding: var(--sidebar-small-default-padding);
 
 	/*

diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.html b/packages/rocketchat-ui-sidenav/client/sideNav.html
@@ -24,9 +24,7 @@
 				</div>
 			{{/if}}
 
-			<footer class="sidebar__footer">
-				{{{footer}}}
-			</footer>
+			<footer class="sidebar__footer">{{{footer}}}</footer>
 		</aside>
 		<div class="sidebar-wrap"></div>
 </template>
diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.js b/packages/rocketchat-ui-sidenav/client/sideNav.js
@@ -12,7 +12,7 @@ Template.sideNav.helpers({
 	},
 
 	footer() {
-		return RocketChat.settings.get('Layout_Sidenav_Footer');
+		return String(RocketChat.settings.get('Layout_Sidenav_Footer')).trim();
 	},
 
 	roomType() {

diff --git a/public/images/logo/logo.svg b/public/images/logo/logo.svg