From eb546e7493ef53d057fa30ef0be75aef7a398f22 Mon Sep 17 00:00:00 2001 From: rayelliott Date: Mon, 30 Mar 2020 19:10:21 +0000 Subject: [PATCH] replace milligram with custom version --- .gitmodules | 3 +++ package.json | 1 - src/css/main.css | 4 +++- src/css/milligram | 1 + yarn.lock | 12 ------------ 5 files changed, 7 insertions(+), 14 deletions(-) create mode 160000 src/css/milligram diff --git a/.gitmodules b/.gitmodules index ce38d30..2ad0969 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "tailwind-starter-kit"] path = tailwind-starter-kit url = https://github.com/creativetimofficial/tailwind-starter-kit.git +[submodule "src/css/milligram"] + path = src/css/milligram + url = ssh://git@git.rayelliott.dev:3222/rayelliott/milligram-fork.git diff --git a/package.json b/package.json index 943c10d..76db3e9 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,6 @@ "@swup/scroll-plugin": "^1.0.6", "glob-all": "^3.2.1", "mapbox-gl": "^1.9.0", - "milligram": "^1.3.0", "normalize.css": "^8.0.1", "swup": "^2.0.9" } diff --git a/src/css/main.css b/src/css/main.css index b56c1fe..ac3a585 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1,8 +1,10 @@ @import "imports/reset.css"; -@import "milligram"; +// @import "milligram"; @import "imports/variables.scss"; +@import "milligram/src/milligram.scss"; + @import "imports/base.scss"; @import "imports/layout.scss"; @import "imports/utility.scss"; diff --git a/src/css/milligram b/src/css/milligram new file mode 160000 index 0000000..d07b4a6 --- /dev/null +++ b/src/css/milligram @@ -0,0 +1 @@ +Subproject commit d07b4a61e5a9dc204fb8133238db2221e1781c67 diff --git a/yarn.lock b/yarn.lock index d99442c..db86174 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5397,13 +5397,6 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -milligram@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/milligram/-/milligram-1.3.0.tgz#a5d980ef8eaf79337c96a8d7c7e176764931042c" - integrity sha1-pdmA746veTN8lqjXx+F2dkkxBCw= - dependencies: - normalize.css "~5.0.0" - mime-db@1.43.0, "mime-db@>= 1.43.0 < 2", mime-db@^1.28.0: version "1.43.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" @@ -5768,11 +5761,6 @@ normalize.css@^8.0.1: resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3" integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg== -normalize.css@~5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-5.0.0.tgz#7cec875ce8178a5333c4de80b68ea9c18b9d7c37" - integrity sha1-fOyHXOgXilMzxN6Ato6pwYudfDc= - npm-conf@^1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"