Skip to content

Commit 2ba90b3

Browse files
committed
add tailwind
1 parent 8e08247 commit 2ba90b3

File tree

7 files changed

+102
-68
lines changed

7 files changed

+102
-68
lines changed

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
_site
22
.sass-cache
33
.jekyll-metadata
4+
node_modules/
5+
.idea
6+
.jekyll-cache
7+
package-lock.json

Gemfile

+4-6
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ source "https://rubygems.org"
88
#
99
# This will help ensure the proper Jekyll version is running.
1010
# Happy Jekylling!
11-
gem "jekyll", "3.5.2"
12-
13-
gem 'bootstrap-sass'
14-
gem 'jekyll-bootstrap-sass'
11+
gem "jekyll", "~> 4.1.1"
12+
gem 'jekyll-postcss'
1513

1614

1715
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
@@ -20,8 +18,8 @@ gem 'jekyll-bootstrap-sass'
2018

2119
# If you have any plugins, put them here!
2220
group :jekyll_plugins do
23-
gem "jekyll-feed", "~> 0.6"
24-
gem 'jekyll-admin'
21+
gem 'jekyll-feed', '~> 0.15.1'
22+
gem 'jekyll-admin', '~> 0.11.0'
2523
gem 'jekyll-timeago'
2624

2725
end

Gemfile.lock

+70-60
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,82 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.5.2)
5-
public_suffix (>= 2.0.2, < 4.0)
6-
autoprefixer-rails (8.5.2)
7-
execjs
8-
backports (3.11.3)
9-
bootstrap-sass (3.3.7)
10-
autoprefixer-rails (>= 5.2.1)
11-
sass (>= 3.3.4)
4+
addressable (2.7.0)
5+
public_suffix (>= 2.0.2, < 5.0)
6+
backports (3.20.1)
127
colorator (1.1.0)
13-
execjs (2.7.0)
14-
ffi (1.9.23)
15-
ffi (1.9.23-java)
16-
ffi (1.9.23-x64-mingw32)
17-
ffi (1.9.23-x86-mingw32)
8+
concurrent-ruby (1.1.7)
9+
em-websocket (0.5.2)
10+
eventmachine (>= 0.12.9)
11+
http_parser.rb (~> 0.6.0)
12+
eventmachine (1.2.7)
13+
eventmachine (1.2.7-java)
14+
eventmachine (1.2.7-x64-mingw32)
15+
eventmachine (1.2.7-x86-mingw32)
16+
ffi (1.14.2)
17+
ffi (1.14.2-java)
18+
ffi (1.14.2-x64-mingw32)
19+
ffi (1.14.2-x86-mingw32)
1820
forwardable-extended (2.6.0)
19-
jekyll (3.5.2)
21+
http_parser.rb (0.6.0)
22+
http_parser.rb (0.6.0-java)
23+
i18n (1.8.7)
24+
concurrent-ruby (~> 1.0)
25+
jekyll (4.1.1)
2026
addressable (~> 2.4)
2127
colorator (~> 1.0)
22-
jekyll-sass-converter (~> 1.0)
23-
jekyll-watch (~> 1.1)
24-
kramdown (~> 1.3)
28+
em-websocket (~> 0.5)
29+
i18n (~> 1.0)
30+
jekyll-sass-converter (~> 2.0)
31+
jekyll-watch (~> 2.0)
32+
kramdown (~> 2.1)
33+
kramdown-parser-gfm (~> 1.0)
2534
liquid (~> 4.0)
26-
mercenary (~> 0.3.3)
35+
mercenary (~> 0.4.0)
2736
pathutil (~> 0.9)
28-
rouge (~> 1.7)
37+
rouge (~> 3.0)
2938
safe_yaml (~> 1.0)
30-
jekyll-admin (0.8.0)
31-
addressable (~> 2.4)
32-
jekyll (~> 3.3)
39+
terminal-table (~> 1.8)
40+
jekyll-admin (0.11.0)
41+
jekyll (>= 3.7, < 5.0)
3342
sinatra (~> 1.4)
3443
sinatra-contrib (~> 1.4)
35-
jekyll-bootstrap-sass (0.1.0)
36-
bootstrap-sass (~> 3.3)
37-
jekyll (>= 2.5)
38-
jekyll-feed (0.9.3)
39-
jekyll (~> 3.3)
40-
jekyll-sass-converter (1.5.2)
41-
sass (~> 3.4)
44+
jekyll-feed (0.15.1)
45+
jekyll (>= 3.7, < 5.0)
46+
jekyll-postcss (0.4.0)
47+
jekyll-sass-converter (2.1.0)
48+
sassc (> 2.0.1, < 3.0)
4249
jekyll-timeago (0.9.2)
43-
jekyll-watch (1.5.1)
50+
jekyll-watch (2.2.1)
4451
listen (~> 3.0)
45-
kramdown (1.16.2)
46-
liquid (4.0.0)
47-
listen (3.1.5)
48-
rb-fsevent (~> 0.9, >= 0.9.4)
49-
rb-inotify (~> 0.9, >= 0.9.7)
50-
ruby_dep (~> 1.2)
51-
mercenary (0.3.6)
52-
multi_json (1.13.1)
53-
pathutil (0.16.1)
52+
kramdown (2.3.0)
53+
rexml
54+
kramdown-parser-gfm (1.1.0)
55+
kramdown (~> 2.0)
56+
liquid (4.0.3)
57+
listen (3.4.0)
58+
rb-fsevent (~> 0.10, >= 0.10.3)
59+
rb-inotify (~> 0.9, >= 0.9.10)
60+
mercenary (0.4.0)
61+
multi_json (1.15.0)
62+
pathutil (0.16.2)
5463
forwardable-extended (~> 2.6)
55-
public_suffix (3.0.2)
56-
rack (1.6.10)
64+
public_suffix (4.0.6)
65+
rack (1.6.13)
5766
rack-protection (1.5.5)
5867
rack
59-
rack-test (1.0.0)
68+
rack-test (1.1.0)
6069
rack (>= 1.0, < 3)
61-
rb-fsevent (0.10.3)
62-
rb-inotify (0.9.10)
63-
ffi (>= 0.5.0, < 2)
64-
rouge (1.11.1)
65-
ruby_dep (1.5.0)
66-
safe_yaml (1.0.4)
67-
sass (3.5.6)
68-
sass-listen (~> 4.0.0)
69-
sass-listen (4.0.0)
70-
rb-fsevent (~> 0.9, >= 0.9.4)
71-
rb-inotify (~> 0.9, >= 0.9.7)
70+
rb-fsevent (0.10.4)
71+
rb-inotify (0.10.1)
72+
ffi (~> 1.0)
73+
rexml (3.2.4)
74+
rouge (3.26.0)
75+
safe_yaml (1.0.5)
76+
sassc (2.4.0)
77+
ffi (~> 1.9)
78+
sassc (2.4.0-x64-mingw32)
79+
ffi (~> 1.9)
7280
sinatra (1.4.8)
7381
rack (~> 1.5)
7482
rack-protection (~> 1.4)
@@ -80,13 +88,16 @@ GEM
8088
rack-test
8189
sinatra (~> 1.4.0)
8290
tilt (>= 1.3, < 3)
91+
terminal-table (1.8.0)
92+
unicode-display_width (~> 1.1, >= 1.1.1)
8393
thread_safe (0.3.6)
8494
thread_safe (0.3.6-java)
85-
tilt (2.0.8)
95+
tilt (2.0.10)
8696
tzinfo (1.2.5)
8797
thread_safe (~> 0.1)
8898
tzinfo-data (1.2018.5)
8999
tzinfo (>= 1.0.0)
100+
unicode-display_width (1.7.0)
90101

