From 774e8682b060a57fff1471fdd968e3bdb15341e5 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 31 Aug 2019 22:11:08 +0200 Subject: [PATCH] Client - style fix --- .../src/components/Activities/ActivitiesList.jsx | 4 +++- fittrackee_client/src/components/App.css | 6 +++--- fittrackee_client/src/components/Common/StaticMap.jsx | 7 +++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/fittrackee_client/src/components/Activities/ActivitiesList.jsx b/fittrackee_client/src/components/Activities/ActivitiesList.jsx index ef48456d..ee6235f3 100644 --- a/fittrackee_client/src/components/Activities/ActivitiesList.jsx +++ b/fittrackee_client/src/components/Activities/ActivitiesList.jsx @@ -41,7 +41,9 @@ export default class ActivitiesList extends React.PureComponent { {activity.title} - {activity.map && } + {activity.map && ( + + )} {format( diff --git a/fittrackee_client/src/components/App.css b/fittrackee_client/src/components/App.css index 2ffb37f4..d1fca867 100644 --- a/fittrackee_client/src/components/App.css +++ b/fittrackee_client/src/components/App.css @@ -127,7 +127,7 @@ label { max-height: 18px; } -.activity-title img, .activity-title .map-attribution { +.activity-title img, .activity-title .map-attribution-list { display: none; } @@ -141,10 +141,10 @@ label { z-index: 1000; } -.activity-title:hover .map-attribution { +.activity-title:hover .map-attribution-list { display:block; font-size: 11px; - left: -130px; + margin-left: 10px; position:relative; top: 0; z-index: 1000; diff --git a/fittrackee_client/src/components/Common/StaticMap.jsx b/fittrackee_client/src/components/Common/StaticMap.jsx index e9bade3a..f0fa77c7 100644 --- a/fittrackee_client/src/components/Common/StaticMap.jsx +++ b/fittrackee_client/src/components/Common/StaticMap.jsx @@ -4,7 +4,10 @@ import { apiUrl } from '../../utils' export default class StaticMap extends React.PureComponent { render() { - const { activity } = this.props + const { activity, display } = this.props + const attributionStyle = + display === 'list' ? 'map-attribution-list' : 'map-attribution text-right' + return ( <> activity map -
+
©