From 5610bbb2356fdda03c7e958ed6943ec84fc90f7f Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Fri, 4 Aug 2017 11:35:37 -0300
Subject: [PATCH] fix avatar upload icons and add burger menu back

---
 client/routes/router.js                       | 14 ++++++-------
 .../client/imports/general/base_old.css       |  4 ++--
 .../client/imports/general/forms.css          | 21 +++++++++++++++----
 .../client/accountFlex.html                   |  4 ----
 .../client/accountProfile.html                | 20 ++++++++++++------
 .../rocketchat-ui-master/public/icons.svg     |  9 +++++++-
 .../client/views/app/burger.html              |  2 +-
 7 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/client/routes/router.js b/client/routes/router.js
index c3302a3c20b..b25056eaa50 100644
--- a/client/routes/router.js
+++ b/client/routes/router.js
@@ -68,13 +68,13 @@ FlowRouter.route('/home', {
 	}
 });
 
-FlowRouter.route('/changeavatar', {
-	name: 'changeAvatar',
-
-	action() {
-		BlazeLayout.render('main', {center: 'avatarPrompt'});
-	}
-});
+// FlowRouter.route('/changeavatar', {
+// 	name: 'changeAvatar',
+//
+// 	action() {
+// 		BlazeLayout.render('main', {center: 'avatarPrompt'});
+// 	}
+// });
 
 FlowRouter.route('/account/:group?', {
 	name: 'account',
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 790638c688d..29fd2fc5199 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -612,7 +612,7 @@
 	}
 }
 
