From d00bacb20d893aceb9c9d0fa11a6716dde7d005d Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Fri, 21 Apr 2017 02:10:29 -0300
Subject: [PATCH] Rollback span elements to label & apply correct styling

---
 packages/rocketchat-theme/client/imports/base.less          | 2 +-
 .../rocketchat-ui-sidenav/client/createCombinedFlex.html    | 6 +++---
 packages/rocketchat-ui-sidenav/client/createCombinedFlex.js | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/base.less b/packages/rocketchat-theme/client/imports/base.less
index b6c1c363391..c06687ef4d9 100644
--- a/packages/rocketchat-theme/client/imports/base.less
+++ b/packages/rocketchat-theme/client/imports/base.less
@@ -1302,7 +1302,7 @@ label.required::after {
 		&.toggle {
 			font-size: 0;
 
-			> span {
+			> label {
 				display: inline-block;
 				width: calc(~"100% - 40px");
 				font-size: 14px;
diff --git a/packages/rocketchat-ui-sidenav/client/createCombinedFlex.html b/packages/rocketchat-ui-sidenav/client/createCombinedFlex.html
index acc8e323098..bce0f833097 100644
--- a/packages/rocketchat-ui-sidenav/client/createCombinedFlex.html
+++ b/packages/rocketchat-ui-sidenav/client/createCombinedFlex.html
@@ -8,18 +8,18 @@
 		<div class="wrapper">
 			<h4>{{_ "Create_new" }}</h4>
 			<div class="input-line no-icon">
-				<span>{{_ "Name"}}</span>
+				<label for="channel-name">{{_ "Name"}}</label>
 				<input type="text" id="channel-name" class="required" dir="auto" placeholder="{{_ 'Enter_name_here'}}">
 			</div>
 			<div class="input-line toggle">
-				<span>{{_ "Private"}}</span>
+				<label for="channel-type">{{_ "Private"}}</label>
 				<div class="input checkbox toggle">
 					<input type="checkbox" id="channel-type" {{privateSwitchDisabled}} {{privateSwitchChecked}}>
 					<label class="color-tertiary-font-color" for="channel-type"></label>
 				</div>
 			</div>
 			<div class="input-line toggle">
-				<span>{{_ "Read_only_channel"}}</span>
+				<label for="channel-ro">{{_ "Read_only_channel"}}</label>
 				<div class="input checkbox toggle">
 					<input type="checkbox" id="channel-ro">
 					<label class="color-tertiary-font-color" for="channel-ro"></label>
diff --git a/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js b/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js
index 8f17225e968..4d4c16a39ab 100644
--- a/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js
+++ b/packages/rocketchat-ui-sidenav/client/createCombinedFlex.js
@@ -111,7 +111,6 @@ Template.createCombinedFlex.events({
 		if (!err) {
 			return Meteor.call(createRoute, name, instance.selectedUsers.get(), readOnly, function(err, result) {
 				if (err) {
-					console.log(err);
 					if (err.error === 'error-invalid-name') {
 						instance.error.set({ invalid: true });
 						return;
@@ -137,7 +136,6 @@ Template.createCombinedFlex.events({
 				return FlowRouter.go(successRoute, { name }, FlowRouter.current().queryParams);
 			});
 		} else {
-			console.log(err);
 			return instance.error.set({ fields: err });
 		}
 	}