Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Client - fix activities list style & activity details display

Browse Source
This commit is contained in:
Sam
2019-09-01 11:04:43 +02:00
parent de5c0ada6b
commit 38bbd61eba
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fittrackee_client/src/components/Activity/ActivityDisplay/ActivityCharts.jsx
View File

@@ -35,8 +35,9 @@ class ActivityCharts extends React.Component {
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
if ( if (
this.props.dataType === 'activity' && (this.props.dataType === 'activity' &&
prevProps.activity.id !== this.props.activity.id prevProps.activity.id !== this.props.activity.id) ||
(this.props.dataType === 'activity' && prevProps.dataType === 'segment')
) { ) {
this.props.loadActivityData(this.props.activity.id) this.props.loadActivityData(this.props.activity.id)
} }

5
fittrackee_client/src/components/Activity/ActivityDisplay/ActivityMap.jsx
View File

@@ -25,8 +25,9 @@ class ActivityMap extends React.Component {
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
if ( if (
this.props.dataType === 'activity' && (this.props.dataType === 'activity' &&
prevProps.activity.id !== this.props.activity.id prevProps.activity.id !== this.props.activity.id) ||
(this.props.dataType === 'activity' && prevProps.dataType === 'segment')
) { ) {
this.props.loadActivityGpx(this.props.activity.id) this.props.loadActivityGpx(this.props.activity.id)
} }

19
fittrackee_client/src/components/App.css
View File

@@ -131,25 +131,28 @@ label {
display: none; display: none;
} }
.activity-title:hover img { .activity-title img {
border: 1px solid lightgrey; border: 1px solid lightgrey;
border-radius: 4px; border-radius: 4px;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
display:block; display: none;
margin-left: 10px; margin-left: 20px;
position: absolute; position: absolute;
z-index: 1000; z-index: 1000;
} }
.activity-title:hover .map-attribution-list { .activity-title .map-attribution-list {
display:block; display: none;
font-size: 11px; font-size: 11px;
margin-left: 10px; margin-left: 20px;
position:relative; position: absolute;
top: 0;
z-index: 1000; z-index: 1000;
} }
.activity-title:hover img, .activity-title:hover .map-attribution-list {
display: block;
}
.add-activity { .add-activity {
margin-top: 50px; margin-top: 50px;
} }