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

Merge branch 'dev' into improve-ui

Browse Source
This commit is contained in:
Sam 2023-07-12 21:08:20 +02:00
commit 33c5c6054f
18 changed files with 60 additions and 18 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><script defer="defer" src="/static/js/chunk-vendors.b1590c25.js"></script><script defer="defer" src="/static/js/app.b65cb444.js"></script><link href="/static/css/app.53424207.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></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><script defer="defer" src="/static/js/chunk-vendors.b1590c25.js"></script><script defer="defer" src="/static/js/app.6dae9e95.js"></script><link href="/static/css/app.ce91f57c.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></body></html>

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/css/app.53424207.css vendored
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/css/app.ce91f57c.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/css/workouts.48a31074.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/css/workouts.66742279.css vendored
View File

File diff suppressed because one or more lines are too long

4
fittrackee/dist/static/js/app.b65cb444.js → fittrackee/dist/static/js/app.6dae9e95.js vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/app.b65cb444.js.map → fittrackee/dist/static/js/app.6dae9e95.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/reset.a3db17a0.js → fittrackee/dist/static/js/reset.f26118ce.js vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/reset.a3db17a0.js.map → fittrackee/dist/static/js/reset.f26118ce.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
fittrackee/dist/static/js/workouts.edf44ecf.js → fittrackee/dist/static/js/workouts.0839218b.js vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/workouts.edf44ecf.js.map → fittrackee/dist/static/js/workouts.0839218b.js.map vendored
View File

File diff suppressed because one or more lines are too long

18
fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutCardTitle.vue
View File

@ -131,6 +131,7 @@
.workout-arrow { .workout-arrow {
cursor: pointer; cursor: pointer;
padding: $default-padding;
&.inactive { &.inactive {
color: var(--disabled-color); color: var(--disabled-color);
cursor: default; cursor: default;
@ -168,12 +169,19 @@
cursor: pointer; cursor: pointer;
padding: 0 $default-padding * 0.3; padding: 0 $default-padding * 0.3;
} }
}
@media screen and (max-width: $small-limit) { @media screen and (max-width: $small-limit) {
.fa-download, .workout-arrow {
.fa-trash, padding: $default-padding * 0.5;
.fa-edit { }
padding: 0 $default-padding * 0.7; .workout-card-title {
@media screen and (max-width: $small-limit) {
.fa-download,
.fa-trash,
.fa-edit {
padding: 0 $default-padding * 0.7;
}
} }
} }
} }

3
fittrackee_client/src/components/Workout/WorkoutDetail/index.vue
View File

@ -184,6 +184,9 @@
display: flex; display: flex;
::v-deep(.card) { ::v-deep(.card) {
width: 100%; width: 100%;
.card-title {
padding: $default-padding $default-padding * 1.5;
}
.card-content { .card-content {
display: flex; display: flex;
flex-direction: row; flex-direction: row;

22
fittrackee_client/src/scss/base.scss
View File

@ -4,6 +4,28 @@
body { body {
margin: 0; margin: 0;
overflow-y: scroll;
scrollbar-gutter: stable both-edges;
&::-webkit-scrollbar {
width: $scrollbar-width;
height: $scrollbar-height;
}
&::-webkit-scrollbar-track {
background: transparent;
}
&::-webkit-scrollbar-thumb {
background: transparent;
border-radius: $scrollbar-radius;
}
&:hover {
&::-webkit-scrollbar-thumb {
background: var(--scroll-thumb-color);
}
&::-webkit-scrollbar-track {
background: transparent;
}
}
} }
#app { #app {

2
fittrackee_client/src/scss/colors.scss
View File

@ -76,4 +76,6 @@
--password-color-good: #acc578; --password-color-good: #acc578;
--password-color-strong: #57c255; --password-color-strong: #57c255;
--scroll-thumb-color: #b9bcbd;
} }

7
fittrackee_client/src/scss/vars.scss
View File

@ -19,3 +19,10 @@ $default-padding: 10px;
$default-margin: $default-padding; $default-margin: $default-padding;
$border-radius: 4px; $border-radius: 4px;
/*
* === SCROLLBAR ===
*/
$scrollbar-height : $default-padding * .5;
$scrollbar-width : $scrollbar-height;
$scrollbar-radius : $default-padding;