Skip to content

Commit

Permalink
adjusted Select
Browse files Browse the repository at this point in the history
  • Loading branch information
Pietro Passarelli - News Labs committed Feb 19, 2019
1 parent 89a06ad commit ee20146
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 13 deletions.
3 changes: 2 additions & 1 deletion src/lib/TranscriptEditor/MediaPlayer/PlayerControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ import {
faPause,
faBackward,
faForward,
faUndo
faUndo,
faStepBackward
} from '@fortawesome/free-solid-svg-icons';

class PlayerControls extends React.Component {
Expand Down
17 changes: 12 additions & 5 deletions src/lib/TranscriptEditor/MediaPlayer/PlayerControls.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
margin-top: 0.5em;
margin-left: 0.5em;
margin: 1em;
display: flex;
justify-content: flex-start;
/* display: flex; */
/* justify-content: flex-start; */

}

.playerControls > * {
Expand All @@ -15,7 +16,7 @@

.playerControls > *:not(:last-child) {
margin-right: 0.5em;
background: color-darkest-grey;
/* background: color-darkest-grey; */
}

.playerButton {
Expand All @@ -30,23 +31,28 @@
/* border-color: black;
border-width: 0.1rem;
border-style: solid; */

margin-right: 0.3rem;
}

.playBackRate{
height: 48px;
width: 70px;
border: 0;
color: white;
background: color-darkest-grey;
/* background: color-darkest-grey; */
font-size: 1em;
cursor: pointer;
position: relative;
padding-left: 0.8em;
margin-right: 0.3rem;
}

.playBackRate::before{
content: '×';
position: absolute;
bottom: -2px;
left: 12px;
left: 30px;/*<-- */
}

.playBackRate > select {
Expand All @@ -65,6 +71,7 @@
text-align: center;
line-height: 48px;
padding: 0 1em;
background-color: color-darkest-grey;
}

.currentTime {
Expand Down
6 changes: 6 additions & 0 deletions src/lib/TranscriptEditor/MediaPlayer/Select.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ import PropTypes from 'prop-types';

import style from './Select.module.css';

import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

import {
faCaretDown
} from '@fortawesome/free-solid-svg-icons';

class Select extends React.Component {

render() {
Expand Down
6 changes: 3 additions & 3 deletions src/lib/TranscriptEditor/MediaPlayer/Select.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
height: 20px;
width: 70px!important;
height: 48px!important;
width: 97px!important;
border-radius: 0;
padding-left: 8px;
padding: 32px;/*<-- */
background-image: url(data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTguMS4xLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDEyNS4zMDQgMTI1LjMwNCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMTI1LjMwNCAxMjUuMzA0OyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgd2lkdGg9IjE2cHgiIGhlaWdodD0iMTZweCI+CjxnPgoJPGc+CgkJPHBvbHlnb24gcG9pbnRzPSI2Mi42NTIsMTAzLjg5NSAwLDIxLjQwOSAxMjUuMzA0LDIxLjQwOSAgICIgZmlsbD0iI0ZGRkZGRiIvPgoJPC9nPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+Cjwvc3ZnPgo=);
background-repeat: no-repeat;
background-position: 85% center;
Expand Down
6 changes: 3 additions & 3 deletions src/lib/TranscriptEditor/MediaPlayer/index.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
}

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

.titleBox {
Expand Down
3 changes: 2 additions & 1 deletion src/lib/TranscriptEditor/TimedTextEditor/WrapperBlock.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ class WrapperBlock extends React.Component {
<div className={ style.WrapperBlock }>
<div className={ style.markers }>
{this.props.blockProps.showSpeakers ? speakerElement : ''}
{this.props.blockProps.showTimecodes ? timecodeElement : ''}

{this.props.blockProps.showTimecodes ? timecodeElement: ''}
</div>
<div className={ style.text }>
<EditorBlock { ...this.props } />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@
margin-right: 0.5em;
}

.time:hover{
text-decoration: underline;
/* color: blue; */
}

.EditLabel {
cursor: pointer;
margin-right: 0.5em;
Expand Down

0 comments on commit ee20146

Please sign in to comment.