Commit 08999508 by talequale

call screen & position selection style

parent 9c37b125
...@@ -24,6 +24,8 @@ const store = window.store = new Store({ ...@@ -24,6 +24,8 @@ const store = window.store = new Store({
/*{text: 'Office User Right', value: 'OfficeUserRight'}, /*{text: 'Office User Right', value: 'OfficeUserRight'},
{text: 'Office User Left', value: 'OfficseUserLeft'},*/ {text: 'Office User Left', value: 'OfficseUserLeft'},*/
], ],
tableComponentHeadlineText: 'Choose your role and seat'
}); });
......
...@@ -70,6 +70,20 @@ body { ...@@ -70,6 +70,20 @@ body {
margin-left: 16px; margin-left: 16px;
cursor: pointer; cursor: pointer;
} }
.bottom-buttons {
display: flex;
justify-content: space-between;
align-items: center;
margin: auto 0;
width: 100%;
}
.bottom-buttons .button {
margin: 0;
min-width: 160px;
}
.button.primary { .button.primary {
background: #584DDA; background: #584DDA;
color: #fff; color: #fff;
...@@ -167,9 +181,21 @@ input[type="text"]:focus { ...@@ -167,9 +181,21 @@ input[type="text"]:focus {
width: 100%; width: 100%;
max-width: 1124px; max-width: 1124px;
} }
.content-fullpage {
flex-grow: 1;
display: flex;
flex-direction: column;
}
.block { .block {
margin-bottom: 40px; margin-bottom: 40px;
} }
.content > .block:first-child {
padding-top: 60px;
}
.header { .header {
font-size: 32px; font-size: 32px;
margin-bottom: 8px; margin-bottom: 8px;
...@@ -257,9 +283,9 @@ input[type="text"]:focus { ...@@ -257,9 +283,9 @@ input[type="text"]:focus {
display: block; display: block;
} }
.canvas-resizer { .canvas-resizer {
float: right; /*float: right;*/
position: relative; position: relative;
top: 66px; /*top: 66px;*/
} }
.description.gray { .description.gray {
color: #5C5C5C; color: #5C5C5C;
...@@ -267,4 +293,4 @@ input[type="text"]:focus { ...@@ -267,4 +293,4 @@ input[type="text"]:focus {
.description { .description {
font-size: 14px; font-size: 14px;
line-height: 24px; line-height: 24px;
} }
\ No newline at end of file
...@@ -107,7 +107,7 @@ Screen.Conference = function() { ...@@ -107,7 +107,7 @@ Screen.Conference = function() {
store.set('guestPosition'+currentCameraID, false); store.set('guestPosition'+currentCameraID, false);
var cameras = ['Left', 'Center', 'Right'] var cameras = ['Left', 'Center', 'Right']
var cameraCanvas, canvasResizerEl, var cameraCanvas, canvasResizerEl,
dom = D.div( { cls: 'block', style: { marginBottom: '80px' } }, dom = D.div( { cls: 'block camera-block', style: { marginBottom: '80px' } },
D.div( { cls: 'header' }, cameras[currentCameraID%3] + ' Camera' ), D.div( { cls: 'header' }, cameras[currentCameraID%3] + ' Camera' ),
canvasResizerEl = CanvasResizer( canvasResizerEl = CanvasResizer(
cameraCanvas = D.h( 'canvas', { cameraCanvas = D.h( 'canvas', {
...@@ -267,6 +267,7 @@ Screen.Conference = function() { ...@@ -267,6 +267,7 @@ Screen.Conference = function() {
} }
if( video1.videoWidth > 10 && store.get( 'videoinput' + currentCameraID ) ){ if( video1.videoWidth > 10 && store.get( 'videoinput' + currentCameraID ) ){
try{ try{
return;
await selfieSegmentation.send( { image: video1 } ); await selfieSegmentation.send( { image: video1 } );
}catch( e ){ }catch( e ){
...@@ -291,7 +292,7 @@ Screen.Conference = function() { ...@@ -291,7 +292,7 @@ Screen.Conference = function() {
D.h('button', {cls: ['button primary', {hidden: isConnected}], onclick: ()=>store.set('connection', true)}, 'Ready to connect') D.h('button', {cls: ['button primary', {hidden: isConnected}], onclick: ()=>store.set('connection', true)}, 'Ready to connect')
) )
), ),
content = D.div({cls: 'content'}, content = D.div({cls: 'content content-fullpage'},
D.div({cls: 'block'}, D.div({cls: 'block'},
D.div({cls: 'description gray'}, 'You are the host of this session'), D.div({cls: 'description gray'}, 'You are the host of this session'),
...@@ -507,4 +508,4 @@ Screen.Conference.beforeShow = function() { ...@@ -507,4 +508,4 @@ Screen.Conference.beforeShow = function() {
connection: false, connection: false,
callScreenCamerasTune: false callScreenCamerasTune: false
}); });
}; };
\ No newline at end of file
Screen.PositionSelect = function() { Screen.PositionSelect = function() {
return D.div({cls: [{ return D.div({cls: ['position-select', {
hidden: store.val('callScreenCamerasTune') hidden: store.val('callScreenCamerasTune')
}]}, }]},
D.div({cls: 'block'}, D.div({cls: 'block'},
...@@ -26,4 +26,4 @@ Screen.PositionSelect = function() { ...@@ -26,4 +26,4 @@ Screen.PositionSelect = function() {
}}, 'Exit to main menu') }}, 'Exit to main menu')
) )
); );
} }
\ No newline at end of file
...@@ -64,10 +64,14 @@ var TableComponent = function(cfg) { ...@@ -64,10 +64,14 @@ var TableComponent = function(cfg) {
); );
}; };
var tableComponentHeadlineText = store.get('tableComponentHeadlineText');
var tableComponentHeadline = D.div({cls: 'table-component-headline'}, tableComponentHeadlineText);
var roles = store.get(cfg.roles); var roles = store.get(cfg.roles);
var guestPositions = store.get(cfg.guestPositions); var guestPositions = store.get(cfg.guestPositions);
var dom = D.div({cls: 'table-component'}, var dom = D.div({cls: 'table-component'},
tableComponentHeadline,
RoleRow(roles[1], guestPositions, false), RoleRow(roles[1], guestPositions, false),
D.div({cls: 'table-component--table'}), D.div({cls: 'table-component--table'}),
RoleRow(roles[0], guestPositions, true) RoleRow(roles[0], guestPositions, true)
......
...@@ -8,17 +8,18 @@ ...@@ -8,17 +8,18 @@
} }
.canvas-resizer { .canvas-resizer {
display: none; display: none;
background-color: rgba(0, 0, 0, 0.1);
} }
.canvas-resizer canvas { .canvas-resizer canvas {
cursor: ew-resize; cursor: ew-resize;
} }
.canvas-resizer--mover-left { .canvas-resizer--mover-left {
left: 0; left: 0;
width: 0px; width: 0;
border-right: 2px solid #594CD7; border-right: 2px solid #594CD7;
} }
.canvas-resizer--mover-right { .canvas-resizer--mover-right {
right: 0; right: 0;
width: 0px; width: 0;
border-left: 2px solid #594CD7; border-left: 2px solid #594CD7;
} }
\ No newline at end of file
.position-select {
flex-grow: 1;
display: flex;
flex-direction: column;
}
.table-component {
display: flex;
flex-direction: column;
}
.table-component-headline {
margin: 40px 0 30px;
font-weight: 700;
font-size: 24px;
line-height: 1.33;
}
.table-component--table { .table-component--table {
position: relative; position: relative;
border-radius: 24px; border-radius: 24px;
width: 264px; width: 262px;
height: 80px; height: 77px;
border: 1px solid #5C5C5C; border: 1px solid #5C5C5C;
} }
.table-component--guest-row { .table-component--guest-row {
display: flex;
justify-content: space-between;
align-items: flex-start;
width: 264px; width: 264px;
height: 64px; min-height: 60px;
position: relative; position: relative;
} }
...@@ -23,9 +44,8 @@ ...@@ -23,9 +44,8 @@
} }
.table-component--guest-row--guest { .table-component--guest-row--guest {
position: absolute; padding: 0 5px;
text-align: center; text-align: center;
transform: translateX(-50%);
cursor: pointer; cursor: pointer;
} }
...@@ -36,10 +56,10 @@ ...@@ -36,10 +56,10 @@
.table-component--guest-row--guest__user-icon { .table-component--guest-row--guest__user-icon {
display: inline-block; display: inline-block;
margin: 8px; margin: 8px 8px 0;
position: relative; position: relative;
width: 32px; width: 32px;
height: 38px; height: 32px;
} }
.table-component--guest-row--guest__user-icon--obod { .table-component--guest-row--guest__user-icon--obod {
...@@ -90,4 +110,35 @@ ...@@ -90,4 +110,35 @@
} }
.table-component--guest-row--guest__selected, .table-component--guest-row--guest__disabled { .table-component--guest-row--guest__selected, .table-component--guest-row--guest__disabled {
cursor: auto; cursor: auto;
} }
\ No newline at end of file
.users-block {
display: grid;
grid-template-columns: repeat(3, 1fr);
grid-gap: 25px;
padding-top: 75px;
}
.camera-block {
display: flex;
flex-direction: column;
}
.camera-block button.dropdown-field__toggler {
width: 100%;
}
.camera-block .header {
margin-bottom: 22px;
font-weight: 700;
font-size: 24px;
line-height: 1.33;
}
.camera-block .form-field {
margin-top: 25px;
}
.camera-block .form-field__label-text {
display: none;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment