Skip to content

Commit d46a2a7

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

File tree

22 files changed

+64
-82
lines changed

22 files changed

+64
-82
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: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,24 +1637,18 @@
16371637
.h-80 {
16381638
height: calc(var(--spacing) * 80);
16391639
}
1640+
.h-96 {
1641+
height: calc(var(--spacing) * 96);
1642+
}
16401643
.h-104 {
16411644
height: calc(var(--spacing) * 104);
16421645
}
16431646
.h-120 {
16441647
height: calc(var(--spacing) * 120);
16451648
}
1646-
.h-\[12px\] {
1647-
height: 12px;
1648-
}
1649-
.h-\[24rem\] {
1650-
height: 24rem;
1651-
}
16521649
.h-\[25vh\] {
16531650
height: 25vh;
16541651
}
1655-
.h-\[130px\] {
1656-
height: 130px;
1657-
}
16581652
.h-\[350px\] {
16591653
height: 350px;
16601654
}
@@ -1676,6 +1670,9 @@
16761670
.h-screen {
16771671
height: 100vh;
16781672
}
1673+
.max-h-9 {
1674+
max-height: calc(var(--spacing) * 9);
1675+
}
16791676
.max-h-48 {
16801677
max-height: calc(var(--spacing) * 48);
16811678
}
@@ -1685,9 +1682,6 @@
16851682
.max-h-80 {
16861683
max-height: calc(var(--spacing) * 80);
16871684
}
1688-
.max-h-\[35px\] {
1689-
max-height: 35px;
1690-
}
16911685
.max-h-\[calc\(100vh-160px\)\] {
16921686
max-height: calc(100vh - 160px);
16931687
}
@@ -1870,15 +1864,6 @@
18701864
.w-92 {
18711865
width: calc(var(--spacing) * 92);
18721866
}
1873-
.w-\[2rem\] {
1874-
width: 2rem;
1875-
}
1876-
.w-\[5rem\] {
1877-
width: 5rem;
1878-
}
1879-
.w-\[8rem\] {
1880-
width: 8rem;
1881-
}
18821867
.w-auto {
18831868
width: auto;
18841869
}
@@ -1983,9 +1968,6 @@
19831968
.min-w-200 {
19841969
min-width: calc(var(--spacing) * 200);
19851970
}
1986-
.min-w-\[10rem\] {
1987-
min-width: 10rem;
1988-
}
19891971
.flex-1 {
19901972
flex: 1;
19911973
}

‎templates/html/activity/activity--sport-type--generic.html.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</button>
3131
</div>
3232
{% if activity.getDescription() %}
33-
<div class="text-xs font-normal text-gray-500 max-h-[35px] overflow-y-auto">{{ activity.getDescription()|nl2br }}</div>
33+
<div class="text-xs font-normal text-gray-500 max-h-9 overflow-y-auto">{{ activity.getDescription()|nl2br }}</div>
3434
{% endif %}
3535
</div>
3636
<!-- Modal body -->
@@ -96,7 +96,7 @@
9696
{% if activity.getLocalImagePaths() %}
9797
<div class="flex gap-2 relative overflow-x-auto">
9898
{% for imagePath in activity.getLocalImagePaths() %}
99-
<div class="h-[130px] shrink-0">
99+
<div class="h-32 shrink-0">
100100
<img class="h-full object-cover object-top rounded-lg lazy"
101101
src="{{ placeholderImage() }}" data-src="{{ relativeUrl(imagePath) }}"
102102
alt="Activity image"/>

