From f7b04f0f275cb70e8dc045a1257cedade81e6a8e Mon Sep 17 00:00:00 2001 From: hmhealey Date: Thu, 25 Feb 2016 11:25:16 -0500 Subject: Merged contents of MoreDirectChannelsModal and ChannelMembersModal into UserList --- web/sass-files/sass/partials/_modal.scss | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'web/sass-files/sass') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 09c366c77..6144dc611 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -434,3 +434,25 @@ max-height: 150px; } } + +.user-list { + display: flex; + flex-direction: column; + + .profile-img { + width: 38px; + height: 38px; + flex-grow: 0; + flex-shrink: 0; + } + + .user-list-item__details { + flex-grow: 1; + flex-shrink: 1; + } + + .user-list-item__actions { + flex-grow: 0; + flex-shrink: 0; + } +} -- cgit v1.2.3-1-g7c22 From f7c943e60a1b07817f7673e00f9498d6666e90d3 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Fri, 26 Feb 2016 11:16:43 -0500 Subject: Fixed overflowing details fields in UserList --- web/sass-files/sass/partials/_modal.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'web/sass-files/sass') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 6144dc611..adf916775 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -446,9 +446,20 @@ flex-shrink: 0; } + .user-list-item__details { flex-grow: 1; flex-shrink: 1; + overflow:hidden; + text-overflow: ellipsis; + + .more-name { + white-space: nowrap; + } + + .more-description { + white-space: nowrap; + } } .user-list-item__actions { -- cgit v1.2.3-1-g7c22 From fe217988724c5c74fc02c34180eab504a4d906c1 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Sat, 27 Feb 2016 11:04:24 -0500 Subject: Changed TeamMembersModal to use UserList --- web/sass-files/sass/partials/_modal.scss | 5 +++++ web/sass-files/sass/partials/_settings.scss | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'web/sass-files/sass') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index adf916775..d8979c607 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -9,6 +9,7 @@ } .more-table { margin: 0; + table-layout: fixed; p { font-size: 0.9em; overflow: hidden; @@ -55,8 +56,12 @@ &.td--action { text-align: right; padding: 8px 15px 8px 8px; + width: 80px; vertical-align: middle; position: relative; + &.lg { + width: 110px; + } } } } diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 8508ce6fc..99b564fe5 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -399,10 +399,6 @@ h3 { } .member-role, .member-drop { - position:absolute; - right: 15px; - top: 8px; - .fa { margin-right: 5px; @include opacity(0.5); @@ -413,7 +409,6 @@ h3 { top: -50%; right: 110%; } - } .member-invite { -- cgit v1.2.3-1-g7c22 From 62c09209430e74fb0863cd998497f6ef1c475342 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Wed, 2 Mar 2016 16:10:14 -0500 Subject: Fixed max height for all modals using FilteredUserLists --- web/sass-files/sass/partials/_modal.scss | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'web/sass-files/sass') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index d8979c607..fc4c13038 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -403,7 +403,6 @@ overflow-y: auto; overflow-x: hidden; margin-top: 10px; - max-height: 500px; position: relative; } @@ -451,7 +450,6 @@ flex-shrink: 0; } - .user-list-item__details { flex-grow: 1; flex-shrink: 1; @@ -472,3 +470,18 @@ flex-shrink: 0; } } + +.filtered-user-list { + display: flex; + flex-direction: column; + + .filter-row { + flex-grow: 0; + flex-shrink: 0; + } + + .user-list { + flex-grow: 1; + flex-shrink: 1; + } +} -- cgit v1.2.3-1-g7c22 From 48eac58eaacba075f3b7ef518d0312b5f7ab3c17 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Wed, 2 Mar 2016 17:11:51 -0500 Subject: Fixed warnings and removed injectIntl from System Console user list --- web/sass-files/sass/partials/_modal.scss | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'web/sass-files/sass') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index fc4c13038..ca83c77da 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -53,16 +53,6 @@ &.padding--equal { padding: 8px; } - &.td--action { - text-align: right; - padding: 8px 15px 8px 8px; - width: 80px; - vertical-align: middle; - position: relative; - &.lg { - width: 110px; - } - } } } } -- cgit v1.2.3-1-g7c22 From 449f1000e999c409f754724cb998f0b9f90cdd59 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Wed, 2 Mar 2016 17:17:58 -0500 Subject: Fixed system console user list dropdown --- web/sass-files/sass/partials/_admin-console.scss | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'web/sass-files/sass') diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss index dc8b950e4..f782da36b 100644 --- a/web/sass-files/sass/partials/_admin-console.scss +++ b/web/sass-files/sass/partials/_admin-console.scss @@ -235,4 +235,12 @@ } } } + + .member-list-holder { + .member-role, .member-drop { + position: absolute; + right: 15px; + top: 8px; + } + } } -- cgit v1.2.3-1-g7c22