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

Client - style fix

Browse Source
This commit is contained in:
Sam 2021-11-14 18:38:41 +01:00
parent f25e30828c
commit 402baaee75
15 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fittrackee/dist/index.html vendored
View File

@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="/static/css/fork-awesome.min.css"><link rel="stylesheet" href="/static/css/leaflet.css"><title>FitTrackee</title><link href="/static/css/admin.babfd43e.css" rel="prefetch"><link href="/static/css/main.f9856c63.css" rel="prefetch"><link href="/static/css/main~workouts.0edb3403.css" rel="prefetch"><link href="/static/css/profile.05400f70.css" rel="prefetch"><link href="/static/css/reset.46776e72.css" rel="prefetch"><link href="/static/css/workouts.379cd51f.css" rel="prefetch"><link href="/static/js/admin.2f1d393d.js" rel="prefetch"><link href="/static/js/chunk-2d0c9189.c81458cc.js" rel="prefetch"><link href="/static/js/chunk-2d0cf391.020c75ea.js" rel="prefetch"><link href="/static/js/chunk-2d0da8f3.c8c3e7e8.js" rel="prefetch"><link href="/static/js/chunk-2d2248b6.d84473c1.js" rel="prefetch"><link href="/static/js/chunk-2d22523a.4b710d99.js" rel="prefetch"><link href="/static/js/main.a53955db.js" rel="prefetch"><link href="/static/js/main~workouts.6afa0411.js" rel="prefetch"><link href="/static/js/profile.62578012.js" rel="prefetch"><link href="/static/js/reset.518e646f.js" rel="prefetch"><link href="/static/js/workouts.808a94ee.js" rel="prefetch"><link href="/static/css/app.110c4593.css" rel="preload" as="style"><link href="/static/js/app.1342fc6b.js" rel="preload" as="script"><link href="/static/js/chunk-vendors.caa4fc1c.js" rel="preload" as="script"><link href="/static/css/app.110c4593.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="fittrackee_client"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but FitTrackee doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.caa4fc1c.js"></script><script src="/static/js/app.1342fc6b.js"></script></body></html> <!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="/static/css/fork-awesome.min.css"><link rel="stylesheet" href="/static/css/leaflet.css"><title>FitTrackee</title><link href="/static/css/admin.babfd43e.css" rel="prefetch"><link href="/static/css/main.f9856c63.css" rel="prefetch"><link href="/static/css/main~workouts.0edb3403.css" rel="prefetch"><link href="/static/css/profile.05400f70.css" rel="prefetch"><link href="/static/css/reset.46776e72.css" rel="prefetch"><link href="/static/css/workouts.e26f093d.css" rel="prefetch"><link href="/static/js/admin.2f1d393d.js" rel="prefetch"><link href="/static/js/chunk-2d0c9189.c81458cc.js" rel="prefetch"><link href="/static/js/chunk-2d0cf391.020c75ea.js" rel="prefetch"><link href="/static/js/chunk-2d0da8f3.c8c3e7e8.js" rel="prefetch"><link href="/static/js/chunk-2d2248b6.d84473c1.js" rel="prefetch"><link href="/static/js/chunk-2d22523a.4b710d99.js" rel="prefetch"><link href="/static/js/main.a53955db.js" rel="prefetch"><link href="/static/js/main~workouts.6afa0411.js" rel="prefetch"><link href="/static/js/profile.62578012.js" rel="prefetch"><link href="/static/js/reset.518e646f.js" rel="prefetch"><link href="/static/js/workouts.d8661465.js" rel="prefetch"><link href="/static/css/app.67b49472.css" rel="preload" as="style"><link href="/static/js/app.7327f9ef.js" rel="preload" as="script"><link href="/static/js/chunk-vendors.caa4fc1c.js" rel="preload" as="script"><link href="/static/css/app.67b49472.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="fittrackee_client"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but FitTrackee doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.caa4fc1c.js"></script><script src="/static/js/app.7327f9ef.js"></script></body></html>

18
fittrackee/dist/precache-manifest.bf04912a8322e67fc8fc6ac3e401ce2a.js → fittrackee/dist/precache-manifest.3e59f0f323758a9311aeb8fa9f9ad1cb.js vendored
View File