‎templates/html/activity/activity--sport-type--swim.html.twig‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -72,32 +72,32 @@
7272
<div id="splitsLapsTabLaps" role="tabpanel" aria-labelledby="splitsLapsTabLaps-tab">
7373
<div class="text-center text-gray-500 text-sm h-[350px] relative overflow-x-auto px-2 pb-2 border border-gray-200 rounded-lg shadow-sm">
7474
<div class="bg-white sticky top-0 pt-2 flex items-center text-xs text-gray-700 uppercase font-bold">
75-
<div class="w-[2rem] px-2 py-2">{{ "Lap"|trans }}</div>
76-
<div class="w-[8rem] px-2 py-2">{{ "Distance"|trans }}</div>
77-
<div class="w-[8rem] px-2 py-2">{{ "Time"|trans }}</div>
78-
<div class="w-[8rem] px-2 py-2">{{ "Pace"|trans }}</div>
79-
<div class="w-[8rem] px-2 py-2">{{ "HR"|trans }}</div>
75+
<div class="w-8 px-2 py-2">{{ "Lap"|trans }}</div>
76+
<div class="w-32 px-2 py-2">{{ "Distance"|trans }}</div>
77+
<div class="w-32 px-2 py-2">{{ "Time"|trans }}</div>
78+
<div class="w-32 px-2 py-2">{{ "Pace"|trans }}</div>
79+
<div class="w-32 px-2 py-2">{{ "HR"|trans }}</div>
8080
</div>
8181
{% for lap in laps %}
8282
<div class="flex items-center border-b last:border-b-0">
83-
<div class="w-[2rem] px-2 py-2 font-bold">
83+
<div class="w-8 px-2 py-2 font-bold">
8484
{{ lap.getLapNumber() }}
8585
</div>
86-
<div class="w-[8rem] px-2 py-2">
86+
<div class="w-32 px-2 py-2">
8787
{{ lap.getDistance()|renderMeasurement(0) }}
8888
</div>
89-
<div class="w-[8rem] px-2 py-2">
89+
<div class="w-32 px-2 py-2">
9090
{{ lap.getMovingTimeFormatted() }}
9191
</div>
92-
<div class="w-[8rem] px-2 py-2">
92+
<div class="w-32 px-2 py-2">
9393
{{ lap.getPaceInSecPer100Meter()|formatPace }}<span class="text-xs">/100m</span>
9494
</div>
9595
{% if lap.getAverageHeartRate() %}
96-
<div class="w-[8rem] px-2 py-2">
96+
<div class="w-32 px-2 py-2">
9797
{{ lap.getAverageHeartRate() }}
9898
</div>
9999
{% else %}
100-
<div class="w-[8rem] px-2 py-2">
100+
<div class="w-32 px-2 py-2">
101101
{{ "n/a"|trans }}
102102
</div>
103103
{% endif %}
@@ -110,30 +110,30 @@
110110
<div id="splitsLapsTabSplits" role="tabpanel" aria-labelledby="splitsLapsTabSplits-tab">
111111
<div class="text-center text-gray-500 text-sm h-[350px] relative overflow-x-auto px-2 pb-2 border border-gray-200 rounded-lg shadow-sm">
112112
<div class="bg-white sticky top-0 pt-2 flex items-center text-xs text-gray-700 uppercase font-bold">
113-
<div class="w-[2rem] px-2 py-2">{{ renderUnitSymbol('distance') }}</div>
114-
<div class="w-[5rem] px-2 py-2">{{ "Pace"|trans }}</div>
115-
<div class="grow min-w-[10rem] px-2 py-2"></div>
116-
<div class="w-[5rem] px-2 py-2">{{ "HR"|trans }}</div>
113+
<div class="w-8 px-2 py-2">{{ renderUnitSymbol('distance') }}</div>
114+
<div class="w-20 px-2 py-2">{{ "Pace"|trans }}</div>
115+
<div class="grow min-w-40 px-2 py-2"></div>
116+
<div class="w-20 px-2 py-2">{{ "HR"|trans }}</div>
117117
</div>
118118
{% for split in splits %}
119119
<div class="flex items-center border-b last:border-b-0">
120-
<div class="w-[2rem] px-2 py-2 font-bold">
120+
<div class="w-8 px-2 py-2 font-bold">
121121
{{ split.getSplitNumber() }}
122122
</div>
123-
<div class="w-[5rem] px-2 py-2">
123+
<div class="w-20 px-2 py-2">
124124
{{ split.getPaceInSecPer100Meter()|formatPace }}<span class="text-xs">/100m</span>
125125
</div>
126-
<div class="grow min-w-[10rem] px-2 py-2">
126+
<div class="grow min-w-40 px-2 py-2">
127127
<div class=" bg-gray-200 rounded-full h-2.5">
128128
<div class="bg-strava-orange h-2.5 rounded-full" style="width: {{ split.getRelativePacePercentage() }}%"></div>
129129
</div>
130130
</div>
131131
{% if split.getAverageHeartRate() %}
132-
<div class="w-[5rem] px-2 py-2">
132+
<div class="w-20 px-2 py-2">
133133
{{ split.getAverageHeartRate() }}
134134
</div>
135135
{% else %}
136-
<div class="w-[5rem] px-2 py-2">
136+
<div class="w-20 px-2 py-2">
137137
{{ "n/a"|trans }}
138138
</div>
139139
{% endif %}

‎templates/html/gear/gear.html.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
</div>
136136
</div>
137137
<div class="relative overflow-x-auto">
138-
<div class="h-[24rem]" data-echarts-options='{{ distancePerMonthPerGearChart }}'></div>
138+
<div class="h-96" data-echarts-options='{{ distancePerMonthPerGearChart }}'></div>
139139
</div>
140140
</div>
141141
<!-- DISTANCE OVER TIME PER GEAR -->
@@ -155,7 +155,7 @@
155155
</div>
156156
</div>
157157
<div class="relative overflow-x-auto">
158-
<div class="h-[24rem]" data-echarts-options='{{ distanceOverTimePerGear }}'></div>
158+
<div class="h-96" data-echarts-options='{{ distanceOverTimePerGear }}'></div>
159159
</div>
160160
</div>
161161
</div>

