Skip to content

Commit

Permalink
updated styling for left content
Browse files Browse the repository at this point in the history
  • Loading branch information
eyesore- committed Jan 19, 2017
1 parent fde72be commit bfd1820
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions client/vue-components/main_content.vue
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
<template>
<div class="main-content">
<navbar></navbar>

<div>
<!-- area to add live data as text is being added -->
<div class="content-left">
<div>
<videocomponent id="video" :wsrtc="wsrtc" :uri="uri"></videocomponent>
</div>
<div class="content">
<div class="content-left">
<videocomponent id="video" :wsrtc="wsrtc" :uri="uri"></videocomponent>
<div class="doc-info">
<div>{{ count }} words</div>
<div>{{ time }} read</div>
</div>
<audiocomponent id="audio" ></audiocomponent>

<div class="doc-info">
<div>{{ count }} words</div>
<div>{{ time }} read</div>
</div>
<div class="audio">
<audiocomponent id="audio" ></audiocomponent>

<div class="content-right">
<div id="editor"></div>
</div>
<div>
<statcomponent :quill="quill"></statcomponent>
</div>
</div>
<div class="content-right">
<div id="editor"></div>
</div>

</div>
</template>

Expand All @@ -41,6 +39,7 @@
import editor from '../js/editor.js'
import statcomponent from './stat_component.vue'
export default {
created() {
let chance = new Chance()
Expand All @@ -63,6 +62,7 @@
const connection = new sharedb.Connection(socket)
// console.log(socket, this.wsrtc)
// console.log(socket, this.wsrtc)
// For testing reconnection
window.disconnect = function() {
connection.close();
Expand Down Expand Up @@ -106,7 +106,7 @@
}
</script>

<style scoped>
<style>
.main-content{
width: 100vw;
}
Expand All @@ -117,19 +117,18 @@
}
.content-right{
width: 80%;
display: inline-block;
float: right;
}
.content-left{
width: 20%;
display: inline-block;
justify-content: center;
align-items: flex-end;
display: flex;
flex-direction: column;
align-items: center;
justify-content: flex-end;
}
.doc-info{
font-size: 0.95em;
font-weight: 600;
margin: 0.75em;
margin: 1em;
opacity: 0.35;
}
html, body{
Expand All @@ -138,6 +137,7 @@ html, body{
}
#editor {
height: 100%;
padding: 1em;
}
code {
color: #f66;
Expand Down

0 comments on commit bfd1820

Please sign in to comment.