@ -64,7 +64,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/img/workouts/mountains.svg" "url": "/img/workouts/mountains.svg"
}, },
{ {
"revision": "f60d9b21713c9ccfd397225febcc9d64", "revision": "32c52f8c4e8110c8e2b56ed11785070e",
"url": "/index.html" "url": "/index.html"
}, },
{ {
@ -80,8 +80,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/css/admin.babfd43e.css" "url": "/static/css/admin.babfd43e.css"
}, },
{ {
"revision": "6454c1c09efc280ffea6", "revision": "20cf09e603abcf3de75f",
"url": "/static/css/app.110c4593.css" "url": "/static/css/app.67b49472.css"
}, },
{ {
"revision": "82c1118c918377daaa71a320ab8eea42", "revision": "82c1118c918377daaa71a320ab8eea42",
@ -108,8 +108,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/css/reset.46776e72.css" "url": "/static/css/reset.46776e72.css"
}, },
{ {
"revision": "e06594c3be1a4424faa5", "revision": "546fe7284ac94a69b990",
"url": "/static/css/workouts.379cd51f.css" "url": "/static/css/workouts.e26f093d.css"
}, },
{ {
"revision": "e719f9244c69e28e7d00e725ca1e280e", "revision": "e719f9244c69e28e7d00e725ca1e280e",
@ -196,8 +196,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/js/admin.2f1d393d.js" "url": "/static/js/admin.2f1d393d.js"
}, },
{ {
"revision": "6454c1c09efc280ffea6", "revision": "20cf09e603abcf3de75f",
"url": "/static/js/app.1342fc6b.js" "url": "/static/js/app.7327f9ef.js"
}, },
{ {
"revision": "bd7d183c9f68e5f4027d", "revision": "bd7d183c9f68e5f4027d",
@ -240,7 +240,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/js/reset.518e646f.js" "url": "/static/js/reset.518e646f.js"
}, },
{ {
"revision": "e06594c3be1a4424faa5", "revision": "546fe7284ac94a69b990",
"url": "/static/js/workouts.808a94ee.js" "url": "/static/js/workouts.d8661465.js"
} }
]); ]);

2
fittrackee/dist/service-worker.js vendored
View File

@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js"); importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
importScripts( importScripts(
"/precache-manifest.bf04912a8322e67fc8fc6ac3e401ce2a.js" "/precache-manifest.3e59f0f323758a9311aeb8fa9f9ad1cb.js"
); );
workbox.core.setCacheNameDetails({prefix: "fittrackee_client"}); workbox.core.setCacheNameDetails({prefix: "fittrackee_client"});

2
fittrackee/dist/static/css/app.110c4593.css → fittrackee/dist/static/css/app.67b49472.css vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/css/workouts.379cd51f.css → fittrackee/dist/static/css/workouts.e26f093d.css vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/app.1342fc6b.js vendored
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/js/app.1342fc6b.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/app.7327f9ef.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/js/app.7327f9ef.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/workouts.808a94ee.js vendored
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/js/workouts.808a94ee.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/workouts.d8661465.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/js/workouts.d8661465.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
fittrackee_client/src/components/Common/Distance.vue
View File

@ -1,5 +1,6 @@
<template> <template>
<span class="distance" :class="{ strong }">{{ convertedDistance }}</span> <span class="distance" :class="{ strong }">{{ convertedDistance }}</span>
{{ ' ' }}
<span v-if="displayUnit" class="unit" :class="{ strong }"> <span v-if="displayUnit" class="unit" :class="{ strong }">
{{ unitTo }}{{ speed ? '/h' : '' }} {{ unitTo }}{{ speed ? '/h' : '' }}
</span> </span>
@ -55,9 +56,6 @@
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/scss/base.scss'; @import '~@/scss/base.scss';
.unit {
padding-left: $default-padding * 0.5;
}
.strong { .strong {
font-weight: bold; font-weight: bold;
} }

40
fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutData.vue
View File

