Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove marker icon and highlight from annotations list. #18

Merged
merged 2 commits into from
Mar 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/components/MarkerMetadata/MarkerMetadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ function DisplayMarker(props) {
>
<Grid item>
<Typography variant="h6" component="h3">
<Bookmark fontSize="inherit" style={{ marginRight: 5 }} />{' '}
{label || 'Unnamed marker'}
</Typography>
</Grid>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Metadata/Metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ const Metadata = props => {
<MarkerMetadata
inset={rangesToShow.length}
key={marker.id}
highlight={marker === currentMarker}
highlight={false}
marker={marker}
onDeleteMarker={() => props.deleteMarker(marker.id)}
onSaveMarker={data => props.updateMarker(marker.id, data)}
Expand All @@ -128,7 +128,7 @@ const Metadata = props => {
color="textSecondary"
style={{ marginBottom: 10 }}
>
Project information
Timeline information
</Typography>
<div className="metadata__content">
{props.projectMetadataEditorOpen ? (
Expand Down
17 changes: 11 additions & 6 deletions src/components/ProjectMetadataDisplay/ProjectMetadataDisplay.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,16 @@ const ProjectMetadataDisplay = props => (
whiteSpace: 'pre-line',
}}
>
{props.manifestSummary || 'Description of manifest'}
{props.manifestSummary || 'Description of timeline'}
</Typography>
</div>
{props.homepage && props.homepageLabel ? (
<Typography variant="body1" component="p">
<Typography
variant="body1"
component="p"
style={{
marginTop: 14,
}}>
<a href={props.homepage}>{props.homepageLabel}</a>
</Typography>
) : (
Expand Down Expand Up @@ -60,10 +65,10 @@ const ProjectMetadataDisplay = props => (
variant="text"
color="primary"
onClick={props.onSaveButtonClicked}
title="Download project"
title="Download timeline"
>
<CloudDownload nativeColor="#FF4081" style={{ marginRight: 20 }} />
Download this project
Download this timeline
</Button>
</Grid>
) : null}
Expand All @@ -73,10 +78,10 @@ const ProjectMetadataDisplay = props => (
variant="text"
color="primary"
onClick={props.onEraseButtonClicked}
title="Start project over"
title="Start timeline over"
>
<RestorePage nativeColor="#303F9F" style={{ marginRight: 20 }} />
Start this project over
Start this timeline over
</Button>
</Grid>
) : (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class ProjectMetadataEditor extends Component {
InputLabelProps={{
shrink: true,
}}
placeholder="Description of manifest"
placeholder="Description of timeline"
fullWidth
multiline={true}
margin="normal"
Expand Down
2 changes: 1 addition & 1 deletion src/components/VariationsAppBar/VariationsAppBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const VariationsAppBar = props => (
color="inherit"
onClick={props.onSave}
disabled={!props.canUndo}
title={props.onSave ? 'Save project' : 'No backend set up to save'}
title={props.onSave ? 'Save timeline' : 'No backend set up to save'}
>
<Save />
</IconButton>
Expand Down
2 changes: 1 addition & 1 deletion src/constants/project.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const BUBBLE_STYLES = {

const DEFAULT_BUBBLE_HEIGHT = 80;
const DEFAULT_LANGUAGE_CODE = 'en';
const DEFAULT_TITLE = 'Untitled Project';
const DEFAULT_TITLE = 'Untitled Timeline';
const DEFAULT_BACKGROUND_COLOUR = '#fff';

const DESCRIPTION = 'description';
Expand Down