-.rc-old .burger {
+.rc-old.burger {
 	padding: 12px;
 	visibility: hidden;
 	display: none;
@@ -4740,7 +4740,7 @@ body:not(.is-cordova) {
 		left: 0;
 	}
 
-	.rc-old #rocket-chat {
+	.rc-old {
 		& .burger {
 			visibility: visible;
 			display: inline-block;
diff --git a/packages/rocketchat-theme/client/imports/general/forms.css b/packages/rocketchat-theme/client/imports/general/forms.css
index 8e0b2374110..44c39bdba9a 100644
--- a/packages/rocketchat-theme/client/imports/general/forms.css
+++ b/packages/rocketchat-theme/client/imports/general/forms.css
@@ -655,13 +655,12 @@
 		display: flex;
 		flex-wrap: wrap;
 
-		&__item {
+		&-item {
 			margin-right: 10px;
 			margin-bottom: 10px;
 			cursor: pointer;
-			height: 50px;
-			width: 50px;
-			border: 1px solid;
+			height: 48px;
+			width: 48px;
 
 			& .avatar {
 				transition: opacity 0.5s;
@@ -672,6 +671,20 @@
 			}
 		}
 	}
+
+	&__upload-label {
+		display: block;
+		background: #e1e5e8;
+		color: #2d343d;
+		cursor: pointer;
+	}
+
+	&__upload-icon {
+		height: 48px;
+		width: 48px;
+		padding: 12px;
+		fill: currentColor;
+	}
 }
 
 .rc-form-group {
diff --git a/packages/rocketchat-ui-account/client/accountFlex.html b/packages/rocketchat-ui-account/client/accountFlex.html
index 1e6b2afbfa1..01ec9d17bf6 100644
--- a/packages/rocketchat-ui-account/client/accountFlex.html
+++ b/packages/rocketchat-ui-account/client/accountFlex.html
@@ -17,10 +17,6 @@
 					{{> sidebarItem menuItem "Profile" "user" "account" "profile" }}
 				{{/if}}
 
-				{{#if allowUserAvatarChange}}
-					{{> sidebarItem menuItem "Avatar" "user-rounded" "changeAvatar" "" }}
-				{{/if}}
-
 				{{> sidebarItem menuItem "Security" "lock" "account" "security" }}
 			</ul>
 		</div>
diff --git a/packages/rocketchat-ui-account/client/accountProfile.html b/packages/rocketchat-ui-account/client/accountProfile.html
index d4be7c0c016..5c5bcbd0a32 100644
--- a/packages/rocketchat-ui-account/client/accountProfile.html
+++ b/packages/rocketchat-ui-account/client/accountProfile.html
@@ -1,10 +1,14 @@
 <template name="avatarService">
-	<div class="rc-select-avatar__list__item rc-tooltip js-select-avatar" aria-label="{{name}}">
+	<div class="rc-select-avatar__list-item rc-tooltip js-select-avatar" aria-label="{{name}}">
 		{{#if suggestion}}
 			{{> avatar url=suggestion.blob}}
 		{{/if}}
 		{{#if service}}
-			{{name}}
+			<div class="rc-select-avatar__upload-label avatar">
+				<svg class="rc-select-avatar__upload-icon">
+					<use href="#icon-{{name.toLowerCase}}"></use>
+				</svg>
+			</div>
 		{{/if}}
 	</div>
 </template>
@@ -35,14 +39,18 @@
 								</div>
 									{{#if suggestions.ready}}
 										<div class="rc-select-avatar__list">
-											<div class="rc-select-avatar__list__item rc-tooltip js-select-avatar-initials" aria-label="Username initials">
+											<div class="rc-select-avatar__list-item rc-tooltip js-select-avatar-initials" aria-label="Username initials">
 												{{> avatar username=initialsUsername }}
 											</div>
-											<div class="rc-select-avatar__list__item rc-tooltip js-select-avatar-upload" aria-label="upload file">
-												<label class="avatar tertiary-background-color question-mark icon-upload" for="upload-avatar"></label>
+											<div class="rc-select-avatar__list-item rc-tooltip js-select-avatar-upload" aria-label="upload file">
+												<label class="rc-select-avatar__upload-label avatar" for="upload-avatar">
+													<svg class="rc-select-avatar__upload-icon">
+														<use href="#icon-upload"></use>
+													</svg>
+												</label>
 												<input type="file" name="" value="" id="upload-avatar" style="display:none;">
 											</div>
-											{{# each service in services}}
+											{{#each service in services}}
 												{{ > avatarService service}}
 											{{/each}}
 										</div>
diff --git a/packages/rocketchat-ui-master/public/icons.svg b/packages/rocketchat-ui-master/public/icons.svg
index fe2dd6837a0..aade33432fe 100644
--- a/packages/rocketchat-ui-master/public/icons.svg
+++ b/packages/rocketchat-ui-master/public/icons.svg
@@ -23,4 +23,11 @@
     <symbol id="icon-computer" viewBox="0 0 16 14"><g stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M1 1h14v9H1z"/><path d="M5.5 13h5" stroke-linecap="square"/></g></symbol>
     <symbol id="icon-audio" viewBox="0 0 16 14"><g stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M1 3.345h1.967S4.027 1 7 1v12c-2.874 0-4.033-2.345-4.033-2.345H1v-7.31zM11.106 10.426A6.968 6.968 0 0 0 12 7a6.968 6.968 0 0 0-.894-3.426M13.595 12.383A10.95 10.95 0 0 0 15 7c0-1.956-.51-3.792-1.405-5.383"/></g></symbol>
     <symbol id="icon-video" viewBox="0 0 17 13"><g stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M1 4h10v8H1zM11 6.376l4.048-1.314c.526-.171.952.137.952.69v4.494c0 .552-.426.862-.952.69L11 9.624V6.376z"/><path d="M3.5 1h5" stroke-linecap="square"/></g></symbol>
-</svg>
\ No newline at end of file
+    <symbol id="icon-upload" viewBox="0 0 512 512"><path d="M452 432c0 11-9 20-20 20s-20-9-20-20 9-20 20-20 20 9 20 20zm-84-20c-11 0-20 9-20 20s9 20 20 20 20-9 20-20-9-20-20-20zm144-48v104c0 24.3-19.7 44-44 44H44c-24.3 0-44-19.7-44-44V364c0-24.3 19.7-44 44-44h124v-99.3h-52.7c-35.6 0-53.4-43.1-28.3-68.3L227.7 11.7c15.6-15.6 40.9-15.6 56.6 0L425 152.4c25.2 25.2 7.3 68.3-28.3 68.3H344V320h124c24.3 0 44 19.7 44 44zM200 188.7V376c0 4.4 3.6 8 8 8h96c4.4 0 8-3.6 8-8V188.7h84.7c7.1 0 10.7-8.6 5.7-13.7L261.7 34.3c-3.1-3.1-8.2-3.1-11.3  0L109.7 175c-5 5-1.5 13.7 5.7 13.7H200zM480 364c0-6.6-5.4-12-12-12H344v24c0 22.1-17.9 40-40 40h-96c-22.1 0-40-17.9-40-40v-24H44c-6.6 0-12 5.4-12 12v104c0 6.6 5.4 12 12 12h424c6.6 0 12-5.4 12-12V364z"/></symbol>
+    <symbol id="icon-facebook" viewBox="0 0 448 512"><path d="M448 56.7v398.5c0 13.7-11.1 24.7-24.7 24.7H309.1V306.5h58.2l8.7-67.6h-67v-43.2c0-19.6 5.4-32.9 33.5-32.9h35.8v-60.5c-6.2-.8-27.4-2.7-52.2-2.7-51.6 0-87 31.5-87 89.4v49.9h-58.4v67.6h58.4V480H24.7C11.1 480 0 468.9 0 455.3V56.7C0 43.1 11.1 32 24.7 32h398.5c13.7 0 24.8 11.1 24.8 24.7z"/></symbol>
+    <symbol id="icon-github" viewBox="0 0 496 512"><path d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"/></symbol>
+    <symbol id="icon-gitlab" viewBox="0 0 512 512"><path d="M29.782 199.732L256 493.714 8.074 309.699c-6.856-5.142-9.712-13.996-7.141-21.993l28.849-87.974zm75.405-174.806c-3.142-8.854-15.709-8.854-18.851 0L29.782 199.732h131.961L105.187 24.926zm56.556 174.806L256 493.714l94.257-293.982H161.743zm349.324 87.974l-28.849-87.974L256 493.714l247.926-184.015c6.855-5.142 9.711-13.996 7.141-21.993zm-85.404-262.78c-3.142-8.854-15.709-8.854-18.851 0l-56.555 174.806h131.961L425.663 24.926z"/></symbol>
+    <symbol id="icon-google" viewBox="0 0 488 512"><path d="M488 261.8C488 403.3 391.1 504 248 504 110.8 504 0 393.2 0 256S110.8 8 248 8c66.8 0 123 24.5 166.3 64.9l-67.5 64.9C258.5 52.6 94.3 116.6 94.3 256c0 86.5 69.1 156.6 153.7 156.6 98.2 0 135-70.4 140.8-106.9H248v-85.3h236.1c2.3 12.7 3.9 24.9 3.9 41.4z"/></symbol>
+    <symbol id="icon-linkedin" viewBox="0 0 448 512"><path d="M416 32H31.9C14.3 32 0 46.5 0 64.3v383.4C0 465.5 14.3 480 31.9 480H416c17.6 0 32-14.5 32-32.3V64.3c0-17.8-14.4-32.3-32-32.3zM135.4 416H69V202.2h66.5V416zm-33.2-243c-21.3 0-38.5-17.3-38.5-38.5S80.9 96 102.2 96c21.2 0 38.5 17.3 38.5 38.5 0 21.3-17.2 38.5-38.5 38.5zm282.1 243h-66.4V312c0-24.8-.5-56.7-34.5-56.7-34.6 0-39.9 27-39.9 54.9V416h-66.4V202.2h63.7v29.2h.9c8.9-16.8 30.6-34.5 62.9-34.5 67.2 0 79.7 44.3 79.7 101.9V416z"/></symbol>
+    <symbol id="icon-twitter" viewBox="0 0 512 512"><path d="M443.8 159.7c.3 4.2.3 8.4.3 12.6 0 128.1-97.5 275.7-275.7 275.7-54.9 0-105.9-15.9-148.8-43.5 7.8.9 15.3 1.2 23.4 1.2 45.3 0 87-15.3 120.3-41.4-42.6-.9-78.3-28.8-90.6-67.2 6 .9 12 1.5 18.3 1.5 8.7 0 17.4-1.2 25.5-3.3-44.4-9-77.7-48-77.7-95.1V199c12.9 7.2 27.9 11.7 43.8 12.3-26.1-17.4-43.2-47.1-43.2-80.7 0-18 4.8-34.5 13.2-48.9 47.7 58.8 119.4 97.2 199.8 101.4-1.5-7.2-2.4-14.7-2.4-22.2 0-53.4 43.2-96.9 96.9-96.9 27.9 0 53.1 11.7 70.8 30.6 21.9-4.2 42.9-12.3 61.5-23.4-7.2 22.5-22.5 41.4-42.6 53.4 19.5-2.1 38.4-7.5 55.8-15-13.2 19.2-29.7 36.3-48.6 50.1z"/></symbol>
+</svg>
diff --git a/packages/rocketchat-ui/client/views/app/burger.html b/packages/rocketchat-ui/client/views/app/burger.html
index 2ae6d163307..0b7cdcacc48 100644
--- a/packages/rocketchat-ui/client/views/app/burger.html
+++ b/packages/rocketchat-ui/client/views/app/burger.html
@@ -1,5 +1,5 @@
 <template name="burger">
-	<div class="burger {{isMenuOpen}}">
+	<div class="rc-old burger {{isMenuOpen}}">
 		<i></i>
 		<i></i>
 		<i></i>