Merge branch 'dev' into improve-ui
This commit is contained in:
commit
33c5c6054f
2
fittrackee/dist/index.html
vendored
2
fittrackee/dist/index.html
vendored
@ -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
2
fittrackee/dist/service-worker.js
vendored
File diff suppressed because one or more lines are too long
2
fittrackee/dist/service-worker.js.map
vendored
2
fittrackee/dist/service-worker.js.map
vendored
File diff suppressed because one or more lines are too long
1
fittrackee/dist/static/css/app.53424207.css
vendored
1
fittrackee/dist/static/css/app.53424207.css
vendored
File diff suppressed because one or more lines are too long
1
fittrackee/dist/static/css/app.ce91f57c.css
vendored
Normal file
1
fittrackee/dist/static/css/app.ce91f57c.css
vendored
Normal file
File diff suppressed because one or more lines are too long
1
fittrackee/dist/static/css/workouts.48a31074.css
vendored
Normal file
1
fittrackee/dist/static/css/workouts.48a31074.css
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -131,6 +131,7 @@
|
||||
|
||||
.workout-arrow {
|
||||
cursor: pointer;
|
||||
padding: $default-padding;
|
||||
&.inactive {
|
||||
color: var(--disabled-color);
|
||||
cursor: default;
|
||||
@ -168,12 +169,19 @@
|
||||
cursor: pointer;
|
||||
padding: 0 $default-padding * 0.3;
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (max-width: $small-limit) {
|
||||
.fa-download,
|
||||
.fa-trash,
|
||||
.fa-edit {
|
||||
padding: 0 $default-padding * 0.7;
|
||||
@media screen and (max-width: $small-limit) {
|
||||
.workout-arrow {
|
||||
padding: $default-padding * 0.5;
|
||||
}
|
||||
.workout-card-title {
|
||||
@media screen and (max-width: $small-limit) {
|
||||
.fa-download,
|
||||
.fa-trash,
|
||||
.fa-edit {
|
||||
padding: 0 $default-padding * 0.7;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -184,6 +184,9 @@
|
||||
display: flex;
|
||||
::v-deep(.card) {
|
||||
width: 100%;
|
||||
.card-title {
|
||||
padding: $default-padding $default-padding * 1.5;
|
||||
}
|
||||
.card-content {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
@ -4,6 +4,28 @@
|
||||
|
||||
body {
|
||||
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 {
|
||||
|
@ -76,4 +76,6 @@
|
||||
--password-color-good: #acc578;
|
||||
--password-color-strong: #57c255;
|
||||
|
||||
--scroll-thumb-color: #b9bcbd;
|
||||
|
||||
}
|
@ -19,3 +19,10 @@ $default-padding: 10px;
|
||||
$default-margin: $default-padding;
|
||||
|
||||
$border-radius: 4px;
|
||||
|
||||
/*
|
||||
* === SCROLLBAR ===
|
||||
*/
|
||||
$scrollbar-height : $default-padding * .5;
|
||||
$scrollbar-width : $scrollbar-height;
|
||||
$scrollbar-radius : $default-padding;
|
Loading…
Reference in New Issue
Block a user