Skip to content

Commit

Permalink
Upgrade to Tailwind 1.7
Browse files Browse the repository at this point in the history
row-gap and col-gap utilities are now deprecated
  • Loading branch information
robdekort committed Aug 18, 2020
1 parent dbda1e3 commit 77a8fd6
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 51 deletions.
67 changes: 34 additions & 33 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 9 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@tailwindcss/typography": "^0.2.0",
"@tailwindcss/custom-forms": "^0.2.1",
"alpinejs": "^2.6.0",
"tailwindcss": "^1.6.2"
"tailwindcss": "^1.7.0"
},
"devDependencies": {
"autoprefixer": "^9.8.6",
Expand Down
2 changes: 1 addition & 1 deletion resources/views/errors/404.antlers.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{# The 404 page taking it's content from the configuration global. #}}
<main class="outer-grid">
<article class="fluid-container grid md:grid-cols-12 row-gap-4">
<article class="fluid-container grid md:grid-cols-12 gap-y-4">
<div class="col-span-12">
{{ partial:typography/h1 class="mb-4" :content="configuration:404_title" }}
{{ partial:typography/paragraph :content="configuration:404_text" }}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/page_builder/_article.antlers.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{# The article (Bard) content block with set support. #}}
<article class="fluid-container grid grid-cols-12 row-gap-4 prose">
<article class="fluid-container grid grid-cols-12 gap-y-4 prose">
{{ bard scope="set" }}
{{ partial src="components/{type}" }}
{{ /bard }}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/page_builder/_call_to_action.antlers.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{# The call to action content block. #}}
<section class="fluid-container grid md:grid-cols-12 row-gap-8 md:gap-8">
<section class="fluid-container grid md:grid-cols-12 gap-y-8 md:gap-8">
<div class="col-start-3 col-span-8">
{{ if block:title }}
{{ partial:typography/h2 class="mb-4" :content="block:title" }}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/page_builder/_collection.antlers.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{# The collection content block with optional title. #}}
<section class="fluid-container grid md:grid-cols-12 row-gap-8 md:gap-8">
<section class="fluid-container grid md:grid-cols-12 gap-y-8 md:gap-8">
<div class="col-start-3 col-span-8">
{{ if block:title }}
{{ partial:typography/h2 class="mb-4" :content="block:title" }}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/page_builder/_form_contact.antlers.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{# The contact form content block. #}}
<section class="fluid-container grid md:grid-cols-12 row-gap-8 md:gap-8">
<section class="fluid-container grid md:grid-cols-12 gap-y-8 md:gap-8">
<div class="col-start-3 col-span-8">
{{ if block:title }}
{{ partial:typography/h2 class="mb-4" :content="block:title" }}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/page_builder/_link_blocks.antlers.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{# The link blocks content block. #}}
<section class="fluid-container grid md:grid-cols-12 row-gap-8 md:gap-8">
<section class="fluid-container grid md:grid-cols-12 gap-y-8 md:gap-8">
<div class="col-start-3 col-span-8 text-center">
{{ if block:title }}
{{ partial:typography/h2 :content="block:title" }}
Expand Down
3 changes: 3 additions & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ const defaultTheme = require('tailwindcss/defaultTheme')
const plugin = require('tailwindcss/plugin')

module.exports = {
future: {
removeDeprecatedGapUtilities: true,
},
purge: {
content: [
'./resources/views/**/*.html',
Expand Down

0 comments on commit 77a8fd6

Please sign in to comment.