diff --git a/.gitignore b/.gitignore index 53be7c5..f4dc43e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ _site Gemfile.lock node_modules .git-metadata +assets/css/main.css \ No newline at end of file diff --git a/Gemfile b/Gemfile index 861af4d..7c8c953 100644 --- a/Gemfile +++ b/Gemfile @@ -2,15 +2,4 @@ source "https://rubygems.org" -gem "jekyll", "~> 4" -gem "webrick", "~> 1.7" - -group :jekyll_plugins do - gem "jekyll-postcss" - gem 'kramdown-parser-gfm' - gem "jekyll-gfm-admonitions" - gem "jekyll-sitemap" - gem 'jekyll-git_metadata' - gem 'jekyll-feed' - gem 'jekyll-git' -end \ No newline at end of file +gemspec \ No newline at end of file diff --git a/_config.yml b/_config.yml index 1d2f1d1..42ec5cb 100644 --- a/_config.yml +++ b/_config.yml @@ -5,12 +5,11 @@ url: "https://matmanna.github.io/doctored" encoding: utf-8 plugins: - - jekyll-postcss - - jekyll-git_metadata - kramdown-parser-gfm - jekyll-gfm-admonitions - jekyll-sitemap - jekyll-feed + - jekyll-git feed: icon: /assets/images/favicon.png @@ -37,6 +36,8 @@ exclude: - node_modules - package-lock.json - postcss.config.js +- tailwind.config.js +- .github sass: sourcemap: never diff --git a/assets/css/main.css b/assets/css/tailwind.css similarity index 99% rename from assets/css/main.css rename to assets/css/tailwind.css index 95c08b3..ceb5678 100644 --- a/assets/css/main.css +++ b/assets/css/tailwind.css @@ -1,6 +1,3 @@ ---- ---- - @import "tailwindcss/base"; @import "tailwindcss/components"; @import "tailwindcss/utilities"; diff --git a/doctored.gemspec b/doctored.gemspec index 29e0370..48f61f8 100644 --- a/doctored.gemspec +++ b/doctored.gemspec @@ -3,7 +3,7 @@ Gem::Specification.new do |spec| spec.name = "doctored" - spec.version = "0.1.4" + spec.version = "0.1.6" spec.authors = ["matmanna"] spec.email = [""] spec.license = "MIT" @@ -14,16 +14,14 @@ Gem::Specification.new do |spec| spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r!^(assets|_layouts|_includes|_sass|LICENSE|README|_config\.yml|404\.md|package\.json|postcss\.config\.js|tailwind\.config\.js)!) } - spec.add_runtime_dependency "jekyll", ">= 3.9.0" - spec.add_runtime_dependency "webrick", "~> 1.7" - - spec.add_runtime_dependency "jekyll-postcss" - spec.add_runtime_dependency "kramdown-parser-gfm" - spec.add_runtime_dependency "jekyll-gfm-admonitions" - spec.add_runtime_dependency "jekyll-sitemap" - spec.add_runtime_dependency "jekyll-git_metadata" - spec.add_runtime_dependency "jekyll-feed" - spec.add_runtime_dependency "jekyll-git" + spec.add_runtime_dependency "jekyll", "~> 4" + spec.add_dependency "webrick", "~> 1.7" + spec.add_dependency "jekyll-postcss" + spec.add_dependency "kramdown-parser-gfm" + spec.add_dependency "jekyll-gfm-admonitions" + spec.add_dependency "jekyll-sitemap" + spec.add_dependency "jekyll-git", "~> 0.3.5" + spec.add_dependency "jekyll-feed" spec.add_development_dependency "bundler" end diff --git a/package.json b/package.json index 9a46ee5..c889aa7 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "scripts": { "postinstall": "bundle install", "dev": "bundle exec jekyll serve --watch", - "build": "python utils/postMarkdown.py && bundle exec jekyll build", + "build": "postcss assets/css/tailwind.css -o assets/css/main.css && python utils/postMarkdown.py && bundle exec jekyll build", "clean": "bundle exec jekyll clean", "doctor": "bundle exec jekyll doctor", "post": "python utils/postMarkdown.py"