Skip to content

Commit 6e1ec4e

Browse files
octoperoctoper
committed
Upgrade to TailwindCSS v2
1 parent d20b5a9 commit 6e1ec4e

13 files changed

+5628
-5468
lines changed

‎composer.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@
88
],
99
"license": "MIT",
1010
"require": {
11-
"php": "^7.4",
11+
"php": "^7.4|^8.0",
1212
"ext-json": "*",
13-
"ext-simplexml": "*",,
13+
"ext-simplexml": "*",
1414
"erusev/parsedown-extra": "^0.8.1",
15-
"fideloper/proxy": "^4.2",
15+
"fideloper/proxy": "^4.4",
1616
"fruitcake/laravel-cors": "^2.0",
1717
"guzzlehttp/guzzle": "^7.0.1",
18-
"laravel/framework": "^8.0",
19-
"laravel/tinker": "^2.0",
18+
"laravel/framework": "^8.22",
19+
"laravel/tinker": "^2.5",
2020
"league/commonmark": "^1.5",
2121
"spatie/yaml-front-matter": "^2.0",
22-
"symfony/yaml": "^5.1",
22+
"symfony/yaml": "^5.2"
2323
},
2424
"require-dev": {
25-
"facade/ignition": "^2.3.6",
26-
"friendsofphp/php-cs-fixer": "^2.16",
27-
"fakerphp/faker": "^1.9.1",
28-
"mockery/mockery": "^1.3.1",
29-
"nunomaduro/collision": "^5.0",
30-
"pestphp/pest": "^0.3.6",
31-
"pestphp/pest-plugin-laravel": "^0.3.0",
32-
"phpunit/phpunit": "^9.3.10"
25+
"facade/ignition": "^2.5.8",
26+
"friendsofphp/php-cs-fixer": "^2.17",
27+
"fakerphp/faker": "^1.13",
28+
"mockery/mockery": "^1.4",
29+
"nunomaduro/collision": "^5.2",
30+
"pestphp/pest": "^1.0",
31+
"pestphp/pest-plugin-laravel": "^1.0.0",
32+
"phpunit/phpunit": "^9.5.0"
3333
},
3434
"config": {
3535
"optimize-autoloader": true,

‎composer.lock

Lines changed: 677 additions & 950 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json

Lines changed: 4729 additions & 4219 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,31 @@
22
"private": true,
33
"scripts": {
44
"dev": "npm run development",
5-
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
5+
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
66
"watch": "npm run development -- --watch",
77
"watch-poll": "npm run watch -- --watch-poll",
8-
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js",
8+
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
99
"prod": "npm run production",
10-
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
10+
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --config=node_modules/laravel-mix/setup/webpack.config.js"
1111
},
1212
"devDependencies": {
13-
"@tailwindcss/typography": "^0.2.0",
14-
"@tailwindcss/ui": "^0.5.0",
15-
"axios": "^0.19",
13+
"@tailwindcss/typography": "^0.3.1",
1614
"cross-env": "^7.0",
17-
"laravel-mix": "^5.0.1",
18-
"laravel-mix-tailwind": "^0.1.0",
19-
"lodash": "^4.17.19",
15+
"css-loader": "^5.0.1",
16+
"laravel-mix": "^6.0.6",
2017
"resolve-url-loader": "^3.1.2",
21-
"sass": "^1.26.11",
22-
"sass-loader": "^8.0.2",
23-
"tailwindcss": "^1.8.10",
18+
"sass": "^1.32.0",
19+
"sass-loader": "^10.1.0",
20+
"tailwindcss": "^2.0.2",
2421
"vue-template-compiler": "^2.6.12"
2522
},
2623
"dependencies": {
2724
"@docsearch/css": "^1.0.0-alpha.28",
2825
"@docsearch/js": "^1.0.0-alpha.28",
2926
"ally.js": "^1.4.1",
30-
"alpinejs": "^2.7.0",
27+
"alpinejs": "^2.8.0",
3128
"clipboard": "^2.0.6",
32-
"docsearch.js": "^2.6.3",
33-
"highlight.js": "^10.4.1",
29+
"highlight.js": "^10.5.0",
3430
"quicklink": "^2.0.0"
3531
}
3632
}

‎resources/sass/_base.scss

Lines changed: 18 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ body {
44
}
55

