Skip to content

Commit

Permalink
fix(weatherstatus): adjustments from review comments
Browse files Browse the repository at this point in the history
Signed-off-by: Julien Veyssier <[email protected]>
  • Loading branch information
julien-nc committed Sep 25, 2024
1 parent 966a0a9 commit efcc3e5
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 48 deletions.
6 changes: 3 additions & 3 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,9 @@ Files: core/img/appstore.svg
Copyright: 2024 Apple Inc.
License: LicenseRef-AppleAppStoreBadge

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
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>
License: LicenseRef-freepikLicense
Files: apps/weather_status/img/met.no.icons/*.svg
Copyright: 2015-2017 NRK og Meteorologisk institutt <https://github.com/metno/weathericons>
License: MIT

Files: core/img/f-droid.svg
Copyright: 2016 Andrew Nayenko <[email protected]>
Expand Down
39 changes: 0 additions & 39 deletions LICENSES/LicenseRef-freepikLicense.txt

This file was deleted.

16 changes: 10 additions & 6 deletions apps/weather_status/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,19 @@
:menu-name="currentWeatherMessage">
<template #icon>
<NcLoadingIcon v-if="loading" />
<img v-else :src="weatherIconUrl" class="weather-image" alt="t('weather_status', 'Weather icon')">
<img v-else
:src="weatherIconUrl"
alt=""
class="weather-image">
</template>
<NcActionText v-if="gotWeather"
:aria-hidden="true">
<template #icon>
<NcLoadingIcon v-if="loading" />
<div v-else class="weather-action-image-container">
<img :src="futureWeatherIconUrl" class="weather-image" alt="t('weather_status', 'Future weather icon')">
<img :src="futureWeatherIconUrl"
alt=""
class="weather-image">
</div>
</template>
{{ forecastMessage }}
Expand Down Expand Up @@ -47,8 +52,7 @@
{{ addRemoveFavoriteText }}
</NcActionButton>
<NcActionSeparator v-if="address && !errorMessage" />
<NcActionButton
:close-after-click="true"
<NcActionButton :close-after-click="true"
:aria-hidden="true"
@click="onBrowserLocationClick">
<template #icon>
Expand Down Expand Up @@ -76,7 +80,7 @@
<NcIconSvgWrapper name="Star"
:svg="starSvg"
:size="20"
class="favorite-color" />
:class="{'favorite-color': address === favorite}" />
</template>
{{ favorite }}
</NcActionButton>
Expand Down Expand Up @@ -567,7 +571,7 @@ export default {
justify-content: center;
}
.weather-image {
width: 28px;
width: calc(var(--default-clickable-area) - 2 * var(--default-grid-baseline));
}

// Set color to primary element for current / active favorite address
Expand Down

0 comments on commit efcc3e5

Please sign in to comment.