reverting @engelgabriel commits

RocketChat · Feb 20, 2018 · 01a9123 · 01a9123
1 parent 66e5626
commit 01a9123
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 100 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -149,12 +149,12 @@ rocketchat:version
 rocketchat:videobridge
 rocketchat:webrtc
 rocketchat:wordpress
-rocketchat:nrr
 
 konecty:change-case
 konecty:delayed-task
 konecty:mongo-counter
 konecty:multiple-instances-status
+konecty:nrr
 konecty:user-presence
 
 deepwell:bootstrap-datepicker2

diff --git a/.meteor/versions b/.meteor/versions
@@ -69,6 +69,7 @@ konecty:[email protected]
 konecty:[email protected]
 konecty:[email protected]_3
 konecty:[email protected]
+konecty:[email protected]
 konecty:[email protected]
 [email protected]
 [email protected]
@@ -190,7 +191,6 @@ rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]_3
-rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -801,7 +801,7 @@
   "GoogleVision_Type_Properties": "Properties (Color) Detection",
   "GoogleVision_Type_SafeSearch": "SafeSearch Detection",
   "GoogleVision_Type_Similar": "Search Similar Images",
-  "Group_by_Type": "Group by Type",
+  "Group_by_categories": "Group by categories",
   "Group_mentions_only": "Group mentions only",
   "Guest_Pool": "Guest Pool",
   "Hash": "Hash",

diff --git a/packages/rocketchat-nrr/README.md b/packages/rocketchat-nrr/README.md
diff --git a/packages/rocketchat-nrr/nrr.js b/packages/rocketchat-nrr/nrr.js
diff --git a/packages/rocketchat-nrr/package.js b/packages/rocketchat-nrr/package.js
diff --git a/packages/rocketchat-theme/client/imports/components/header.css b/packages/rocketchat-theme/client/imports/components/header.css
@@ -194,7 +194,7 @@
 		cursor: pointer;
 		transition: all 0.3s;
 
-		font-size: 18px;
+		font-size: 24px;
 		align-items: center;
 
 		&.active,

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -142,7 +142,7 @@
 		width: var(--sidebar-item-user-status-size);
 		height: var(--sidebar-item-user-status-size);
 
-		margin: 0 7px 0 7px;
+		margin: 0 7px 0 3px;
 
 		border-radius: var(--sidebar-item-user-status-radius);
 
@@ -210,6 +210,8 @@
 
 		flex: 1;
 
+		margin: 0 3px;
+
 		white-space: nowrap;
 		text-overflow: ellipsis;
 

diff --git a/packages/rocketchat-theme/client/imports/general/base.css b/packages/rocketchat-theme/client/imports/general/base.css
@@ -118,7 +118,7 @@ button {
 .rc-icon {
 	overflow: hidden;
 
-	width: 1.25em;
+	width: 1em;
 	height: 1em;
 
 	vertical-align: -0.15em;

diff --git a/packages/rocketchat-ui-sidenav/client/sortlist.html b/packages/rocketchat-ui-sidenav/client/sortlist.html
@@ -7,7 +7,7 @@
 					<span class="rc-popover__icon">
 						{{> icon block="rc-popover__icon-element" icon='sort-amount-down' }}
 					</span>
-					<span class="rc-popover__item-text">{{_ "Group_by_Type"}}</span>
+					<span class="rc-popover__item-text">{{_ "Group_by_categories"}}</span>
 				</label>
 			</li>
 			{{#if favorite}}