Skip to content

Commit 826e691

Browse files
gitnameheregitnamehere
committed
Merge branch 'main' into gh-pages
2 parents 7c57a8e + f0d7ae8 commit 826e691

31 files changed

+1245
-1162
lines changed

‎.eslintrc.cjs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,4 @@ module.exports = {
1111
parserOptions: {
1212
ecmaVersion: 'latest'
1313
},
14-
rules: {
15-
"vue/html-indent": [1, 4]
16-
}
1714
}

‎.prettierrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://json.schemastore.org/prettierrc",
3-
"tabWidth": 4,
3+
"tabWidth": 2,
44
"printWidth": 100,
55
"trailingComma": "none"
66
}

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8">
55
<link rel="icon" href="/favicon.ico">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<title>Vite App</title>
7+
<title>A Vue Weather App</title>
88
</head>
99
<body>
1010
<div id="app"></div>

‎src/App.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ import { RouterView } from "vue-router";
33
</script>
44

55
<template>
6-
<RouterView />
6+
<RouterView />
77
</template>

‎src/assets/scss/main.scss‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
#app {
2-
font-weight: normal;
3-
width: 100%;
2+
font-weight: normal;
3+
width: 100%;
44
}
55

66
a {
7-
text-decoration: none;
8-
transition: 0.4s;
9-
color: white;
7+
text-decoration: none;
8+
transition: 0.4s;
9+
color: white;
1010
}
1111

1212
*,
1313
*::before,
1414
*::after {
15-
box-sizing: border-box;
16-
margin: 0;
17-
font-weight: normal;
15+
box-sizing: border-box;
16+
margin: 0;
17+
font-weight: normal;
1818
}
1919

2020
body {
21-
min-height: 100vh;
22-
color: white;
23-
background: #111;
24-
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
25-
Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
26-
font-size: 15px;
27-
text-rendering: optimizeLegibility;
28-
-webkit-font-smoothing: antialiased;
29-
-moz-osx-font-smoothing: grayscale;
21+
min-height: 100vh;
22+
color: white;
23+
background: #111;
24+
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
25+
Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
26+
font-size: 15px;
27+
text-rendering: optimizeLegibility;
28+
-webkit-font-smoothing: antialiased;
29+
-moz-osx-font-smoothing: grayscale;
3030
}

‎src/components/CardItem.vue‎

Lines changed: 0 additions & 123 deletions
This file was deleted.

‎src/components/HumidityGauge.vue‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)