Skip to content

Commit

Permalink
Improve premeeting screens ux (jitsi#9726)
Browse files Browse the repository at this point in the history
* feat(prejoin) move invite to toolbar section

* feat(premeeting) redesign prejoin and lobby screens

* code review changes

* fix prejoin flicker and avatar id

* fix password error message and native lobby dialog close position
  • Loading branch information
quitrk authored and horymury committed Aug 25, 2021
1 parent 068cf13 commit 45e51c1
Show file tree
Hide file tree
Showing 56 changed files with 858 additions and 800 deletions.
10 changes: 0 additions & 10 deletions css/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -206,13 +206,3 @@
bottom: 0;
width: 35%;
}

/**
* Resizes elements width to fill the whole screen width with some margin
*/
@mixin adjust-for-max-width($width, $margin) {
@media (max-width: $width) {
margin: 0 $margin;
width: $width - 2 * $margin;
}
}
153 changes: 0 additions & 153 deletions css/_prejoin.scss

This file was deleted.

2 changes: 1 addition & 1 deletion css/_toolbars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
border-radius: 0;
display: flex;
justify-content: space-evenly;
padding: 6px 0;
padding: 8px 0;
width: 100%;
}

Expand Down
6 changes: 6 additions & 0 deletions css/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -264,3 +264,9 @@ $chromeExtensionBannerRightInMeeeting: 10px;
*/
$smallScreen: 700px;
$verySmallScreen: 500px;

/**
* Prejoin / premeeting screen
*/

$prejoinDefaultContentWidth: 336px;
6 changes: 1 addition & 5 deletions css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ $flagsImagePath: "../images/";
@import 'filmstrip/vertical_filmstrip';
@import 'filmstrip/vertical_filmstrip_overrides';
@import 'labels';
@import 'lobby';
@import 'unsupported-browser/main';
@import 'modals/invite/add-people';
@import 'deep-linking/main';
Expand All @@ -95,15 +94,12 @@ $flagsImagePath: "../images/";
@import 'meter';
@import 'audio-preview';
@import 'video-preview';
@import 'prejoin';
@import 'prejoin-dialog';
@import 'premeeting/main';
@import 'country-picker';
@import 'modals/invite/invite_more';
@import 'modals/security/security';
@import 'premeeting-screens';
@import 'e2ee';
@import 'responsive';
@import 'connection-status';
@import 'drawer';
@import 'participants-pane';
@import 'reactions-menu';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,32 +1,24 @@
.con-status {
border-radius: 6px;
color: #fff;
font-size: 12px;
letter-spacing: 0.16px;
line-height: 16px;
position: absolute;
top: 24px;
width: 100%;
z-index: $toolbarZ + 3;

&-container {
border-radius: 3px;
color: #fff;
font-size: 13px;
line-height: 13px;
margin: 0 auto;
width: 320px;

@include adjust-for-max-width(320px, 8px);
}

&-header {
background: rgba(28, 32, 37, .5);
background-color: rgba(0, 0, 0, 0.7);
align-items: center;
display: flex;
justify-content: space-between;
padding: 8px 12px;
}

&-circle {
border-radius: 50%;
display: inline-block;
padding: 4px;
margin: 8px;
margin-right: 16px;
}

&--good {
Expand All @@ -42,14 +34,7 @@
}

&-arrow {
height: 36px;
width: 36px;
border-radius: 3px;
margin-left: 8px;
margin-right: 2px;
display: flex;
align-items: center;
justify-content: center;
margin-left: auto;
transition: background-color 0.16s ease-out;

&--up {
Expand All @@ -70,7 +55,7 @@
}

&-details {
background: rgba(28, 32, 37, .5);
background-color: rgba(0, 0, 0, 0.7);
border-top: 1px solid #5E6D7A;
padding: 16px;
transition: opacity 0.16s ease-out;
Expand Down
35 changes: 35 additions & 0 deletions css/premeeting/_device-status.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
.device {
&-status {
align-items: center;
align-self: stretch;
color: #fff;
display: flex;
font-size: 14px;
font-weight: 400;
justify-content: center;
line-height: 20px;
margin-top: 8px;
padding: 6px;
text-align: center;
}

&-icon {
background-position: center;
background-repeat: no-repeat;
display: inline-block;
height: 16px;
margin-right: 10px;
width: 16px;

&--warning {
svg path {
fill: rgba(241, 173, 51, 1);
}
}
&--ok {
svg path {
fill: #189b55;
}
}
}
}
29 changes: 16 additions & 13 deletions css/_lobby.scss → css/premeeting/_lobby.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
#lobby-screen {
.content {
.lobby-screen {
font-size: 16px;
font-weight: 400;
line-height: 26px;

.container {
align-items: center;
display: flex;
flex-direction: column;
&-content {
align-items: center;
display: flex;
flex-direction: column;

.spinner {
margin: 30px;
}
.spinner {
margin: 8px;
}

.joining-message {
margin: 10px;
}
.joining-message {
color: white;
margin: 24px auto;
text-align: center;
}
}
}
Expand Down Expand Up @@ -68,7 +71,7 @@

button {
align-self: stretch;
margin: 8px 0;
margin-bottom: 8px 0;
padding: 12px;
transition: .2s transform ease;

Expand Down
7 changes: 7 additions & 0 deletions css/premeeting/_main.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@import 'connection-status';
@import 'device-status';
@import 'lobby';
@import 'premeeting-screens';
@import 'prejoin';
@import 'prejoin-dialog';
@import 'prejoin-third-party';
File renamed without changes.
Loading

0 comments on commit 45e51c1

Please sign in to comment.