Merge branch 'main' into search_button_height

WordPress · Aug 2, 2021 · 66e6b22 · 66e6b22
2 parents 609ff68 + 3d998db
commit 66e6b22
Show file tree

Hide file tree

Showing 32 changed files with 7,738 additions and 669 deletions.
diff --git a/.github/workflows/sentry-release.yml → ...hub/workflows-disabled/sentry-release.yml b/.github/workflows/sentry-release.yml → ...hub/workflows-disabled/sentry-release.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,11 +3,10 @@ name: openverse-frontend-ci
 on:
   push:
     branches:
-      - master
-      - develop
+      - main
   pull_request:
     branches:
-      - develop
+      - main
 
 jobs:
   ci:
@@ -42,6 +41,3 @@ jobs:
 
       - name: Run tests
         run: npm run test:unit
-
-      - name: Run build
-        run: npm run build
diff --git a/nuxt.config.js b/nuxt.config.js
@@ -141,6 +141,7 @@ export default {
   env,
   dev: process.env.NODE_ENV !== 'production',
   buildModules: [
+    '@nuxtjs/tailwindcss',
     '@nuxtjs/style-resources',
     '@nuxtjs/svg',
     '@nuxtjs/eslint-module',
@@ -173,4 +174,8 @@ export default {
       'https://3f3e05dbe6994c318d1bf1c8bfcf71a1@o288582.ingest.sentry.io/1525413',
     lazy: true,
   },
+  tailwindcss: {
+    // https://github.com/nuxt-community/tailwindcss-module/issues/114#issuecomment-698885369
+    configPath: '~~/tailwind.config.js',
+  },
 }