Merge pull request #11575 from nextcloud/stb14-add-group-settings

[stable14] Add new group entry on users list + fixes
nextcloud · Oct 3, 2018 · 0ca305b · 0ca305b
2 parents 316a3a5 + 0c4e270
commit 0ca305b
Show file tree

Hide file tree

Showing 12 changed files with 300 additions and 309 deletions.
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
@@ -1377,21 +1377,6 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 
 /* USERS LIST -------------------------------------------------------------- */
 #body-settings {
-	#app-navigation {
-		/* Hack to override the javascript orderBy */
-		#usergrouplist > li {
-			order: 4;
-			&#everyone {
-				order:1;
-			}
-			&#admin {
-				order:2;
-			}
-			&#disabled {
-				order:3;
-			}
-		}
-	}
 	$grid-row-height: 46px;
 	#app-content.user-list-grid {
 		display: grid;

diff --git a/settings/js/settings-vue.js b/settings/js/settings-vue.js
diff --git a/settings/js/settings-vue.js.map b/settings/js/settings-vue.js.map
diff --git a/settings/package-lock.json b/settings/package-lock.json