10000 Fix linting thrown from default template when enabling prettier optio… · NickBolles/typescript-1@5ecab1c · GitHub
[go: up one dir, main page]
Skip to content

Commit 5ecab1c

Browse files
Liam Potteraldarund
Liam Potter
authored and
aldarund
committed
Fix linting thrown from default template when enabling prettier option, container centering when enabling tailwind option (nuxt#98)
* fix default linting errors when enabling prettier option * fix centering issue for tailwind option, fix vuetify styles for prettier option
1 parent dc089eb commit 5ecab1c

File tree

7 files changed

+45
-41
lines changed

7 files changed

+45
-41
lines changed

‎template/_package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"eslint": "^5.0.1",
5151
"eslint-loader": "^2.0.0",
5252
"eslint-plugin-vue": "^4.0.0"<% } %><% if (prettier === 'yes') { %>,
53+
"eslint-config-prettier": "^3.1.0",
5354
"eslint-plugin-prettier": "2.6.2",
5455
"prettier": "1.14.3"<% } %><% if (ui === 'tailwind') { %>,
5556
"autoprefixer": "^8.6.4",

‎template/frameworks/vuetify/components/Logo.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
.Triangle--one {
3030
border-left: 105px solid transparent;
3131
border-right: 105px solid transparent;
32-
border-bottom: 180px solid #41B883;
32+
border-bottom: 180px solid #41b883;
3333
}
3434
3535
.Triangle--two {
@@ -38,7 +38,7 @@
3838
animation: goright 0.5s linear forwards 3.5s;
3939
border-left: 87.5px solid transparent;
4040
border-right: 87.5px solid transparent;
41-
border-bottom: 150px solid #3B8070;
41+
border-bottom: 150px solid #3b8070;
4242
}
4343
4444
.Triangle--three {
@@ -47,7 +47,7 @@
4747
animation: goright 0.5s linear forwards 3.5s;
4848
border-left: 70px solid transparent;
4949
border-right: 70px solid transparent;
50-
border-bottom: 120px solid #35495E;
50+
border-bottom: 120px solid #35495e;
5151
}
5252
5353
.Triangle--four {

‎template/frameworks/vuetify/components/VuetifyLogo.vue

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
</template>
77

88
<style>
9-
.VuetifyLogo {
10-
width: 180px;
11-
transform: rotateY(560deg);
12-
animation: turn 3.5s ease-out forwards 1s;
13-
}
14-
@keyframes turn {
15-
100% {
16-
transform: rotateY(0deg);
17-
}
9+
.VuetifyLogo {
10+
width: 180px;
11+
transform: rotateY(560deg);
12+
animation: turn 3.5s ease-out forwards 1s;
13+
}
14+
15+
@keyframes turn {
16+
100% {
17+
transform: rotateY(0deg);
1818
}
19+
}
1920
</style>

‎template/nuxt/components/Logo.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
.Triangle--one {
3030
border-left: 105px solid transparent;
3131
border-right: 105px solid transparent;
32-
border-bottom: 180px solid #41B883;
32+
border-bottom: 180px solid #41b883;
3333
}
3434
3535
.Triangle--two {
@@ -38,7 +38,7 @@
3838
animation: goright 0.5s linear forwards 3.5s;
3939
border-left: 87.5px solid transparent;
4040
border-right: 87.5px solid transparent;
41-
border-bottom: 150px solid #3B8070;
41+
border-bottom: 150px solid #3b8070;
4242
}
4343
4444
.Triangle--three {
@@ -47,7 +47,7 @@
4747
animation: goright 0.5s linear forwards 3.5s;
4848
border-left: 70px solid transparent;
4949
border-right: 70px solid transparent;
50-
border-bottom: 120px solid #35495E;
50+
border-bottom: 120px solid #35495e;
5151
}
5252
5353
.Triangle--four {

‎template/nuxt/layouts/default.vue

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</template>
66

77
<style>
8-
html
9-
{
10-
font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
8+
html {
9+
font-family: 'Source Sans Pro', -apple-system, BlinkMacSystemFont, 'Segoe UI',
10+
Roboto, 'Helvetica Neue', Arial, sans-serif;
1111
font-size: 16px;
1212
word-spacing: 1px;
1313
-ms-text-size-adjust: 100%;
@@ -16,27 +16,29 @@ html
1616
-webkit-font-smoothing: antialiased;
1717
box-sizing: border-box;
1818
}
19-
*, *:before, *:after
20-
{
19+
20+
*,
21+
*:before,
22+
*:after {
2123
box-sizing: border-box;
2224
margin: 0;
2325
}
24-
.button--green
25-
{
26+
27+
.button--green {
2628
display: inline-block;
2729
border-radius: 4px;
2830
border: 1px solid #3b8070;
2931
color: #3b8070;
3032
text-decoration: none;
3133
padding: 10px 30px;
3234
}
33-
.button--green:hover
34-
{
35+
36+
.button--green:hover {
3537
color: #fff;
3638
background-color: #3b8070;
3739
}
38-
.button--grey
39-
{
40+
41+
.button--grey {
4042
display: inline-block;
4143
border-radius: 4px;
4244
border: 1px solid #35495e;
@@ -45,8 +47,8 @@ html
4547
padding: 10px 30px;
4648
margin-left: 15px;
4749
}
48-
.button--grey:hover
49-
{
50+
51+
.button--grey:hover {
5052
color: #fff;
5153
background-color: #35495e;
5254
}

‎template/nuxt/nuxt.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module.exports = {
2626
/*
2727
** Customize the progress-bar color
2828
*/
29-
loading: { color: '#FFFFFF' },
29+
loading: { color: '#fff' },
3030

3131
/*
3232
** Global CSS

‎template/nuxt/pages/index.vue

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,39 +35,39 @@ export default {
3535
<style>
3636
<% if (ui === 'tailwind') { %>
3737
/* Sample `apply` at-rules with Tailwind CSS
38-
.container
39-
{
40-
@apply min-h-screen flex justify-center items-center text-center;
38+
.container {
39+
@apply min-h-screen flex justify-center items-center text-center mx-auto;
4140
}
4241
*/
42+
4343
<% } %>
44-
.container
45-
{
44+
.container {
4645
min-height: 100vh;
4746
display: flex;
4847
justify-content: center;
4948
align-items: center;
5049
text-align: center;
5150
}
52-
.title
53-
{
54-
font-family: "Quicksand", "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; /* 1 */
51+
52+
.title {
53+
font-family: 'Quicksand', 'Source Sans Pro', -apple-system, BlinkMacSystemFont,
54+
'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
5555
display: block;
5656
font-weight: 300;
5757
font-size: 100px;
5858
color: #35495e;
5959
letter-spacing: 1px;
6060
}
61-
.subtitle
62-
{
61+
62+
.subtitle {
6363
font-weight: 300;
6464
font-size: 42px;
6565
color: #526488;
6666
word-spacing: 5px;
6767
padding-bottom: 15px;
6868
}
69-
.links
70-
{
69+
70+
.links {
7171
padding-top: 15px;
7272
}
7373
</style>

0 commit comments

Comments
 (0)
0