diff --git a/web/assets/scss/main.scss b/web/assets/scss/main.scss index 8adc1e694a20f78ead17e2e608afc095526e34ab..1fa6703299c9d50dd3d1796eb00f07afd82ea6d0 100644 --- a/web/assets/scss/main.scss +++ b/web/assets/scss/main.scss @@ -1,4 +1,4 @@ -@tailwind preflight; +@tailwind base; @tailwind components; @@ -6,27 +6,27 @@ @import url('https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700'); body { - color: config('mycolors.text-default'); + color: theme('mycolors.text-default'); } /* -- Links -- */ a { - color: config('mycolors.text-primary'); + color: theme('mycolors.text-primary'); @apply .no-underline; } a:hover { - color: config('mycolors.text-accent'); + color: theme('mycolors.text-accent'); } a.active { - color: config('mycolors.text-accent'); + color: theme('mycolors.text-accent'); } nav a { - color: config('mycolors.text-default'); + color: theme('mycolors.text-default'); } nav a.active { - color: config('mycolors.text-default'); + color: theme('mycolors.text-default'); @apply .border-b-2; /* @apply .border-orange; */ - border-color: config('mycolors.text-accent'); + border-color: theme('mycolors.text-accent'); } /* -- Typography -- */ @@ -35,17 +35,21 @@ h1, h2, h3, h4, h5, h6 { @apply .font-medium; @apply .mt-6; @apply .mb-4; - } h2, h3 { - @apply .border-b .border-grey-dark; + @apply .border-b .border-gray-600; } h1 { @apply .mt-0; } +h1 { @apply .text-3xl; } +h2 { @apply .text-2xl; } +h3 { @apply .text-xl; } +h4 { @apply .text-lg; } + // Anchor links h2 > .headerlink, h3 > .headerlink, @@ -64,7 +68,7 @@ h4 > .headerlink { // Inline code and blocks code { @apply .p-px; - @apply .bg-grey-lighter; + @apply .bg-gray-200; @apply .rounded-sm; } @@ -83,22 +87,22 @@ p, ul, pre { } .inverse { - color: config('mycolors.text-inverse'); - background-color: config('mycolors.bg-inverse'); + color: theme('mycolors.text-inverse'); + background-color: theme('mycolors.bg-inverse'); } .inverse a { - color: config('mycolors.text-inverse'); + color: theme('mycolors.text-inverse'); @apply .border-b; - border-color: config('mycolors.text-accent'); + border-color: theme('mycolors.text-accent'); } .inverse a:hover { - border-color: config('mycolors.text-inverse'); - color: config('mycolors.text-accent'); + border-color: theme('mycolors.text-inverse'); + color: theme('mycolors.text-accent'); } blockquote { - @apply .bg-grey-lighter; + @apply .bg-gray-200; @apply .rounded; @apply .border-l-8; @apply .italic; @@ -134,9 +138,6 @@ cite::before { /* -- Table of contents -- */ #TableOfContents { @apply .text-sm; - ul:first-child { - @apply .list-reset; - } } #TableOfContents>ul:first-child>li>ul>li>a { @apply .font-bold; @@ -152,42 +153,42 @@ cite::before { .win { @apply .os-div; - @apply .border-green-lighter; + @apply .border-green-200; } .linux { @apply .os-div; - @apply .border-orange-lighter; + @apply .border-orange-200; } .mac { @apply .os-div; - @apply .border-blue-lighter; + @apply .border-blue-200; } #btn-win.active { - @apply .text-green; - @apply .border-green; + @apply .text-green-500; + @apply .border-green-500; } #btn-linux.active { - @apply .text-orange; - @apply .border-orange; + @apply .text-orange-500; + @apply .border-orange-500; } #btn-mac.active { - @apply .text-blue; - @apply .border-blue; + @apply .text-blue-500; + @apply .border-blue-500; } #btn-win:hover { - @apply .border-green; + @apply .border-green-500; } #btn-linux:hover { - @apply .border-orange; + @apply .border-orange-500; } #btn-mac:hover { - @apply .border-blue; + @apply .border-blue-500; } /* -- Misc -- */ @@ -205,21 +206,21 @@ table { /* -- Buttons -- */ a.button { - @apply .bg-white .text-grey-darkest .py-4 .px-8 .border .border-grey-light .shadow .rounded-lg; + @apply .bg-white .text-gray-900 .py-4 .px-8 .border .border-gray-300 .shadow .rounded-lg; @apply .font-serif .font-medium .uppercase; - color: config('mycolors.text-primary'); + color: theme('mycolors.text-primary'); } a.button:hover { - @apply .bg-grey-lightest; + @apply .bg-gray-100; } a.btn-inverse { - background: config('mycolors.bg-inverse'); - color: config('mycolors.text-inverse'); + background: theme('mycolors.bg-inverse'); + color: theme('mycolors.text-inverse'); } a.btn-inverse:hover { - background: config('mycolors.bg-default'); - color: config('mycolors.text-accent'); + background: theme('mycolors.bg-default'); + color: theme('mycolors.text-accent'); } /* -------------------------------- Images ---------------------------------- */ @@ -237,7 +238,7 @@ figcaption { /* ------------------------------- Components ------------------------------- */ .btn { - @apply text-grey-darkest; + @apply text-gray-900; @apply .px-2; @apply .py-1; @apply .border-b-2; @@ -245,21 +246,21 @@ figcaption { } .btn.active { - @apply .border-orange; + @apply .border-orange-500; } .note { - @apply .bg-orange-lightest; + @apply .bg-orange-100; @apply .px-4; @apply .py-1; @apply .mb-4; @apply .border-l-4; - @apply .border-orange; + @apply .border-orange-500; @apply .-ml-4; } .note h3 { - @apply .text-orange; + @apply .text-orange-500; @apply .mb-2; } @@ -269,18 +270,18 @@ figcaption { .slick-prev:before, .slick-next:before { font-size: 24px; - color: config('mycolors.text-primary'); + color: theme('mycolors.text-primary'); } .slick-dots li button:before, .slick-dots li.slick-active button:before { font-size: 8px; - color: config('mycolors.text-primary'); + color: theme('mycolors.text-primary'); } .inverse .slick-prev:before, .inverse .slick-next:before { - color: config('mycolors.text-inverse'); + color: theme('mycolors.text-inverse'); } /* Vertically center images */ @@ -297,7 +298,7 @@ figcaption { color: #999; } .algolia-autocomplete .aa-dropdown-menu { - @apply .bg-grey-lightest; + @apply .bg-gray-100; @apply .border-2; @apply .p-1; @apply .text-sm; @@ -307,11 +308,11 @@ figcaption { @apply .p-1; } .algolia-autocomplete .aa-dropdown-menu .aa-suggestion.aa-cursor { - @apply .bg-blue-lighter; + @apply .bg-blue-200; } .algolia-autocomplete .aa-dropdown-menu .aa-suggestion em { @apply .font-bold; - @apply .text-orange; + @apply .text-orange-500; } @tailwind utilities; diff --git a/web/config.toml b/web/config.toml index f71c3399d2e08119bdb3992fd0303bbc04b7c07d..c1172ba6a8b7b19745bf0b8cf8156cb64b10cb17 100644 --- a/web/config.toml +++ b/web/config.toml @@ -8,6 +8,7 @@ pygmentsstyle = 'friendly' enableGitInfo = true canonifyURLs = true staticDir = ["dist", "static"] +disableKinds = ["taxonomyTerm"] [params] alert = "" diff --git a/web/layouts/books/single.html b/web/layouts/books/single.html index 1a02b8ab522e8c60dd8ffcc994501bae29028fd6..ce88ba22e5b6e5c6675f3de2037703cf639177e5 100644 --- a/web/layouts/books/single.html +++ b/web/layouts/books/single.html @@ -1,6 +1,6 @@ {{ define "main" }} <div class="container"> - <h1>{{ .Title }} {{ if .Params.subtitle }}<span class="text-regular text-grey-dark">– {{ .Params.subtitle }}</span>{{ end }}</h1> + <h1>{{ .Title }} {{ if .Params.subtitle }}<span class="text-regular text-gray-600">– {{ .Params.subtitle }}</span>{{ end }}</h1> <img class="w-1/6 float-left mr-4 mb-2 shadow-md" src="../{{ .Params.book_cover }}" alt=""> {{ .Content }} diff --git a/web/layouts/docs/single.html b/web/layouts/docs/single.html index 79812107ac028f8165bf27b87f3bd6fbf3a4bd98..0883ca4dc11281fdc4af4ecb36ce485dc2a0bcfe 100644 --- a/web/layouts/docs/single.html +++ b/web/layouts/docs/single.html @@ -11,7 +11,7 @@ {{ if eq $subsection "tools"}}Tools{{ end }} </span> </div> - <ul class="list-reset text-sm"> + <ul class="text-sm"> {{ $currentPage := . }} {{ $currentMenu := index .Site.Menus $subsection }} {{ range $currentMenu }} diff --git a/web/layouts/partials/components/news.html b/web/layouts/partials/components/news.html index e90ab99025fb38cda29947be0cbe7d0b8e35f54a..a8e362d1bd69d1587c36002a86575a5bec41a193 100644 --- a/web/layouts/partials/components/news.html +++ b/web/layouts/partials/components/news.html @@ -3,7 +3,7 @@ <div class="w-full md:w-1/2 px-4 md:px-2"> <h2 class="mt-0">Latest News</h2> <div class="py-0 lg:px-4"> - <ul id="news" class="list-reset"> + <ul id="news"> </ul> </div> </div> @@ -11,7 +11,7 @@ <div class="w-full md:w-1/2 px-4 md:px-2"> <h2 class="mt-0">Latest Discussions</h2> <div class="py-0 lg:px-4"> - <ul id="discussions" class="list-reset"> + <ul id="discussions"> </ul> </div> </div> diff --git a/web/layouts/partials/header.html b/web/layouts/partials/header.html index 359c14845db01f9c8e24be72fccaaf1a983322ff..ca5ccb83d6f5028d2dd4acef1554d92f0de4a4b6 100644 --- a/web/layouts/partials/header.html +++ b/web/layouts/partials/header.html @@ -4,7 +4,7 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> - {{ .Hugo.Generator }} + {{ hugo.Generator }} <meta name="description" content="OpenGeoSys"> <meta name="author" content="OpenGeoSys Community"> diff --git a/web/layouts/partials/page-info.html b/web/layouts/partials/page-info.html index bfc02c5d8ee358a467e726cb01c04fda90b9feab..81f7ea7fedef5c46ebfff5e93bc3a1490ed12a65 100644 --- a/web/layouts/partials/page-info.html +++ b/web/layouts/partials/page-info.html @@ -1,6 +1,6 @@ -<div class="mt-20 text-sm text-grey-darker"> +<div class="mt-20 text-sm text-gray-700"> <p>This article was written by {{ .Params.Author }}. If you are missing something or you find an error please <a href="mailto:ogs-devs@googlegroups.com">let us know</a>. - Generated with <a href="https://gohugo.io">Hugo</a> {{ .Hugo.Version }}. Last revision: {{ .Lastmod.Format "January 2, 2006" }} {{ if .IsPage }}<em> + Generated with <a href="https://gohugo.io">Hugo</a> {{ hugo.Version }}. Last revision: {{ .Lastmod.Format "January 2, 2006" }} {{ if .IsPage }}<em> {{ with .GitInfo }} <br> Commit: {{ .Subject }} <a href="https://github.com/ufz/ogs/commit/{{ .AbbreviatedHash }}">{{ .AbbreviatedHash }}</a> diff --git a/web/layouts/partials/site-search.html b/web/layouts/partials/site-search.html index dbd78987faa20e33fd8e39731aa8fc463b797a8f..f7739a7efb7dde6686173704dd1708d5968c323b 100644 --- a/web/layouts/partials/site-search.html +++ b/web/layouts/partials/site-search.html @@ -1,6 +1,6 @@ <form class="w-full max-w-sm text-sm md:text-base" id="site-search-form" role="search"> <fieldset class="flex items-center justify-end"> <label class="mx-2 hidden md:block" for="search-input"><i class="far fa-search"></i></label> - <input type="search" id="search-input" class="bg-grey-lighter appearance-none border-2 border-grey-lighter hover:border-orange rounded w-auto px-2 text-grey-darker" placeholder="Search the Docs" name="email-address" value=""> + <input type="search" id="search-input" class="bg-gray-200 appearance-none border-2 border-gray-200 hover:border-orange rounded w-auto px-2 text-gray-600" placeholder="Search the Docs" name="email-address" value=""> </fieldset> </form> diff --git a/web/layouts/section/books.html b/web/layouts/section/books.html index f28956d53078a484f70a8c838965620e1699b586..0a5f43ff93da88b24f81d62234a52fdc118fe2aa 100644 --- a/web/layouts/section/books.html +++ b/web/layouts/section/books.html @@ -7,9 +7,9 @@ <div class="w-1/6 float-left mr-4 mb-2"> <img src="/books/{{ .Params.book_cover }}" alt="Cover"> </div> - <p class="text-sm text-grey-dark mb-1">{{ .Params.book_type }}</p> - <a class="text-black font-bold text-xl mb-2" href="{{ .Permalink }}">{{ .Title }}</a> <span class="text-sm text-grey-dark">{{ .Params.subtitle }}</span> - <p class="text-grey-darker text-sm">{{ .Content | truncate 500 }}</p> + <p class="text-sm text-gray-600 mb-1">{{ .Params.book_type }}</p> + <a class="text-black font-bold text-xl mb-2" href="{{ .Permalink }}">{{ .Title }}</a> <span class="text-sm text-600-dark">{{ .Params.subtitle }}</span> + <p class="text-gray-700 text-sm">{{ .Content | truncate 500 }}</p> <p><a href="{{.Permalink}}">Show details <i class="far fa-arrow-right"></i></a></p> <div style="clear: both; font-size: 0;"> </div> </div> diff --git a/web/layouts/section/releases.html b/web/layouts/section/releases.html index 26e53f4db9564f071472d012393648089b2aa0e6..40ab3dea31db92d2024e7d71452a7db8f601c8da 100644 --- a/web/layouts/section/releases.html +++ b/web/layouts/section/releases.html @@ -13,7 +13,7 @@ Downloads for the current development version of OpenGeoSys can be found on our continuous integration system: </p> <p> - <a href="https://jenkins.opengeosys.org/job/ufz/job/ogs/job/master/lastSuccessfulBuild/artifact/build"><i class="fas fa-arrow-right"></i> Latest successful Jenkins Build with Downloads</a> <span class="text-sm text-grey-dark"></span> + <a href="https://jenkins.opengeosys.org/job/ufz/job/ogs/job/master/lastSuccessfulBuild/artifact/build"><i class="fas fa-arrow-right"></i> Latest successful Jenkins Build with Downloads</a> <span class="text-sm text-gray-600"></span> </p> </div> diff --git a/web/layouts/section/section.html b/web/layouts/section/section.html new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/web/package.json b/web/package.json index cf56f69f90cb17511500a270a2c905a528a825b5..8133eeefc3398ecb02fb3f92d06f839ccc737ce1 100644 --- a/web/package.json +++ b/web/package.json @@ -11,6 +11,6 @@ "hugo-algolia": "^1.2.13", "postcss-cli": "^6.1.1", "postcss-import": "^12.0.1", - "tailwindcss": "^0.7.4" + "tailwindcss": "^1.0" } } diff --git a/web/postcss.config.js b/web/postcss.config.js index 5ed10d1a70e084c0d52fd5a253052f9cb4a092b9..927e5dad7a7b2d695b6c30e2cb9158ec72493a1c 100644 --- a/web/postcss.config.js +++ b/web/postcss.config.js @@ -1,7 +1,7 @@ var tailwindcss = require('tailwindcss'); module.exports = { plugins: [ - tailwindcss('./tailwind.js'), + tailwindcss('./tailwind.config.js'), require('autoprefixer'), require('postcss-import'), ] diff --git a/web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.content b/web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.content index ab9bd61a49c76abdc3f31e4f33465b3e85af22d2..b56e9d364e98addb846fc81f043c58f11ba29f49 100644 --- a/web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.content +++ b/web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.content @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d77d9cedeca16fd9e3521ff27ec24b6b5ab07c2ddcee016a430770aa1a59c5c5 -size 410834 +oid sha256:ad7d1298f057cb6a9cafe52efe0ace566e845f98710d1f3d8f1668f59b589c24 +size 493571 diff --git a/web/tailwind.js b/web/tailwind.config.js similarity index 63% rename from web/tailwind.js rename to web/tailwind.config.js index abee5bbe2d803869820376a70448009a27a50048..4ae96b50402ddc2b4dfc6e8e1870e4ee2cb46ff7 100644 --- a/web/tailwind.js +++ b/web/tailwind.config.js @@ -24,8 +24,6 @@ View the full documentation at https://tailwindcss.com. | */ -let defaultConfig = require('tailwindcss/defaultConfig')() - let primaryColor = "#104EB2"; let accentColor = "#f6993f"; let textColor = "#333333"; @@ -46,53 +44,51 @@ let mycolors = { } module.exports = { - mycolors: mycolors, - - fonts: { - 'sans': [ - 'Open Sans', - 'system-ui', - 'BlinkMacSystemFont', - '-apple-system', - 'Segoe UI', - 'Oxygen', - 'Ubuntu', - 'Cantarell', - 'Fira Sans', - 'Droid Sans', - 'Helvetica Neue', - 'sans-serif', - ], - 'serif': [ - 'Roboto', - 'Constantia', - 'Lucida Bright', - 'Lucidabright', - 'Lucida Serif', - 'Lucida', - 'DejaVu Serif', - 'Bitstream Vera Serif', - 'Liberation Serif', - 'Georgia', - 'serif', - ], - 'serif-caps': [ - 'serif' - ], - 'mono': [ - 'Menlo', - 'Monaco', - 'Consolas', - 'Liberation Mono', - 'Courier New', - 'monospace', - ] - }, - - plugins: [ - require('tailwindcss/plugins/container')({ + theme: { + container: { center: true, - // padding: '1rem', - }), - ], + padding: '2rem', + }, + mycolors: mycolors, + fontFamily: { + 'sans': [ + 'Open Sans', + 'system-ui', + 'BlinkMacSystemFont', + '-apple-system', + 'Segoe UI', + 'Oxygen', + 'Ubuntu', + 'Cantarell', + 'Fira Sans', + 'Droid Sans', + 'Helvetica Neue', + 'sans-serif', + ], + 'serif': [ + 'Roboto', + 'Constantia', + 'Lucida Bright', + 'Lucidabright', + 'Lucida Serif', + 'Lucida', + 'DejaVu Serif', + 'Bitstream Vera Serif', + 'Liberation Serif', + 'Georgia', + 'serif', + ], + 'serif-caps': [ + 'serif' + ], + 'mono': [ + 'Menlo', + 'Monaco', + 'Consolas', + 'Liberation Mono', + 'Courier New', + 'monospace', + ] + }, + }, } diff --git a/web/yarn.lock b/web/yarn.lock index 40b1b13cd6153d63b77937e70e104b57f4f5907f..8f44559d9b5d163c65b25a2e7aad364aadf870d9 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -56,11 +56,6 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= - ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -160,39 +155,6 @@ autoprefixer@^9.0.0, autoprefixer@^9.4.5: postcss "^7.0.14" postcss-value-parser "^3.3.1" -babel-extract-comments@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz#0a2aedf81417ed391b85e18b4614e693a0351a21" - integrity sha512-qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ== - dependencies: - babylon "^6.18.0" - -babel-plugin-syntax-object-rest-spread@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" - integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U= - -babel-plugin-transform-object-rest-spread@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06" - integrity sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY= - dependencies: - babel-plugin-syntax-object-rest-spread "^6.8.0" - babel-runtime "^6.26.0" - -babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== - balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -289,17 +251,6 @@ caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000932: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000936.tgz#5d33b118763988bf721b9b8ad436d0400e4a116b" integrity sha512-orX4IdpbFhdNO7bTBhSbahp1EBpqzBc+qrvTRVUFfZgA4zta7TdM6PN5ZxkEUgDnz36m+PfWGcdX7AVfFWItJw== -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -382,11 +333,6 @@ commander@^2.11.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== -comment-regex@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/comment-regex/-/comment-regex-1.0.1.tgz#e070d2c4db33231955d0979d27c918fcb6f93565" - integrity sha512-IWlN//Yfby92tOIje7J18HkNmWRR7JESA/BK8W7wqY/akITpU5B0JQWnbTjCfdChSrDNb0DrdA9jfAxiiBXyiQ== - component-emitter@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" @@ -407,11 +353,6 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js@^2.4.0: - version "2.6.4" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.4.tgz#b8897c062c4d769dd30a0ac5c73976c47f92ea0d" - integrity sha512-05qQ5hXShcqGkPZpXEFLIpxayZscVD2kuMBZewxiIPPEagukO4mqgPA9CWhUvFBJfy3ODdK2p9xyHh7FTU9/7A== - core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -438,16 +379,16 @@ cross-spawn@^6.0.0: shebang-command "^1.2.0" which "^1.2.9" -css.escape@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb" - integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s= - cssesc@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703" integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg== +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -492,11 +433,6 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" -defined@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" - integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= - delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" @@ -557,7 +493,7 @@ es6-promise@^4.1.0: resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054" integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg== -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= @@ -673,19 +609,19 @@ fragment-cache@^0.2.1: dependencies: map-cache "^0.2.2" -fs-extra@^4.0.2: - version "4.0.3" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" - integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg== +fs-extra@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== dependencies: graceful-fs "^4.1.2" jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" - integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== +fs-extra@^8.0.0: + version "8.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.0.1.tgz#90294081f978b1f182f347a440a209154344285b" + integrity sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A== dependencies: graceful-fs "^4.1.2" jsonfile "^4.0.0" @@ -711,11 +647,6 @@ fsevents@^1.2.7: nan "^2.9.2" node-pre-gyp "^0.10.0" -gather-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/gather-stream/-/gather-stream-1.0.0.tgz#b33994af457a8115700d410f317733cbe7a0904b" - integrity sha1-szmUr0V6gRVwDUEPMXczy+egkEs= - gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -813,18 +744,6 @@ gray-matter@^3.0.2: kind-of "^5.0.2" strip-bom-string "^1.0.0" -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= - dependencies: - ansi-regex "^2.0.0" - -has-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" - integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo= - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -1108,11 +1027,6 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -js-base64@^2.1.9: - version "2.5.1" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" - integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw== - js-yaml@^3.10.0, js-yaml@^3.9.0: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" @@ -1182,7 +1096,7 @@ lodash.toarray@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561" integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE= -lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5: +lodash@^4.17.11, lodash@^4.17.4: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== @@ -1401,6 +1315,11 @@ normalize-range@^0.1.2: resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= +normalize.css@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3" + integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg== + npm-bundled@^1.0.1: version "1.0.6" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd" @@ -1592,22 +1511,6 @@ path-type@^3.0.0: dependencies: pify "^3.0.0" -perfectionist@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/perfectionist/-/perfectionist-2.4.0.tgz#c147ad3714e126467f1764129ee72df861d47ea0" - integrity sha1-wUetNxThJkZ/F2QSnuct+GHUfqA= - dependencies: - comment-regex "^1.0.0" - defined "^1.0.0" - minimist "^1.2.0" - postcss "^5.0.8" - postcss-scss "^0.3.0" - postcss-value-parser "^3.3.0" - read-file-stdin "^0.2.0" - string.prototype.repeat "^0.2.0" - vendors "^1.0.0" - write-file-stdout "0.0.2" - pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -1700,14 +1603,7 @@ postcss-reporter@^6.0.0: log-symbols "^2.2.0" postcss "^7.0.7" -postcss-scss@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-0.3.1.tgz#65c610d8e2a7ee0e62b1835b71b8870734816e4b" - integrity sha1-ZcYQ2OKn7g5isYNbcbiHBzSBbks= - dependencies: - postcss "^5.2.4" - -postcss-selector-parser@^5.0.0, postcss-selector-parser@^5.0.0-rc.4: +postcss-selector-parser@^5.0.0-rc.4: version "5.0.0" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c" integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ== @@ -1716,21 +1612,20 @@ postcss-selector-parser@^5.0.0, postcss-selector-parser@^5.0.0-rc.4: indexes-of "^1.0.1" uniq "^1.0.1" +postcss-selector-parser@^6.0.0: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c" + integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg== + dependencies: + cssesc "^3.0.0" + indexes-of "^1.0.1" + uniq "^1.0.1" + postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss@^5.0.8, postcss@^5.2.4: - version "5.2.18" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5" - integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg== - dependencies: - chalk "^1.1.3" - js-base64 "^2.1.9" - source-map "^0.5.6" - supports-color "^3.2.3" - postcss@^6.0.9: version "6.0.23" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" @@ -1794,13 +1689,6 @@ read-cache@^1.0.0: dependencies: pify "^2.3.0" -read-file-stdin@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/read-file-stdin/-/read-file-stdin-0.2.1.tgz#25eccff3a153b6809afacb23ee15387db9e0ee61" - integrity sha1-JezP86FTtoCa+ssj7hU4fbng7mE= - dependencies: - gather-stream "^1.0.0" - readable-stream@^2.0.2, readable-stream@^2.0.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" @@ -1830,11 +1718,6 @@ reduce@^1.0.1: dependencies: object-keys "~1.0.0" -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== - regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" @@ -2079,11 +1962,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string.prototype.repeat@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf" - integrity sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8= - string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -2110,14 +1988,6 @@ strip-bom-string@^1.0.0: resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" integrity sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI= -strip-comments@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-1.0.2.tgz#82b9c45e7f05873bee53f37168af930aa368679d" - integrity sha512-kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw== - dependencies: - babel-extract-comments "^1.0.0" - babel-plugin-transform-object-rest-spread "^6.26.0" - strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" @@ -2133,18 +2003,6 @@ striptags@^3.0.1: resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.1.1.tgz#c8c3e7fdd6fb4bb3a32a3b752e5b5e3e38093ebd" integrity sha1-yMPn/db7S7OjKjt1LltePjgJPr0= -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - -supports-color@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" - integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY= - dependencies: - has-flag "^1.0.0" - supports-color@^5.3.0, supports-color@^5.4.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -2159,26 +2017,24 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" -tailwindcss@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-0.7.4.tgz#fb7926821d42eacdc12e6621a49d21f37a3ff9e9" - integrity sha512-+GeQjHRJ2VmeLkrNwMCbPDfm2cc5P8eoc7n+DtZfI8oQdlo5eSHqsIlPEuZOtoqQlIALsd2jAggWrUUBFGP2ow== +tailwindcss@^1.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.0.3.tgz#12845ec6c9542e97f07ea2bd8af4ba47e8a888d1" + integrity sha512-myjuB0hqqLiXQCea0hEeZfrQVxzmkhtgi7HsuwJgXaVPgBp+7r/wywOvkDTUS8sQ1LraF43OLatip0yhfo/FtA== dependencies: autoprefixer "^9.4.5" bytes "^3.0.0" chalk "^2.4.1" - css.escape "^1.5.1" - fs-extra "^4.0.2" - lodash "^4.17.5" + fs-extra "^8.0.0" + lodash "^4.17.11" node-emoji "^1.8.1" - perfectionist "^2.4.0" + normalize.css "^8.0.1" postcss "^7.0.11" postcss-functions "^3.0.0" postcss-js "^2.0.0" postcss-nested "^4.1.1" - postcss-selector-parser "^5.0.0" + postcss-selector-parser "^6.0.0" pretty-hrtime "^1.0.3" - strip-comments "^1.0.2" tar@^4: version "4.4.8" @@ -2314,11 +2170,6 @@ util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= -vendors@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801" - integrity sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ== - which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" @@ -2351,11 +2202,6 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -write-file-stdout@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/write-file-stdout/-/write-file-stdout-0.0.2.tgz#c252d7c7c5b1b402897630e3453c7bfe690d9ca1" - integrity sha1-wlLXx8WxtAKJdjDjRTx7/mkNnKE= - "y18n@^3.2.1 || ^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"