From 6d331327057db4ccabd7d08c9d702dd1932a4faa Mon Sep 17 00:00:00 2001 From: Liyas Thomas Date: Fri, 25 Jun 2021 23:44:27 +0000 Subject: [PATCH] feat: remove tailwindcss + introduce windicss --- .stylelintrc.js | 1 - README.md | 2 +- assets/css/tailwind.css | 6 - assets/scss/styles.scss | 25 +- components/app/Contributors.vue | 12 +- components/app/Extensions.vue | 12 +- components/app/Footer.vue | 6 +- components/app/Header.vue | 37 +- components/app/Shortcuts.vue | 4 +- components/app/Sidenav.vue | 4 +- components/app/Support.vue | 4 +- components/collections/Add.vue | 9 +- components/collections/AddFolder.vue | 9 +- components/collections/ChooseType.vue | 2 +- components/collections/Edit.vue | 9 +- components/collections/EditFolder.vue | 9 +- components/collections/EditRequest.vue | 9 +- components/collections/ImportExport.vue | 28 +- components/collections/SaveRequest.vue | 11 +- components/collections/graphql/Add.vue | 9 +- components/collections/graphql/AddFolder.vue | 9 +- components/collections/graphql/Collection.vue | 15 +- components/collections/graphql/Edit.vue | 9 +- components/collections/graphql/EditFolder.vue | 9 +- .../collections/graphql/EditRequest.vue | 9 +- components/collections/graphql/Folder.vue | 14 +- .../collections/graphql/ImportExport.vue | 23 +- components/collections/graphql/Request.vue | 12 +- components/collections/graphql/index.vue | 6 +- components/collections/index.vue | 8 +- components/collections/my/Collection.vue | 17 +- components/collections/my/Folder.vue | 14 +- components/collections/my/Request.vue | 12 +- components/collections/teams/Collection.vue | 14 +- components/collections/teams/Folder.vue | 10 +- components/collections/teams/Request.vue | 12 +- components/docs/Collection.vue | 2 +- components/docs/Folder.vue | 2 +- components/docs/Request.vue | 8 +- components/environments/Add.vue | 9 +- components/environments/Edit.vue | 17 +- components/environments/Environment.vue | 12 +- components/environments/ImportExport.vue | 21 +- components/environments/index.vue | 6 +- components/firebase/Email.vue | 9 +- components/firebase/Login.vue | 6 +- components/firebase/Logout.vue | 2 +- components/history/graphql/Card.vue | 20 +- components/history/index.vue | 10 +- components/history/rest/Card.vue | 20 +- components/http/BodyParameters.vue | 17 +- components/http/CodegenModal.vue | 10 +- components/http/Headers.vue | 9 +- components/http/ImportCurl.vue | 9 +- components/http/Parameters.vue | 11 +- components/http/RawBody.vue | 7 +- components/http/TokenList.vue | 13 +- components/lenses/HeadersRenderer.vue | 2 +- .../lenses/renderers/HTMLLensRenderer.vue | 8 +- .../lenses/renderers/ImageLensRenderer.vue | 2 +- .../lenses/renderers/JSONLensRenderer.vue | 6 +- .../lenses/renderers/RawLensRenderer.vue | 6 +- .../lenses/renderers/XMLLensRenderer.vue | 6 +- components/realtime/Mqtt.vue | 12 +- components/realtime/Socketio.vue | 18 +- components/realtime/Sse.vue | 4 +- components/realtime/Websocket.vue | 13 +- components/smart/AutoComplete.vue | 1 + components/smart/ColorModePicker.vue | 1 - components/smart/ConfirmModal.vue | 8 +- components/teams/Add.vue | 9 +- components/teams/Edit.vue | 31 +- components/teams/Team.vue | 14 +- components/teams/index.vue | 2 +- layouts/error.vue | 8 +- nuxt.config.js | 9 +- package-lock.json | 41069 +--------------- package.json | 15 +- pages/doc.vue | 9 +- pages/graphql.vue | 40 +- pages/index.vue | 89 +- pages/settings.vue | 13 +- tailwind.config.js | 60 - windi.config.js | 28 + 84 files changed, 1560 insertions(+), 40544 deletions(-) delete mode 100644 assets/css/tailwind.css delete mode 100644 tailwind.config.js create mode 100644 windi.config.js diff --git a/.stylelintrc.js b/.stylelintrc.js index da0517dd4..f6776cf92 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -8,7 +8,6 @@ module.exports = { { ignoreAtRules: [ "extends", - "tailwind", "apply", "variants", "responsive", diff --git a/README.md b/README.md index e5b4113e7..91f011fb7 100644 --- a/README.md +++ b/README.md @@ -436,7 +436,7 @@ _Add-ons are developed and maintained under **[Official Hoppscotch Organization] ## **Built with** - [HTML](https://developer.mozilla.org/en-US/docs/Web/HTML) -- [CSS](https://developer.mozilla.org/en-US/docs/Web/CSS), [SCSS](https://sass-lang.com), [Tailwind CSS](https://tailwindcss.com) +- [CSS](https://developer.mozilla.org/en-US/docs/Web/CSS), [SCSS](https://sass-lang.com), [Windi CSS](https://windicss.org) - [JavaScript](https://developer.mozilla.org/en-US/docs/Web/JavaScript) - [TypeScript](https://www.typescriptlang.org) - [Vue](https://vuejs.org) diff --git a/assets/css/tailwind.css b/assets/css/tailwind.css deleted file mode 100644 index bbde77bc2..000000000 --- a/assets/css/tailwind.css +++ /dev/null @@ -1,6 +0,0 @@ -/* purgecss start ignore */ -@tailwind base; -@tailwind components; - -/* purgecss end ignore */ -@tailwind utilities; diff --git a/assets/scss/styles.scss b/assets/scss/styles.scss index a93799de2..840afb314 100644 --- a/assets/scss/styles.scss +++ b/assets/scss/styles.scss @@ -1,5 +1,3 @@ -$responsiveWidth: 767px; - *, *::before, *::after { @@ -46,7 +44,6 @@ html { body { @apply bg-primary; @apply text-secondary; - @apply text-base; @apply font-medium; @apply select-none; @apply transition-colors; @@ -140,17 +137,14 @@ main { @apply px-4; } -h1, -h2, -h3, -h4 { +.heading { @apply flex; @apply items-center; @apply m-0; @apply font-bold; } -h3.title { +h3.heading { @apply m-2; } @@ -327,7 +321,7 @@ hr { } } -button { +.button { @apply inline-flex; @apply items-center; @apply justify-center; @@ -339,7 +333,6 @@ button { @apply ease-in-out; @apply duration-150; @apply fill-current; - @apply cursor-pointer; @apply outline-none; @apply border-none; @@ -438,12 +431,12 @@ input[type="radio"], .drop-down-input, .url-field, +.input, +.select, +.textarea, kbd, -select, -input, -textarea, -pre, -code { +code, +pre { @apply flex; @apply p-4; @apply bg-primaryDark; @@ -734,7 +727,7 @@ section { width: var(--width); } -@media (max-width: $responsiveWidth) { +@media (max-width: 767px) { .content, .columns { @apply flex-col; diff --git a/components/app/Contributors.vue b/components/app/Contributors.vue index 20801f492..8037482c0 100644 --- a/components/app/Contributors.vue +++ b/components/app/Contributors.vue @@ -9,12 +9,12 @@
- @@ -56,7 +56,7 @@ target="_blank" rel="noopener" > - @@ -71,7 +71,7 @@ target="_blank" rel="noopener" > - @@ -80,7 +80,7 @@