summaryrefslogtreecommitdiffstats
path: root/webapp/sass/routes
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-03-30 12:46:47 -0400
committerCorey Hulen <corey@hulen.com>2017-03-30 09:46:47 -0700
commit689cac535e45c47a4f603b236dc129dd456efcc9 (patch)
tree767ef80b310d6d073840bd5216da38c439f6e193 /webapp/sass/routes
parent9a9729f22fea7275637eafb4046900c9f372ec56 (diff)
downloadchat-689cac535e45c47a4f603b236dc129dd456efcc9.tar.gz
chat-689cac535e45c47a4f603b236dc129dd456efcc9.tar.bz2
chat-689cac535e45c47a4f603b236dc129dd456efcc9.zip
PLT-2713/PLT-6028 Added System Users list to System Console (#5882)
* PLT-2713 Added ability for admins to list users not in any team * Updated style of unit test * Split SearchableUserList to give better control over its properties * Added users without any teams to the user store * Added ManageUsers page * Renamed ManageUsers to SystemUsers * Added ability to search by user id in SystemUsers page * Added SystemUsersDropdown * Removed unnecessary injectIntl * Created TeamUtils * Reduced scope of system console heading CSS * Added team filter to TeamAnalytics page * Updated admin console sidebar * Removed unnecessary TODO * Removed unused reference to deleted modal * Fixed system console sidebar not scrolling on first load * Fixed TeamAnalytics page not rendering on first load * Fixed chart.js throwing an error when switching between teams * Changed TeamAnalytics header to show the team's display name * Fixed appearance of TeamAnalytics and SystemUsers on small screen widths * Fixed placement of 'No users found' message * Fixed teams not appearing in SystemUsers on first load * Updated user count text for SystemUsers * Changed search by id fallback to trigger less often * Fixed SystemUsers list items not updating when searching * Fixed localization strings for SystemUsers page
Diffstat (limited to 'webapp/sass/routes')
-rw-r--r--webapp/sass/routes/_admin-console.scss25
-rw-r--r--webapp/sass/routes/_statistics.scss26
2 files changed, 50 insertions, 1 deletions
diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss
index 56199a545..bf8aba6cc 100644
--- a/webapp/sass/routes/_admin-console.scss
+++ b/webapp/sass/routes/_admin-console.scss
@@ -28,7 +28,6 @@
}
h3 {
- border-bottom: 1px solid alpha-color($black, .1);
font-weight: 600;
margin: 1em 0;
padding-bottom: .5em;
@@ -276,6 +275,10 @@
@include opacity(.7);
margin-top: 8px;
}
+
+ .admin-console-header {
+ border-bottom: 1px solid alpha-color($black, .1);
+ }
}
.brand-img {
@@ -478,3 +481,23 @@
white-space: nowrap;
width: 130px;
}
+
+.system-users__filter-row {
+ display: flex;
+ margin-left: 15px;
+ margin-right: 15px;
+
+ .system-users__filter {
+ flex: 1;
+ margin-right: 15px;
+ }
+
+ .system-users__team-filter-label {
+ margin-right: 15px;
+ }
+
+ .system-users__team-filter {
+ display: inline-block;
+ width: 200px
+ }
+}
diff --git a/webapp/sass/routes/_statistics.scss b/webapp/sass/routes/_statistics.scss
index 797bc480b..5a35039e7 100644
--- a/webapp/sass/routes/_statistics.scss
+++ b/webapp/sass/routes/_statistics.scss
@@ -83,4 +83,30 @@
}
}
}
+
+ .team-statistics__header-row {
+ display: flex;
+ margin-bottom: 1.5em;
+ margin-top: 1.5em;
+ }
+
+ .team-statistics__header {
+ display: inline-block;
+ flex: 1;
+ margin-right: 15px;
+ overflow: hidden;
+ padding-bottom: .5em;
+
+ > h3 {
+ margin: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+ }
+
+ .team-statistics__team-filter {
+ display: inline-block;
+ width: 200px;
+ }
}