Skip to content

Commit

Permalink
UI Tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
Pietro Passarelli - News Labs committed Feb 19, 2019
1 parent ee20146 commit 2c6a9dd
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 59 deletions.
10 changes: 1 addition & 9 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ class App extends React.Component {
isTextEditable: true,
sttType: 'bbckaldi',
analyticsEvents: [],
title: 'Ted Talk Kate Kate Darling',
fileName: 'Kate Darling Ted Talk'
title: 'Ted Talk Kate Darling'
};
}

Expand Down Expand Up @@ -198,13 +197,6 @@ class App extends React.Component {
onChange={ e => this.handleChangeTranscriptTitle(e.target.value) }
/>
<br />
<label>Transcript Name</label>
<input
type="text"
onChange={ e => this.handleChangeTranscriptName(e.target.value) }
value={ this.state.fileName }
/>
<br />
<button onClick={ () => this.clearLocalStorage() }>Clear Local Storage</button>
<hr/>

Expand Down
12 changes: 0 additions & 12 deletions src/lib/TranscriptEditor/MediaPlayer/PlayerControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,6 @@ class PlayerControls extends React.Component {
handleMuteVolume={ this.props.handleMuteVolume }
/>

<div style={ {
color: 'white',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
overflow: 'hidden',
width: '20vw',
display: 'inline-block',
marginLeft: '1em'
} }>
{this.props.title}
</div>

</div>
);
}
Expand Down
10 changes: 4 additions & 6 deletions src/lib/TranscriptEditor/MediaPlayer/PlayerControls.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

.playerControls {
/* margin: 1em; */
margin-top: 0.5em;
margin-top: 0.25em;
margin-left: 0.5em;
margin: 1em;
/* margin: 1em; */
/* display: flex; */
/* justify-content: flex-start; */

Expand All @@ -28,11 +28,8 @@
background: color-darkest-grey;
font-size: 1em;
cursor: pointer;
/* border-color: black;
border-width: 0.1rem;
border-style: solid; */

margin-right: 0.3rem;
margin-bottom: 0.3rem;
}

.playBackRate{
Expand Down Expand Up @@ -72,6 +69,7 @@
line-height: 48px;
padding: 0 1em;
background-color: color-darkest-grey;
margin-bottom: 0.3rem;
}

.currentTime {
Expand Down
8 changes: 4 additions & 4 deletions src/lib/TranscriptEditor/MediaPlayer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -373,11 +373,11 @@ class MediaPlayer extends React.Component {

const playerControlsSection = (
<div className={ styles.controlsSection }>
{/* <div className={ styles.titleBox }>
<h1 className={ styles.title }>{ this.props.fileName? this.props.fileName : this.props.mediaUrl }</h1>
</div> */}
<div className={ styles.title }>
{this.props.title? this.props.title: ''}
</div>
<PlayerControls
title={ this.props.title? this.props.title: '' }
// title={ this.props.title? this.props.title: '' }
playMedia={ this.togglePlayMedia.bind(this) }
isPlaying={ this.state.isPlaying }
playbackRate={ this.state.playbackRate }
Expand Down
30 changes: 10 additions & 20 deletions src/lib/TranscriptEditor/MediaPlayer/index.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,27 @@
background: black;
}

.title{
color: white;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
width: 97vw;
display: inline-block;
margin-left: 0.5em;
}

.playerSection {
display: inline-flex;
align-items: flex-start;
width: 100%;
}

.controlsSection {
/* width: 98%; */
/* display: flex; */
/* flex-direction: column; */
}

.titleBox {
border-bottom: 0.02em solid color-light-grey;
margin-bottom: 1em;
}

.title {
margin: 1em;
color: white;
height: 1.3em;
font-size: 16px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}

.helpText {
margin-top: 0px;
margin-bottom: 0.1em;
Expand All @@ -41,8 +35,4 @@
.hideInMobile {
display: none;
}

video {
/* min-width: 50%; */
}
}
1 change: 1 addition & 0 deletions src/lib/TranscriptEditor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ class TranscriptEditor extends React.Component {
</section>

</div>

);
}
}
Expand Down
12 changes: 4 additions & 8 deletions src/lib/TranscriptEditor/index.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@
flex-direction: column;
justify-content: space-evenly;
flex-wrap: nowrap;
/* min-height: 100vh; */
background-color: #f9f9f9;
position: relative;
}

.header {
background-color: black;
width: 100%;
/* height: 2em; */
}
.aside{
margin-left:0.5em;
}

.nav {
Expand Down Expand Up @@ -74,7 +75,6 @@
.header {
background-color: black;
width: 100%;
/* height: 2em; */
}

.nav {
Expand All @@ -87,7 +87,6 @@
}

.row {
/* display: flex; */
margin-top: 1em;
}

Expand Down Expand Up @@ -124,18 +123,16 @@
.cog {
font-weight: lighter;
}

}

.help {
cursor: pointer;
float: right;
padding-right: 0.5em;
padding-left: 11em;
/* padding-left: 11em; */
margin: 0.5em 0;
color: white;
display: block;
/* font-size: 0.8em; */
font-weight: lighter;
margin-top: 0.5em;
margin-right: 6em;
Expand All @@ -148,7 +145,6 @@

.helpMessage span {
display: block;
/* font-size: 0.8em; */
font-weight: lighter;
margin-top: 1em;
}

0 comments on commit 2c6a9dd

Please sign in to comment.