‎templates/html/index.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
</div>
247247
</div>
248248
<div class="flex gap-x-1 items-center justify-center border-t py-2 px-4 text-xs text-center text-gray-500">
249-
<img class="h-[12px]" src="{{ relativeUrl('assets/images/strava/powered-by-strava.svg') }}"
249+
<img class="h-3" src="{{ relativeUrl('assets/images/strava/powered-by-strava.svg') }}"
250250
alt="Powered by Strava"/>
251251
<div class="group-[.sidebar-is-collapsed]:hidden">& ☕</div>
252252
</div>

‎tests/Application/Build/BuildActivitiesHtml/__snapshots__/BuildActivitiesHtmlCommandHandlerTest--testHandle--activity-activity-45326441741-html.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@ <h3 class="max-w-[30%] sm:max-w-[50%] md:max-w-full truncate text-lg font-semibo
8282
</div>
8383
</div>
8484
<div class="flex gap-2 relative overflow-x-auto">
85-
<div class="h-[130px] shrink-0">
85+
<div class="h-32 shrink-0">
8686
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
8787
</div>
88-
<div class="h-[130px] shrink-0">
88+
<div class="h-32 shrink-0">
8989
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
9090
</div>
91-
<div class="h-[130px] shrink-0">
91+
<div class="h-32 shrink-0">
9292
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
9393
</div>
94-
<div class="h-[130px] shrink-0">
94+
<div class="h-32 shrink-0">
9595
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
9696
</div>
9797
</div>

‎tests/Application/Build/BuildActivitiesHtml/__snapshots__/BuildActivitiesHtmlCommandHandlerTest--testHandle--activity-activity-8756441741-html.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,16 @@ <h3 class="max-w-[30%] sm:max-w-[50%] md:max-w-full truncate text-lg font-semibo
7676
</div>
7777
</div>
7878
<div class="flex gap-2 relative overflow-x-auto">
79-
<div class="h-[130px] shrink-0">
79+
<div class="h-32 shrink-0">
8080
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
8181
</div>
82-
<div class="h-[130px] shrink-0">
82+
<div class="h-32 shrink-0">
8383
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
8484
</div>
85-
<div class="h-[130px] shrink-0">
85+
<div class="h-32 shrink-0">
8686
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
8787
</div>
88-
<div class="h-[130px] shrink-0">
88+
<div class="h-32 shrink-0">
8989
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
9090
</div>
9191
</div>

‎tests/Application/Build/BuildActivitiesHtml/__snapshots__/BuildActivitiesHtmlCommandHandlerTest--testHandle--activity-activity-87726441741-html.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,16 @@ <h3 class="max-w-[30%] sm:max-w-[50%] md:max-w-full truncate text-lg font-semibo
7676
</div>
7777
</div>
7878
<div class="flex gap-2 relative overflow-x-auto">
79-
<div class="h-[130px] shrink-0">
79+
<div class="h-32 shrink-0">
8080
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
8181
</div>
82-
<div class="h-[130px] shrink-0">
82+
<div class="h-32 shrink-0">
8383
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
8484
</div>
85-
<div class="h-[130px] shrink-0">
85+
<div class="h-32 shrink-0">
8686
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
8787
</div>
88-
<div class="h-[130px] shrink-0">
88+
<div class="h-32 shrink-0">
8989
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
9090
</div>
9191
</div>

‎tests/Application/Build/BuildActivitiesHtml/__snapshots__/BuildActivitiesHtmlCommandHandlerTest--testHandle--activity-activity-87756441741-html.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,16 @@ <h3 class="max-w-[30%] sm:max-w-[50%] md:max-w-full truncate text-lg font-semibo
7676
</div>
7777
</div>
7878
<div class="flex gap-2 relative overflow-x-auto">
79-
<div class="h-[130px] shrink-0">
79+
<div class="h-32 shrink-0">
8080
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
8181
</div>
82-
<div class="h-[130px] shrink-0">
82+
<div class="h-32 shrink-0">
8383
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
8484
</div>
85-
<div class="h-[130px] shrink-0">
85+
<div class="h-32 shrink-0">
8686
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
8787
</div>
88-
<div class="h-[130px] shrink-0">
88+
<div class="h-32 shrink-0">
8989
<img class="h-full object-cover object-top rounded-lg lazy" src="/assets/placeholder.webp" data-src="/files/activities/aea2d7b4-53a7-11ee-a5e1-9a34a3268d74.jpg" alt="Activity image">
9090
</div>
9191
</div>

0 commit comments

Comments
 (0)