Skip to content

Commit efcc3e5

Browse files
committed
fix(weatherstatus): adjustments from review comments
Signed-off-by: Julien Veyssier <[email protected]>
1 parent 966a0a9 commit efcc3e5

File tree

3 files changed

+13
-48
lines changed

3 files changed

+13
-48
lines changed

.reuse/dep5

+3-3
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,9 @@ Files: core/img/appstore.svg
227227
Copyright: 2024 Apple Inc.
228228
License: LicenseRef-AppleAppStoreBadge
229229

230-
Files: apps/weather_status/img/cloud-cloud.svg apps/weather_status/img/cloud-dots.svg apps/weather_status/img/cross.svg apps/weather_status/img/drop.svg apps/weather_status/img/fog.svg apps/weather_status/img/half-sun.svg apps/weather_status/img/heavy-rain.svg apps/weather_status/img/light-rain.svg apps/weather_status/img/moon-cloud-heavy-rain.svg apps/weather_status/img/moon-cloud-light-rain.svg apps/weather_status/img/moon-cloud-rain.svg apps/weather_status/img/moon-cloud.svg apps/weather_status/img/moon-small-cloud.svg apps/weather_status/img/moon.svg apps/weather_status/img/rain.svg apps/weather_status/img/snow.svg apps/weather_status/img/sun-cloud-heavy-rain.svg apps/weather_status/img/sun-cloud-light-rain.svg apps/weather_status/img/sun-cloud-rain.svg apps/weather_status/img/sun-cloud.svg apps/weather_status/img/sun-small-cloud.svg apps/weather_status/img/sun.svg apps/weather_status/img/thunder.svg apps/weather_status/img/umbrella.svg
231-
Copyright: 2024 Designed by Freepik, titusurya <https://www.freepik.com/author/titusurya> at <https://www.freepik.com/free-vector/coloured-weather-icons-collection_895655.htm>
232-
License: LicenseRef-freepikLicense
230+
Files: apps/weather_status/img/met.no.icons/*.svg
231+
Copyright: 2015-2017 NRK og Meteorologisk institutt <https://github.com/metno/weathericons>
232+
License: MIT
233233

234234
Files: core/img/f-droid.svg
235235
Copyright: 2016 Andrew Nayenko <[email protected]>

LICENSES/LicenseRef-freepikLicense.txt

-39
This file was deleted.

apps/weather_status/src/App.vue

+10-6
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,19 @@
1111
:menu-name="currentWeatherMessage">
1212
<template #icon>
1313
<NcLoadingIcon v-if="loading" />
14-
<img v-else :src="weatherIconUrl" class="weather-image" alt="t('weather_status', 'Weather icon')">
14+
<img v-else
15+
:src="weatherIconUrl"
16+
alt=""
17+
class="weather-image">
1518
</template>
1619
<NcActionText v-if="gotWeather"
1720
:aria-hidden="true">
1821
<template #icon>
1922
<NcLoadingIcon v-if="loading" />
2023
<div v-else class="weather-action-image-container">
21-
<img :src="futureWeatherIconUrl" class="weather-image" alt="t('weather_status', 'Future weather icon')">
24+
<img :src="futureWeatherIconUrl"
25+
alt=""
26+
class="weather-image">
2227
</div>
2328
</template>
2429
{{ forecastMessage }}
@@ -47,8 +52,7 @@
4752
{{ addRemoveFavoriteText }}
4853
</NcActionButton>
4954
<NcActionSeparator v-if="address && !errorMessage" />
50-
<NcActionButton
51-
:close-after-click="true"
55+
<NcActionButton :close-after-click="true"
5256
:aria-hidden="true"
5357
@click="onBrowserLocationClick">
5458
<template #icon>
@@ -76,7 +80,7 @@
7680
<NcIconSvgWrapper name="Star"
7781
:svg="starSvg"
7882
:size="20"
79-
class="favorite-color" />
83+
:class="{'favorite-color': address === favorite}" />
8084
</template>
8185
{{ favorite }}
8286
</NcActionButton>
@@ -567,7 +571,7 @@ export default {
567571
justify-content: center;
568572
}
569573
.weather-image {
570-
width: 28px;
574+
width: calc(var(--default-clickable-area) - 2 * var(--default-grid-baseline));
571575
}
572576

573577
// Set color to primary element for current / active favorite address

0 commit comments

Comments
 (0)