Skip to content

Commit 87a06da

Browse files
robiningelbrechtrobiningelbrecht
committed
ISSUE #1656: Fix ActivityGrid widget tabs consistency
1 parent 1ed5ffc commit 87a06da

File tree

109 files changed

+582
-599
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+582
-599
lines changed

‎public/css/dist/tailwind.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/tailwind.output.css‎

Lines changed: 56 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -991,8 +991,8 @@
991991
.top-0 {
992992
top: calc(var(--spacing) * 0);
993993
}
994-
.top-\[60px\] {
995-
top: 60px;
994+
.top-15 {
995+
top: calc(var(--spacing) * 15);
996996
}
997997
.right-0 {
998998
right: calc(var(--spacing) * 0);
@@ -1099,6 +1099,9 @@
10991099
.-mt-0\.5 {
11001100
margin-top: calc(var(--spacing) * -0.5);
11011101
}
1102+
.mt-0\.5 {
1103+
margin-top: calc(var(--spacing) * 0.5);
1104+
}
11021105
.mt-1 {
11031106
margin-top: calc(var(--spacing) * 1);
11041107
}
@@ -1114,9 +1117,6 @@
11141117
.mt-4 {
11151118
margin-top: calc(var(--spacing) * 4);
11161119
}
1117-
.mt-\[2px\] {
1118-
margin-top: 2px;
1119-
}
11201120
.apexcharts-canvas {
11211121
& .apexcharts-tooltip {
11221122
background-color: white !important;
@@ -1613,6 +1613,15 @@
16131613
.h-16 {
16141614
height: calc(var(--spacing) * 16);
16151615
}
1616+
.h-30 {
1617+
height: calc(var(--spacing) * 30);
1618+
}
1619+
.h-32 {
1620+
height: calc(var(--spacing) * 32);
1621+
}
1622+
.h-36 {
1623+
height: calc(var(--spacing) * 36);
1624+
}
16161625
.h-48 {
16171626
height: calc(var(--spacing) * 48);
16181627
}
@@ -1637,24 +1646,15 @@
16371646
.h-\[12px\] {
16381647
height: 12px;
16391648
}
1640-
.h-\[20rem\] {
1641-
height: 20rem;
1642-
}
16431649
.h-\[24rem\] {
16441650
height: 24rem;
16451651
}
16461652
.h-\[25vh\] {
16471653
height: 25vh;
16481654
}
1649-
.h-\[120px\] {
1650-
height: 120px;
1651-
}
16521655
.h-\[130px\] {
16531656
height: 130px;
16541657
}
1655-
.h-\[145px\] {
1656-
height: 145px;
1657-
}
16581658
.h-\[350px\] {
16591659
height: 350px;
16601660
}
@@ -1706,8 +1706,8 @@
17061706
.min-h-40 {
17071707
min-height: calc(var(--spacing) * 40);
17081708
}
1709-
.min-h-\[16rem\] {
1710-
min-height: 16rem;
1709+
.min-h-64 {
1710+
min-height: calc(var(--spacing) * 64);
17111711
}
17121712
.min-h-\[350px\] {
17131713
min-height: 350px;
@@ -1837,48 +1837,48 @@
18371837
.w-11 {
18381838
width: calc(var(--spacing) * 11);
18391839
}
1840+
.w-16 {
1841+
width: calc(var(--spacing) * 16);
1842+
}
1843+
.w-18 {
1844+
width: calc(var(--spacing) * 18);
1845+
}
1846+
.w-20 {
1847+
width: calc(var(--spacing) * 20);
1848+
}
1849+
.w-24 {
1850+
width: calc(var(--spacing) * 24);
1851+
}
1852+
.w-32 {
1853+
width: calc(var(--spacing) * 32);
1854+
}
18401855
.w-36 {
18411856
width: calc(var(--spacing) * 36);
18421857
}
18431858
.w-48 {
18441859
width: calc(var(--spacing) * 48);
18451860
}
1861+
.w-50 {
1862+
width: calc(var(--spacing) * 50);
1863+
}
1864+
.w-52 {
1865+
width: calc(var(--spacing) * 52);
1866+
}
18461867
.w-64 {
18471868
width: calc(var(--spacing) * 64);
18481869
}
1849-
.w-\[1rem\] {
1850-
width: 1rem;
1870+
.w-92 {
1871+
width: calc(var(--spacing) * 92);
18511872
}
18521873
.w-\[2rem\] {
18531874
width: 2rem;
18541875
}
1855-
.w-\[4\.5rem\] {
1856-
width: 4.5rem;
1857-
}
1858-
.w-\[4rem\] {
1859-
width: 4rem;
1860-
}
18611876
.w-\[5rem\] {
18621877
width: 5rem;
18631878
}
1864-
.w-\[6rem\] {
1865-
width: 6rem;
1866-
}
18671879
.w-\[8rem\] {
18681880
width: 8rem;
18691881
}
1870-
.w-\[13rem\] {
1871-
width: 13rem;
1872-
}
1873-
.w-\[23rem\] {
1874-
width: 23rem;
1875-
}
1876-
.w-\[200px\] {
1877-
width: 200px;
1878-
}
1879-
.w-\[rem\] {
1880-
width: rem;
1881-
}
18821882
.w-auto {
18831883
width: auto;
18841884
}
@@ -1974,15 +1974,18 @@
19741974
border-color: var(--color-blue-600);
19751975
}
19761976
}
1977+
.min-w-25 {
1978+
min-width: calc(var(--spacing) * 25);
1979+
}
1980+
.min-w-40 {
1981+
min-width: calc(var(--spacing) * 40);
1982+
}
19771983
.min-w-200 {
19781984
min-width: calc(var(--spacing) * 200);
19791985
}
19801986
.min-w-\[10rem\] {
19811987
min-width: 10rem;
19821988
}
1983-
.min-w-\[100px\] {
1984-
min-width: 100px;
1985-
}
19861989
.flex-1 {
19871990
flex: 1;
19881991
}
@@ -2609,7 +2612,7 @@
26092612
.bg-blue-50 {
26102613
background-color: var(--color-blue-50);
26112614
}
2612-
.bg-blue-600\/\[\.1\] {
2615+
.bg-blue-600\/10 {
26132616
background-color: color-mix(in srgb, #2563EB 10%, transparent);
26142617
@supports (color: color-mix(in lab, red, red)) {
26152618
background-color: color-mix(in oklab, var(--color-blue-600) 10%, transparent);
@@ -2618,7 +2621,7 @@
26182621
.bg-blue-700 {
26192622
background-color: var(--color-blue-700);
26202623
}
2621-
.bg-emerald-600\/\[\.1\] {
2624+
.bg-emerald-600\/10 {
26222625
background-color: color-mix(in srgb, oklch(59.6% 0.145 163.225) 10%, transparent);
26232626
@supports (color: color-mix(in lab, red, red)) {
26242627
background-color: color-mix(in oklab, var(--color-emerald-600) 10%, transparent);
@@ -2651,7 +2654,7 @@
26512654
background-color: color-mix(in oklab, var(--color-orange-400) 40%, transparent);
26522655
}
26532656
}
2654-
.bg-orange-500\/\[\.1\] {
2657+
.bg-orange-500\/10 {
26552658
background-color: color-mix(in srgb, #DD6B20 10%, transparent);
26562659
@supports (color: color-mix(in lab, red, red)) {
26572660
background-color: color-mix(in oklab, var(--color-orange-500) 10%, transparent);
@@ -2666,13 +2669,13 @@
26662669
.bg-red-600 {
26672670
background-color: var(--color-red-600);
26682671
}
2669-
.bg-red-600\/\[\.1\] {
2672+
.bg-red-600\/10 {
26702673
background-color: color-mix(in srgb, #DC2626 10%, transparent);
26712674
@supports (color: color-mix(in lab, red, red)) {
26722675
background-color: color-mix(in oklab, var(--color-red-600) 10%, transparent);
26732676
}
26742677
}
2675-
.bg-slate-600\/\[\.1\] {
2678+
.bg-slate-600\/10 {
26762679
background-color: color-mix(in srgb, oklch(44.6% 0.043 257.281) 10%, transparent);
26772680
@supports (color: color-mix(in lab, red, red)) {
26782681
background-color: color-mix(in oklab, var(--color-slate-600) 10%, transparent);
@@ -2696,7 +2699,7 @@
26962699
.bg-yellow-50 {
26972700
background-color: var(--color-yellow-50);
26982701
}
2699-
.bg-yellow-300\/\[\.1\] {
2702+
.bg-yellow-300\/10 {
27002703
background-color: color-mix(in srgb, #FCD34D 10%, transparent);
27012704
@supports (color: color-mix(in lab, red, red)) {
27022705
background-color: color-mix(in oklab, var(--color-yellow-300) 10%, transparent);
@@ -2815,9 +2818,6 @@
28152818
.p-8 {
28162819
padding: calc(var(--spacing) * 8);
28172820
}
2818-
.p-\[1rem\] {
2819-
padding: 1rem;
2820-
}
28212821
.px-1 {
28222822
padding-inline: calc(var(--spacing) * 1);
28232823
}
@@ -3346,17 +3346,17 @@
33463346
}
33473347
}
33483348
}
3349-
.group-hover\/menu-item\:fill-\[\#111827\] {
3349+
.group-hover\/menu-item\:fill-\[\#FFDD04\] {
33503350
&:is(:where(.group\/menu-item):hover *) {
33513351
@media (hover: hover) {
3352-
fill: #111827;
3352+
fill: #FFDD04;
33533353
}
33543354
}
33553355
}
3356-
.group-hover\/menu-item\:fill-\[\#FFDD04\] {
3356+
.group-hover\/menu-item\:fill-gray-900 {
33573357
&:is(:where(.group\/menu-item):hover *) {
33583358
@media (hover: hover) {
3359-
fill: #FFDD04;
3359+
fill: var(--color-gray-900);
33603360
}
33613361
}
33623362
}
@@ -3654,13 +3654,6 @@
36543654
}
36553655
}
36563656
}
3657-
.hover\:text-\[\#111827\] {
3658-
&:hover {
3659-
@media (hover: hover) {
3660-
color: #111827;
3661-
}
3662-
}
3663-
}
36643657
.hover\:text-\[\#fc4c01\] {
36653658
&:hover {
36663659
@media (hover: hover) {
@@ -3908,7 +3901,7 @@
39083901
display: none;
39093902
}
39103903
}
3911-
.md\:max-w-\[100\%\] {
3904+
.md\:max-w-full {
39123905
@media (width >= 48rem) {
39133906
max-width: 100%;
39143907
}
@@ -4023,11 +4016,6 @@
40234016
display: none;
40244017
}
40254018
}
4026-
.lg\:w-\[450px\] {
4027-
@media (width >= 64rem) {
4028-
width: 450px;
4029-
}
4030-
}
40314019
.lg\:w-md {
40324020
@media (width >= 64rem) {
40334021
width: var(--container-md);
@@ -4084,11 +4072,6 @@
40844072
width: calc(var(--spacing) * 162);
40854073
}
40864074
}
4087-
.xl\:w-\[650px\] {
4088-
@media (width >= 80rem) {
4089-
width: 650px;
4090-
}
4091-
}
40924075
.xl\:grid-cols-2 {
40934076
@media (width >= 80rem) {
40944077
grid-template-columns: repeat(2, minmax(0, 1fr));

‎templates/html/activity/activities.html.twig‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -230,16 +230,16 @@
230230
<thead class="z-10 sticky top-0 text-xs text-gray-700 uppercase bg-gray-50">
231231
<tr>
232232
<th scope="col" data-dataTable-sort="start-date" class="px-2 py-3 cursor-pointer">
233-
<div class="w-[4.5rem] flex items-center justify-center" title="{{ "Date"|trans }}">
233+
<div class="w-18 flex items-center justify-center" title="{{ "Date"|trans }}">
234234
{{ svg('calendar') }}
235235
{{ svg('sorting-icon') }}
236236
</div>
237237
</th>
238238
<th scope="col" class="px-2 py-3 bg-gray-50 lg:sticky lg:left-0">
239-
<div class="w-[23rem]">&nbsp;</div>
239+
<div class="w-92">&nbsp;</div>
240240
</th>
241241
<th scope="col" data-dataTable-sort="distance" class="px-6 py-3 cursor-pointer">
242-
<div class="w-[5rem] flex items-center justify-center" title="{{ "Distance"|trans }}">
242+
<div class="w-20 flex items-center justify-center" title="{{ "Distance"|trans }}">
243243
{{ svg('distance') }}
244244
{{ svg('sorting-icon') }}
245245
</div>
@@ -249,7 +249,7 @@
249249
</div>
250250
</th>
251251
<th scope="col" data-dataTable-sort="elevation" class="px-6 py-3 cursor-pointer">
252-
<div class="w-[5rem] flex items-center justify-center" title="{{ "Elevation"|trans }}">
252+
<div class="w-20 flex items-center justify-center" title="{{ "Elevation"|trans }}">
253253
{{ svg('elevation') }}
254254
{{ svg('sorting-icon') }}
255255
</div>
@@ -259,7 +259,7 @@
259259
</div>
260260
</th>
261261
<th scope="col" data-dataTable-sort="moving-time" class="px-6 py-3 cursor-pointer">
262-
<div class="w-[4rem] flex items-center justify-center" title="{{ "Time"|trans }}">
262+
<div class="w-16 flex items-center justify-center" title="{{ "Time"|trans }}">
263263
{{ svg('time') }}
264264
{{ svg('sorting-icon') }}
265265
</div>
@@ -268,21 +268,21 @@
268268
</div>
269269
</th>
270270
<th scope="col" data-dataTable-sort="speed" class="px-6 py-3 cursor-pointer">
271-
<div class="w-[4rem] flex items-center justify-center" title="{{ "Speed"|trans }}">
271+
<div class="w-16 flex items-center justify-center" title="{{ "Speed"|trans }}">
272272
{{ svg('speed') }}
273273
{{ svg('sorting-icon') }}
274274
</div>
275275
<div class="pt-0.5">&nbsp;</div>
276276
</th>
277277
<th scope="col" data-dataTable-sort="heart-rate" class="px-6 py-3 cursor-pointer">
278-
<div class="w-[4rem] flex items-center justify-center" title="{{ "Heart rate"|trans }}">
278+
<div class="w-16 flex items-center justify-center" title="{{ "Heart rate"|trans }}">
279279
{{ svg('heart-rate') }}
280280
{{ svg('sorting-icon') }}
281281
</div>
282282
<div class="pt-0.5">&nbsp;</div>
283283
</th>
284284
<th scope="col" data-dataTable-sort="calories" class="px-6 py-3 cursor-pointer">
285-
<div class="w-[6rem] flex items-center justify-center" title="{{ "Calories burned"|trans }}">
285+
<div class="w-24 flex items-center justify-center" title="{{ "Calories burned"|trans }}">
286286
{{ svg('calories') }}
287287
{{ svg('sorting-icon') }}
288288
</div>
@@ -291,7 +291,7 @@
291291
</div>
292292
</th>
293293
<th scope="col" data-dataTable-sort="power" class="px-6 py-3 cursor-pointer">
294-
<div class="w-[rem] flex items-center justify-center" title="{{ "Power"|trans }}">
294+
<div class="flex items-center justify-center" title="{{ "Power"|trans }}">
295295
{{ svg('power') }}
296296
{{ svg('sorting-icon') }}
297297
</div>

0 commit comments

Comments
 (0)