@ -2,17 +2,19 @@
<div id="workout-info"> <div id="workout-info">
<div class="workout-data"> <div class="workout-data">
<i class="fa fa-clock-o" aria-hidden="true" /> <i class="fa fa-clock-o" aria-hidden="true" />
{{ $t('workouts.DURATION') }}: <span>{{ workoutObject.moving }}</span> <span class="label"> {{ $t('workouts.DURATION') }} </span>:
<span class="value">{{ workoutObject.moving }}</span>
<WorkoutRecord :workoutObject="workoutObject" recordType="LD" /> <WorkoutRecord :workoutObject="workoutObject" recordType="LD" />
<div v-if="withPause"> <div v-if="withPause">
({{ $t('workouts.PAUSES') }}: <span>{{ workoutObject.pauses }}</span> - ({{ $t('workouts.PAUSES') }}:
<span class="value">{{ workoutObject.pauses }}</span> -
{{ $t('workouts.TOTAL_DURATION') }}: {{ $t('workouts.TOTAL_DURATION') }}:
<span>{{ workoutObject.duration }})</span> <span class="value">{{ workoutObject.duration }})</span>
</div> </div>
</div> </div>
<div class="workout-data"> <div class="workout-data">
<i class="fa fa-road" aria-hidden="true" /> <i class="fa fa-road" aria-hidden="true" />
{{ $t('workouts.DISTANCE') }}: <span class="label"> {{ $t('workouts.DISTANCE') }} </span>:
<Distance <Distance
:distance="workoutObject.distance" :distance="workoutObject.distance"
:digits="3" :digits="3"
@ -24,7 +26,8 @@
</div> </div>
<div class="workout-data"> <div class="workout-data">
<i class="fa fa-tachometer" aria-hidden="true" /> <i class="fa fa-tachometer" aria-hidden="true" />
{{ $t('workouts.AVERAGE_SPEED') }}: <span class="label">{{ $t('workouts.AVERAGE_SPEED') }}</span
>:
<Distance <Distance
:distance="workoutObject.aveSpeed" :distance="workoutObject.aveSpeed"
unitFrom="km" unitFrom="km"
@ -33,7 +36,7 @@
:useImperialUnits="useImperialUnits" :useImperialUnits="useImperialUnits"
/> />
<WorkoutRecord :workoutObject="workoutObject" recordType="AS" /><br /> <WorkoutRecord :workoutObject="workoutObject" recordType="AS" /><br />
{{ $t('workouts.MAX_SPEED') }}: <span class="label"> {{ $t('workouts.MAX_SPEED') }} </span>:
<Distance <Distance
:distance="workoutObject.maxSpeed" :distance="workoutObject.maxSpeed"
unitFrom="km" unitFrom="km"
@ -52,14 +55,16 @@
src="/img/workouts/mountains.svg" src="/img/workouts/mountains.svg"
:alt="$t('workouts.ELEVATION')" :alt="$t('workouts.ELEVATION')"
/> />
{{ $t('workouts.MIN_ALTITUDE') }}: <span class="label">{{ $t('workouts.MIN_ALTITUDE') }}</span
>:
<Distance <Distance
:distance="workoutObject.minAlt" :distance="workoutObject.minAlt"
unitFrom="m" unitFrom="m"
:strong="true" :strong="true"
:useImperialUnits="useImperialUnits" :useImperialUnits="useImperialUnits"
/><br /> /><br />
{{ $t('workouts.MAX_ALTITUDE') }}: <span class="label">{{ $t('workouts.MAX_ALTITUDE') }}</span
>:
<Distance <Distance
:distance="workoutObject.maxAlt" :distance="workoutObject.maxAlt"
unitFrom="m" unitFrom="m"
@ -72,14 +77,15 @@
v-if="workoutObject.ascent !== null && workoutObject.descent !== null" v-if="workoutObject.ascent !== null && workoutObject.descent !== null"
> >
<i class="fa fa-location-arrow" aria-hidden="true" /> <i class="fa fa-location-arrow" aria-hidden="true" />
{{ $t('workouts.ASCENT') }}: <span class="label">{{ $t('workouts.ASCENT') }}</span
>:
<Distance <Distance
:distance="workoutObject.ascent" :distance="workoutObject.ascent"
unitFrom="m" unitFrom="m"
:strong="true" :strong="true"
:useImperialUnits="useImperialUnits" :useImperialUnits="useImperialUnits"
/><br /> /><br />
{{ $t('workouts.DESCENT') }}: <span class="label"> {{ $t('workouts.DESCENT') }} </span>:
<Distance <Distance
:distance="workoutObject.descent" :distance="workoutObject.descent"
unitFrom="m" unitFrom="m"
@ -123,11 +129,17 @@
padding: $default-padding $default-padding * 2; padding: $default-padding $default-padding * 2;
width: 100%; width: 100%;
.workout-data { .fa,
text-transform: capitalize; .mountains {
padding: $default-padding * 0.5 0; padding-right: $default-padding * 0.5;
}
span { .workout-data {
padding: $default-padding * 0.5 0;
.label {
text-transform: capitalize;
}
.value {
font-weight: bold; font-weight: bold;
text-transform: lowercase; text-transform: lowercase;
} }