91102
PLATFORMS
92103
java
@@ -96,13 +107,12 @@ PLATFORMS
96107
x86-mswin32
97108

98109
DEPENDENCIES
99-
bootstrap-sass
100-
jekyll (= 3.5.2)
101-
jekyll-admin
102-
jekyll-bootstrap-sass
103-
jekyll-feed (~> 0.6)
110+
jekyll (~> 4.1.1)
111+
jekyll-admin (~> 0.11.0)
112+
jekyll-feed (~> 0.15.1)
113+
jekyll-postcss
104114
jekyll-timeago
105115
tzinfo-data
106116

107117
BUNDLED WITH
108-
1.16.1
118+
1.17.3

_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ twitter_username: jekyllrb
2020
github_username: jekyll
2121
markdown: kramdown
2222
plugins:
23-
- jekyll-feed
23+
- jekyll-postcss
2424
sass:
2525
load_paths:
2626
- _sass

assets/css/main.scss

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
---
22
---
33

4-
@import "scss_main";
4+
@import "tailwindcss/base";
5+
6+
@import "tailwindcss/components";
7+
8+
@import "tailwindcss/utilities";

postcss.config.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module.exports = {
2+
plugins: [
3+
require('postcss-import'),
4+
require('tailwindcss'),
5+
require('autoprefixer'),
6+
]
7+
}

tailwind.config.js

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module.exports = {
2+
purge: [],
3+
darkMode: false, // or 'media' or 'class'
4+
theme: {
5+
extend: {},
6+
},
7+
variants: {
8+
extend: {},
9+
},
10+
plugins: [],
11+
}

0 commit comments

Comments
 (0)