support for octicons

.meteor/packages

@@ -103,3 +103,4 @@ ejson
 spacebars
 check
 rocketchat:github-enterprise
+rocketchat:chatops

client/routes/roomRoute.coffee

@@ -51,12 +51,12 @@ openRoom = (type, name) ->
 				, 100
 
 			RocketChat.TabBar.resetButtons()
-			RocketChat.TabBar.addButton({ id: 'message-search', title: t('Search'), icon: 'icon-search', template: 'messageSearch', order: 1 })
+			RocketChat.TabBar.addButton({ id: 'message-search', title: t('Search'), icon: 'octicon octicon-search', template: 'messageSearch', order: 1 })
 			if type is 'd'
-				RocketChat.TabBar.addButton({ id: 'members-list', title: t('User_Info'), icon: 'icon-user', template: 'membersList', order: 2 })
+				RocketChat.TabBar.addButton({ id: 'members-list', title: t('User_Info'), icon: 'octicon octicon-person', template: 'membersList', order: 2 })
 			else
-				RocketChat.TabBar.addButton({ id: 'members-list', title: t('Members_List'), icon: 'icon-users', template: 'membersList', order: 2 })
-			RocketChat.TabBar.addButton({ id: 'uploaded-files-list', title: t('Room_uploaded_file_list'), icon: 'icon-download', template: 'uploadedFilesList', order: 3 })
+				RocketChat.TabBar.addButton({ id: 'members-list', title: t('Members_List'), icon: 'octicon octicon-organization', template: 'membersList', order: 2 })
+			RocketChat.TabBar.addButton({ id: 'uploaded-files-list', title: t('Room_uploaded_file_list'), icon: 'octicon octicon-file-symlink-directory', template: 'uploadedFilesList', order: 3 })
 
 			# update user's room subscription
 			if ChatSubscription.findOne({rid: room._id})?.open is false

client/stylesheets/base.less

@@ -5,6 +5,7 @@
 @import "utils/_preloader.import.less";
 @import "utils/_emojione.import.less";
 @import "utils/_fonts.import.less";
+@import "utils/_octicons.less";
 .clearfix {
 	clear: both;
 	&::after {
@@ -265,9 +266,9 @@ blockquote {
 		margin-bottom: 0;
 	}
 	&.search {
-		.icon-search {
+		.octicon {
 			position: absolute;
-			left: 5px;
+			left: 10px;
 			top: 10px;
 			font-weight: 400;
 		}
@@ -295,7 +296,7 @@ blockquote {
 			animation-timing-function: linear;
 		}
 		input {
-			padding-left: 25px;
+			padding-left: 20px;
 		}
 	}
 	> label {
@@ -2591,6 +2592,7 @@ a.github-fork {
 		padding: 10px;
 		background: #FCFCFC;
 		border-bottom: 1px solid #eaeaea;
+		text-align: center;
 
 		&:hover {
 			background: #EAEAEA;
@@ -2600,6 +2602,7 @@ a.github-fork {
 			background-color: #F4F4F4;
 			margin-left: -1px;
 			padding-left: 11px;
+			border-right: 3px solid #ff0000;
 		}
 	}
 }

client/views/app/tabBar/messageSearch.html

@@ -4,7 +4,7 @@
 			<form class="search-form" role="form">
 				<div class="input-line search">
 					<input type="text" id="message-search" class="search" placeholder="{{tSearchMessages}}" autocomplete="off" />
-					<i class="icon-search"></i>
+					<i class="octicon octicon-chevron-right"></i>
 				</div>
 			</form>
 		</div>
@@ -16,4 +16,4 @@
 		</ul>
 		{{/if}}
 	</div>
-</template>
+</template>

packages/rocketchat-chatops/client/tabBar.coffee

@@ -14,7 +14,7 @@ Meteor.startup ->
 		RocketChat.TabBar.addButton
 			id: 'chatops-button2'
 			i18nTitle: 'rocketchat-chatops:Chatops_Title'
-			icon: 'icon-cube'
+			icon: 'octicon octicon-hubot'
 			template: 'chatops-dynamicUI'
 			order: 4
 
@@ -22,7 +22,7 @@ Meteor.startup ->
 		RocketChat.TabBar.addButton
 			id: 'chatops-button3'
 			i18nTitle: 'rocketchat-chatops:Chatops_Title'
-			icon: 'icon-code'
+			icon: 'octicon octicon-inbox'
 			template: 'chatops_codemirror'
 			width: 675
 			order: 5