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

Client: style changes

Browse Source
This commit is contained in:
Sam 2018-06-15 09:36:14 +02:00
parent 3acdabb4da
commit 2a5070aa8a
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fittrackee_client/src/components/Activity/ActivityAddOrEdit.jsx
View File

@ -58,6 +58,7 @@ class ActivityAddEdit extends React.Component {
<div className="col"> <div className="col">
<label className="radioLabel"> <label className="radioLabel">
<input <input
className="add-activity-radio"
type="radio" type="radio"
name="withGpx" name="withGpx"
disabled={loading} disabled={loading}
@ -70,6 +71,7 @@ class ActivityAddEdit extends React.Component {
<div className="col"> <div className="col">
<label className="radioLabel"> <label className="radioLabel">
<input <input
className="add-activity-radio"
type="radio" type="radio"
name="withoutGpx" name="withoutGpx"
disabled={loading} disabled={loading}

9
fittrackee_client/src/components/Activity/ActivityDisplay/ActivityNoMap.jsx Normal file
View File

@ -0,0 +1,9 @@
import React from 'react'
export default function ActivityNoMap() {
return (
<div className="activity-no-map text-center">
No Map
</div>
)
}

11
fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx
View File

@ -6,6 +6,7 @@ import ActivityCardHeader from './ActivityCardHeader'
import ActivityCharts from './ActivityCharts' import ActivityCharts from './ActivityCharts'
import ActivityDetails from './ActivityDetails' import ActivityDetails from './ActivityDetails'
import ActivityMap from './ActivityMap' import ActivityMap from './ActivityMap'
import ActivityNoMap from './ActivityNoMap'
import ActivityNotes from './ActivityNotes' import ActivityNotes from './ActivityNotes'
import CustomModal from './../../Others/CustomModal' import CustomModal from './../../Others/CustomModal'
import { getOrUpdateData } from '../../../actions' import { getOrUpdateData } from '../../../actions'
@ -78,11 +79,13 @@ class ActivityDisplay extends React.Component {
</div> </div>
<div className="card-body"> <div className="card-body">
<div className="row"> <div className="row">
{activity.with_gpx && ( <div className="col-8">
<div className="col-8"> {activity.with_gpx ? (
<ActivityMap activity={activity} /> <ActivityMap activity={activity} />
</div> ) : (
)} <ActivityNoMap />
)}
</div>
<div className="col"> <div className="col">
<ActivityDetails activity={activity} /> <ActivityDetails activity={activity} />
</div> </div>

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

@ -73,6 +73,14 @@ label {
padding: 0; padding: 0;
} }
.activity-no-map {
background-color: #eaeaea;
color: #666666;
font-style: italic;
height: 400px;
line-height: 400px;
}
.activity-notes { .activity-notes {
font-size: 0.9em; font-size: 0.9em;
font-style: italic; font-style: italic;
@ -98,6 +106,10 @@ label {
margin-top: 50px; margin-top: 50px;
} }
.add-activity-radio {
margin-right: 10px;
}
.admin-img { .admin-img {
max-width: 35px; max-width: 35px;
max-height: 35px; max-height: 35px;