Commit 10fd84e0 by talequale

ui minor fixes

parent 60da83b4
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
position: relative; position: relative;
} }
.main-background { .main-background {
display: flex;
flex-direction: column;
height: 100%; height: 100%;
background: url(/img/back.jpg); background: url(/img/back.jpg);
background-size: cover; background-size: cover;
...@@ -60,13 +62,13 @@ ...@@ -60,13 +62,13 @@
color: #fff; color: #fff;
} }
.main-background .p { .main-background .p {
margin-top: 24px; margin-top: 9px;
} }
.top-bar { .top-bar {
height: 64px; height: 64px;
background: #1E143A; background: #1E143A;
padding: 21px 44px; padding: 16px 44px;
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -77,7 +79,7 @@ ...@@ -77,7 +79,7 @@
.button { .button {
box-sizing: border-box; box-sizing: border-box;
border-radius: 20px; border-radius: 20px;
padding: 4px 20px; padding: 6px 20px;
margin-left: 16px; margin-left: 16px;
cursor: pointer; cursor: pointer;
} }
...@@ -100,10 +102,16 @@ ...@@ -100,10 +102,16 @@
margin-top: 40px; margin-top: 40px;
} }
.sub-content { .sub-content {
position: absolute; position: relative;
left: 12.4%; margin: auto;
top: 50%; box-sizing: border-box;
transform: translateY(-50%); padding: 20px;
width: 100%;
max-width: 1124px;
/*position: absolute;*/
/*left: 12.4%;*/
/*top: 50%;*/
/*transform: translateY(-50%);*/
} }
.main-background .button { .main-background .button {
margin-right: 16px; margin-right: 16px;
...@@ -119,6 +127,7 @@ ...@@ -119,6 +127,7 @@
border: 0; border: 0;
border-bottom: 2px solid #594CD7; border-bottom: 2px solid #594CD7;
width: 366px; width: 366px;
min-height: 34px;
position: relative; position: relative;
text-align: left; text-align: left;
padding: 4px; padding: 4px;
...@@ -129,6 +138,7 @@ ...@@ -129,6 +138,7 @@
button.dropdown-field__toggler:after { button.dropdown-field__toggler:after {
content: '▼'; content: '▼';
position: absolute; position: absolute;
top: 3px;
right: 10px; right: 10px;
font-family: arial; font-family: arial;
font-size: 10px; font-size: 10px;
...@@ -150,8 +160,17 @@ ...@@ -150,8 +160,17 @@
border-bottom: 2px solid #594CD7; border-bottom: 2px solid #594CD7;
} }
.page-content {
display: flex;
flex-direction: column;
height: 100%;
}
.content { .content {
margin: 112px 178px; margin: auto;
box-sizing: border-box;
padding: 20px;
width: 100%;
max-width: 1124px;
} }
.block { .block {
margin-bottom: 40px; margin-bottom: 40px;
...@@ -297,4 +316,4 @@ ...@@ -297,4 +316,4 @@
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -105,7 +105,7 @@ Screen.Conference = function() { ...@@ -105,7 +105,7 @@ Screen.Conference = function() {
var cameraCanvas, canvasResizerEl, var cameraCanvas, canvasResizerEl,
dom = D.div( { cls: 'block', style: { marginBottom: '80px' } }, dom = D.div( { cls: 'block', style: { marginBottom: '80px' } },
D.div( { cls: 'header' }, 'User ' + ( currentUserID + 1 ) ), D.div( { cls: 'header' }, 'Camera ' + ( currentUserID + 1 ) ),
canvasResizerEl = CanvasResizer( canvasResizerEl = CanvasResizer(
cameraCanvas = D.h( 'canvas', { cameraCanvas = D.h( 'canvas', {
cls: "output_canvas", cls: "output_canvas",
...@@ -250,12 +250,14 @@ Screen.Conference = function() { ...@@ -250,12 +250,14 @@ Screen.Conference = function() {
return dom; return dom;
} }
var usersBlock, tooMuchUsers = new Store.Value.Boolean(false); var usersBlock, tooMuchUsers = new Store.Value.Boolean(false);
var dom = D.div({cls: 'top-bar'}, var dom = D.div({cls: 'page-content'},
D.h('img', {src: 'amazon-logo.svg'}), D.div({cls: 'top-bar'},
D.div({cls: 'buttons'}, D.h('img', {src: 'amazon-logo.svg'}),
D.h('button', {cls: ['button secondary', {hidden: Store.NOT(isConnected)}], onclick: ()=>store.set('connection', false)}, 'End session'), D.div({cls: 'buttons'},
D.h('button', {cls: ['button primary', {hidden: isConnected}], onclick: ()=>store.set('connection', true)}, 'Ready to connect') D.h('button', {cls: ['button secondary', {hidden: Store.NOT(isConnected)}], onclick: ()=>store.set('connection', false)}, 'End session'),
), 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'},
D.div({cls: 'block'}, D.div({cls: 'block'},
...@@ -274,7 +276,7 @@ Screen.Conference = function() { ...@@ -274,7 +276,7 @@ Screen.Conference = function() {
if(userID > 1) if(userID > 1)
tooMuchUsers.set(true); tooMuchUsers.set(true);
} }
}, 'Add user'), }, 'Add camera'),
D.div({cls: 'block hidden'}, D.div({cls: 'block hidden'},
...@@ -415,4 +417,4 @@ Screen.Conference = function() { ...@@ -415,4 +417,4 @@ Screen.Conference = function() {
} }
})(); })();
return dom; return dom;
}; };
\ No newline at end of file
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
border-bottom: 2px solid#999; border-bottom: 2px solid#999;
pointer-events: none; pointer-events: none;
color: #999; color: #999;
} }
\ No newline at end of file
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