From 88cccc41ee0c0e89396a7ff3cf31de5208499839 Mon Sep 17 00:00:00 2001 From: JaeeunCho Date: Mon, 10 Apr 2017 12:32:48 -0700 Subject: [PATCH 1/4] HTML5 - fixed size for userName --- .../imports/ui/components/app/styles.scss | 13 ++++++++----- .../components/user-list/chat-list-item/styles.scss | 2 ++ .../components/user-list/user-list-item/styles.scss | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bigbluebutton-html5/imports/ui/components/app/styles.scss b/bigbluebutton-html5/imports/ui/components/app/styles.scss index 5361f93962..68c5cf7a05 100755 --- a/bigbluebutton-html5/imports/ui/components/app/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/app/styles.scss @@ -21,7 +21,7 @@ $bars-padding: $lg-padding-x - .45rem; // -.45 so user-list and chat title is al } .wrapper { - position: relative; + //position: relative; display: flex; flex: 1; flex-direction: column; @@ -51,8 +51,6 @@ $bars-padding: $lg-padding-x - .45rem; // -.45 so user-list and chat title is al } } - - .content { @extend %full-page; @@ -98,6 +96,8 @@ $bars-padding: $lg-padding-x - .45rem; // -.45 so user-list and chat title is al .userList { @extend %full-page; + @extend %text-elipsis; + z-index: 2; overflow: visible; @@ -149,11 +149,13 @@ $bars-padding: $lg-padding-x - .45rem; // -.45 so user-list and chat title is al .media { @extend %full-page; - flex: 1; - order: 1; + flex: 1 100%; + order: 2; @include mq($small-only) { padding-bottom: $actionsbar-height; + margin-bottom: $actionsbar-height; + position: absolute; } } @@ -164,6 +166,7 @@ $bars-padding: $lg-padding-x - .45rem; // -.45 so user-list and chat title is al } .actionsbar { + flex: 1; padding: $bars-padding; position: relative; order: 3; diff --git a/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/styles.scss index 3f8b454777..2820393099 100755 --- a/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/styles.scss @@ -54,6 +54,8 @@ .chatNameMain { @extend %no-margin; + @extend %text-elipsis; + font-size: 0.95rem; font-weight: 400; margin-left: $sm-padding-x; diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/styles.scss index efe211a9e5..80a1e0885d 100755 --- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/styles.scss @@ -155,6 +155,7 @@ .dropdownContent { cursor: default; min-width: 10vw; + width: $max-width; } .actionsHeader { From f9ead279543ec6814e310fba0d4acc3410d6386e Mon Sep 17 00:00:00 2001 From: Jaeeun Cho Date: Mon, 10 Apr 2017 15:40:41 -0400 Subject: [PATCH 2/4] Update styles.scss --- bigbluebutton-html5/imports/ui/components/app/styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigbluebutton-html5/imports/ui/components/app/styles.scss b/bigbluebutton-html5/imports/ui/components/app/styles.scss index 68c5cf7a05..24900cd3dd 100755 --- a/bigbluebutton-html5/imports/ui/components/app/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/app/styles.scss @@ -21,7 +21,7 @@ $bars-padding: $lg-padding-x - .45rem; // -.45 so user-list and chat title is al } .wrapper { - //position: relative; + position: relative; display: flex; flex: 1; flex-direction: column; From 74d693e3c50174112bfd3930430139d70555605e Mon Sep 17 00:00:00 2001 From: Jaeeun Cho Date: Mon, 10 Apr 2017 15:47:45 -0400 Subject: [PATCH 3/4] Update styles.scss --- .../imports/ui/components/user-list/user-list-item/styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/styles.scss index 80a1e0885d..fc05a13426 100755 --- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/styles.scss @@ -155,7 +155,7 @@ .dropdownContent { cursor: default; min-width: 10vw; - width: $max-width; + width: 20rem; } .actionsHeader { From 5099d4bca7aa3ced0726cdda5d1529d5d929b113 Mon Sep 17 00:00:00 2001 From: Jaeeun Cho Date: Mon, 24 Apr 2017 11:17:24 -0400 Subject: [PATCH 4/4] Update styles.scss --- .../imports/ui/components/user-list/user-list-item/styles.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/styles.scss index fc05a13426..635b055fc7 100755 --- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/styles.scss @@ -153,9 +153,10 @@ } .dropdownContent { + @extend %text-elipsis; cursor: default; min-width: 10vw; - width: 20rem; + max-width: 100%; } .actionsHeader {