66
a {
7-
@apply .font-medium;
8-
@apply .no-underline;
9-
@apply .text-blue-600;
7+
@apply font-medium no-underline text-blue-600;
108

119
&:hover {
12-
@apply .text-blue-700;
10+
@apply text-blue-700;
1311
}
1412
}
1513

@@ -19,83 +17,70 @@ h3,
1917
h4,
2018
h5,
2119
h6 {
22-
@apply .leading-tight;
23-
@apply .mb-4;
24-
@apply .mt-8;
25-
@apply .text-gray-900;
20+
@apply leading-tight mb-4 mt-8 text-gray-900;
2621

2722
&:first-child {
28-
@apply .mt-0;
23+
@apply mt-0;
2924
}
3025
}
3126

3227
h1 {
33-
@apply .font-extrabold;
34-
@apply .text-5xl;
28+
@apply font-extrabold text-5xl;
3529
}
3630

3731
h2 {
38-
@apply .font-bold;
39-
@apply .text-4xl;
32+
@apply font-bold text-4xl;
4033
}
4134

4235
h3 {
43-
@apply .font-bold;
44-
@apply .text-3xl;
36+
@apply font-bold text-3xl;
4537
}
4638

4739
h4 {
48-
@apply .font-normal;
49-
@apply .text-2xl;
40+
@apply font-normal text-2xl;
5041
}
5142

5243
h5 {
53-
@apply .font-normal;
54-
@apply .text-xl;
44+
@apply font-normal text-xl;
5545
}
5646

5747
h6 {
58-
@apply .font-light;
59-
@apply .text-lg;
48+
@apply font-light text-lg;
6049
}
6150

6251
hr {
63-
@apply .border-b;
64-
@apply .border-blue-200;
65-
@apply .my-12;
66-
@apply .rounded-full;
52+
@apply border-b border-blue-200 my-12 rounded-full;
6753
}
6854

6955
li {
7056
ul,
7157
ol {
72-
@apply .my-0;
58+
@apply my-0;
7359
}
7460
}
7561

7662
ol,
7763
ul {
78-
@apply .my-4;
64+
@apply my-4;
7965
}
8066

8167
ol {
82-
@apply .list-decimal;
68+
@apply list-decimal;
8369
padding-inline-start: 0.3rem;
8470
}
8571

8672
ul {
87-
@apply .list-disc;
73+
@apply list-disc;
8874
}
8975

9076
p {
91-
@apply .my-3;
77+
@apply my-3;
9278

9379
@screen md {
94-
@apply .my-6;
80+
@apply my-6;
9581
}
9682
}
9783

9884
::selection {
99-
@apply .bg-blue-500;
100-
@apply .text-white;
85+
@apply bg-blue-500 text-white;
10186
}

‎resources/sass/_code.scss

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,29 @@
11
p, li, ol {
22
code {
3+
@apply shadow;
34
color: #4a5568;
45
font-weight: 300;
56
font-size: .75rem;
67
padding: .25rem;
7-
@apply shadow;
88
border-radius: .25rem;
99
background-color: #edf2f7;
1010
}
1111
}
1212

1313
pre {
1414
.copyBtn {
15-
@apply absolute;
16-
@apply right-0;
17-
@apply h-6 w-6;
18-
@apply outline-none;
19-
@apply text-gray-700;
15+
@apply absolute right-0 h-6 w-6 outline-none text-gray-700;
16+
2017
&:hover, &:focus, &:active {
2118
@apply text-gray-500;
2219
}
2320
svg {
24-
@apply absolute;
25-
@apply top-0;
26-
@apply right-0;
27-
@apply mr-4 mt-5;
21+
@apply absolute top-0 right-0 mr-4 mt-5;
2822
}
2923
}
30-
@apply .flex;
24+
@apply flex;
3125
code {
32-
@apply .flex;
33-
@apply .flex-1;
26+
@apply flex flex-1;
3427
}
3528
}
3629

@@ -42,7 +35,6 @@ pre {
4235
*/
4336
/* cyrillic-ext */
4437
@font-face {
45-
@apply .rounded-lg bg-gray-800 mb-12;
4638
font-family: 'Fira Mono';
4739
font-style: normal;
4840
font-weight: 400;

0 commit comments

Comments
 (0)