Skip to content

Commit

Permalink
🔀 Merge pull request #1425 from Lissy93/FIX/ticket-fixes-1419
Browse files Browse the repository at this point in the history
[FIX] Many bug fixes
Updates for #1419
  • Loading branch information
Lissy93 committed Dec 31, 2023
2 parents 3e75854 + 8e3c54f commit 604ce97
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/close-stale-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/stale@v4
with:
repo-token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
days-before-stale: 90
days-before-stale: 360
days-before-close: 5
operations-per-run: 30
remove-stale-when-updated: true
Expand All @@ -25,9 +25,9 @@ jobs:
This PR is stale because it has been open 6 weeks with no activity. Either remove the stale label or comment below with a short update,
otherwise this PR will be closed in 5 days.
close-issue-message: >
This issue was automatically closed because it has been stalled for over 6 weeks with no activity.
This issue was automatically closed because it has been stalled for over 1 year with no activity.
close-pr-message: >
This pull request was automatically closed because it has been stalled for over 6 weeks with no activity.
This pull request was automatically closed because it has been stalled for over 1 year with no activity.
stale-issue-label: '⚰️ Stale'
close-issue-label: '🕸️ Inactive'
stale-pr-label: '⚰️ Stale'
Expand Down
4 changes: 3 additions & 1 deletion docs/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -504,9 +504,11 @@ Usually, Font Awesome will be automatically enabled if one or more of your icons

If you are trying to use a premium icon, then you must have a [Pro License](https://fontawesome.com/plans). You'll then need to specify your Pro plan API key under `appConfig.fontAwesomeKey`. You can find this key, by logging into your FA account, navigate to Account → [Kits](https://fontawesome.com/kits) → New Kit → Copy Kit Code. The code is a 10-digit alpha-numeric code, and is also visible within the new kit's URL, for example: `81e48ce079`.

<p align="center"><img src="https://i.ibb.co/hZ0D9vs/where-do-i-find-my-font-awesome-key.png" width="600" /></p>

Be sure that you're specifying the icon category and name correctly. You're icon should look be `[category] fa-[icon-name]`. The following categories are supported: `far` _(regular)_, `fas` _(solid)_, `fal`_(light)_, `fad` _(duo-tone)_ and `fab`_(brands)_. With the exception of brands, you'll usually want all your icons to be in from same category, so they look uniform.

Ensure the icon you are trying to use, is available within [FontAwesome Version 5](https://fontawesome.com/v5/search).
Ensure the icon you are trying to use, is available within [FontAwesome Version 5](https://fontawesome.com/v5/search) (we've not yet upgraded to V6, as it works a little differently).

Examples: `fab fa-raspberry-pi`, `fas fa-database`, `fas fa-server`, `fas fa-ethernet`

Expand Down
4 changes: 3 additions & 1 deletion docs/widgets.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ A simple, live-updating local weather component, showing temperature, conditions
**`city`** | `string` | Required | A city name to use for fetching weather. This can also be a state code or country code, following the ISO-3166 format
**`units`** | `string` | _Optional_ | The units to use for displaying data, can be either `metric` or `imperial`. Defaults to `metric`
**`hideDetails`** | `boolean` | _Optional_ | If set to `true`, the additional details (wind, humidity, pressure, etc) will not be shown. Defaults to `false`
**`lat`** | `number` | _Optional_ | To show weather for a specific location, you can provide the latitude and longitude coordinates. If provided, this will override the `city` option
**`lon`** | `number` | _Optional_ | To show weather for a specific location, you can provide the latitude and longitude coordinates. If provided, this will override the `city` option

#### Example

Expand All @@ -160,7 +162,7 @@ A simple, live-updating local weather component, showing temperature, conditions
apiKey: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
city: London
units: metric
hideDetails: false
hideDetails: true
```

#### Info
Expand Down
2 changes: 2 additions & 0 deletions src/components/LinkItems/Item.vue
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ export default {
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
word-break: keep-all;
overflow: hidden;
span.text {
white-space: nowrap;
}
Expand Down Expand Up @@ -385,6 +386,7 @@ p.description {
font-size: .9em;
line-height: 1rem;
height: 2rem;
overflow: hidden;
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/components/Settings/CustomThemeMaker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,10 @@ div.action-buttons {
min-width: 6rem;
padding: 0.25rem 0.5rem;
margin: 1rem 0.5rem 0.5rem;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/components/Widgets/GlCpuGauge.vue
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ export default {
cursor: pointer;
font-size: 0.9rem;
text-align: center;
width: 100%;
width: fit-content;
margin: 0.25rem auto;
padding: 0.1rem 0.25rem;
Expand Down
3 changes: 2 additions & 1 deletion src/components/Widgets/PublicHolidays.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ export default {
const formatType = (ht) => capitalize(ht.replaceAll('_', ' '));
holidays.forEach((holiday) => {
results.push({
name: holiday.name.filter(p => p.lang == this.options.lang)[0].text || holiday.name[0].text,
name: holiday.name
.filter(p => p.lang === this.options.lang)[0].text || holiday.name[0].text,
date: makeDate(holiday.date),
type: formatType(holiday.holidayType),
observed: holiday.observedOn ? makeDate(holiday.observedOn) : '',
Expand Down
13 changes: 11 additions & 2 deletions src/components/Widgets/Weather.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@ export default {
return this.options.units || 'metric';
},
endpoint() {
const { apiKey, city } = this.options;
const {
apiKey, city, lat, lon,
} = this.options;
if (lat && lon) {
return `${widgetApiEndpoints.weather}?lat=${lat}&lon=${lon}&appid=${apiKey}&units=${this.units}`;
}
return `${widgetApiEndpoints.weather}?q=${city}&appid=${apiKey}&units=${this.units}`;
},
tempDisplayUnits() {
Expand Down Expand Up @@ -106,7 +111,11 @@ export default {
checkProps() {
const ops = this.options;
if (!ops.apiKey) this.error('Missing API key for OpenWeatherMap');
if (!ops.city) this.error('A city name is required to fetch weather');
if ((!ops.lat || !ops.lon) && !ops.city) {
this.error('A city name or lat + lon is required to fetch weather');
}
if (ops.units && ops.units !== 'metric' && ops.units !== 'imperial') {
this.error('Invalid units specified, must be either \'metric\' or \'imperial\'');
}
Expand Down
2 changes: 1 addition & 1 deletion src/styles/color-themes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1777,7 +1777,7 @@ html[data-theme="tama"] {

// large tile spacing adjustment
.there-are-items:has(.item-wrapper.wrap-size-large) { padding-top: .25rem; }
.item-wrapper.wrap-size-large { margin: 0rem .5rem .5rem 0rem; }
.item-wrapper.wrap-size-large { margin: 0rem .5rem .5rem 0rem; overflow: hidden; }
.item.size-large .tile-title { padding: 0rem 0rem 0rem .7rem; }

// Hide open method icon
Expand Down
1 change: 1 addition & 0 deletions src/styles/global-styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ html {
border-radius: var(--curve-factor-small);
color: var(--description-tooltip-color);
padding: var(--tooltip-padding);
overflow: hidden;
}
.tooltip-arrow {
width: 0;
Expand Down

1 comment on commit 604ce97

@vercel
Copy link

@vercel vercel bot commented on 604ce97 Dec 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

dashy – ./

dashy-delta.vercel.app
dashy-git-master-alicia.vercel.app
dashy-alicia.vercel.app

Please sign in to comment.