Skip to content

Commit 9b4a2f9

Browse files
Merge branch 'bearcodi-0.4.1'
2 parents a945944 + 9d381b9 commit 9b4a2f9

File tree

3 files changed

+28
-27
lines changed

3 files changed

+28
-27
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
A Laravel front-end scaffolding preset for [Tailwind CSS](https://tailwindcss.com) - a Utility-First CSS Framework for Rapid UI Development.
44

5-
*Current version:* **Tailwind CSS 0.3.0**
5+
*Current version:* **Tailwind CSS 0.4.0**
66

77
## Usage
88

src/TailwindCssPreset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static function installAuth()
2727
protected static function updatePackageArray(array $packages)
2828
{
2929
return [
30-
'tailwindcss' => '^0.3.0',
30+
'tailwindcss' => '^0.4.0',
3131
] + Arr::except($packages, ['bootstrap-sass', 'jquery']);
3232
}
3333

src/tailwindcss-stubs/tailwind.js

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ View the full documentation at https://tailwindcss.com.
2424
|
2525
*/
2626

27-
// var defaultConfig = require('tailwindcss/defaultConfig')()
27+
// let defaultConfig = require('tailwindcss/defaultConfig')()
2828

2929

3030
/*
@@ -43,29 +43,29 @@ View the full documentation at https://tailwindcss.com.
4343
|
4444
*/
4545

46-
var colors = {
46+
let colors = {
4747
'transparent': 'transparent',
4848

49-
'black': '#222b2f',
50-
'grey-darkest': '#364349',
51-
'grey-darker': '#596a73',
52-
'grey-dark': '#70818a',
53-
'grey': '#9babb4',
54-
'grey-light': '#dae4e9',
55-
'grey-lighter': '#f3f7f9',
56-
'grey-lightest': '#fafcfc',
49+
'black': '#22292f',
50+
'grey-darkest': '#3d4852',
51+
'grey-darker': '#606f7b',
52+
'grey-dark': '#8795a1',
53+
'grey': '#b8c2cc',
54+
'grey-light': '#dae1e7',
55+
'grey-lighter': '#f1f5f8',
56+
'grey-lightest': '#f8fafc',
5757
'white': '#ffffff',
5858

59-
'red-darkest': '#420806',
60-
'red-darker': '#6a1b19',
59+
'red-darkest': '#3b0d0c',
60+
'red-darker': '#621b18',
6161
'red-dark': '#cc1f1a',
6262
'red': '#e3342f',
6363
'red-light': '#ef5753',
6464
'red-lighter': '#f9acaa',
6565
'red-lightest': '#fcebea',
6666

67-
'orange-darkest': '#542605',
68-
'orange-darker': '#7f4012',
67+
'orange-darkest': '#462a16',
68+
'orange-darker': '#613b1f',
6969
'orange-dark': '#de751f',
7070
'orange': '#f6993f',
7171
'orange-light': '#faad63',
@@ -80,24 +80,24 @@ var colors = {
8080
'yellow-lighter': '#fff9c2',
8181
'yellow-lightest': '#fcfbeb',
8282

83-
'green-darkest': '#032d19',
84-
'green-darker': '#0b4228',
83+
'green-darkest': '#0f2f21',
84+
'green-darker': '#1a4731',
8585
'green-dark': '#1f9d55',
8686
'green': '#38c172',
8787
'green-light': '#51d88a',
8888
'green-lighter': '#a2f5bf',
8989
'green-lightest': '#e3fcec',
9090

9191
'teal-darkest': '#0d3331',
92-
'teal-darker': '#174e4b',
92+
'teal-darker': '#20504f',
9393
'teal-dark': '#38a89d',
9494
'teal': '#4dc0b5',
9595
'teal-light': '#64d5ca',
9696
'teal-lighter': '#a0f0ed',
9797
'teal-lightest': '#e8fffe',
9898

99-
'blue-darkest': '#05233b',
100-
'blue-darker': '#103d60',
99+
'blue-darkest': '#12283a',
100+
'blue-darker': '#1c3d5a',
101101
'blue-dark': '#2779bd',
102102
'blue': '#3490dc',
103103
'blue-light': '#6cb2eb',
@@ -112,16 +112,16 @@ var colors = {
112112
'indigo-lighter': '#b2b7ff',
113113
'indigo-lightest': '#e6e8ff',
114114

115-
'purple-darkest': '#1f133f',
116-
'purple-darker': '#352465',
115+
'purple-darkest': '#21183c',
116+
'purple-darker': '#382b5f',
117117
'purple-dark': '#794acf',
118118
'purple': '#9561e2',
119119
'purple-light': '#a779e9',
120120
'purple-lighter': '#d6bbfc',
121121
'purple-lightest': '#f3ebff',
122122

123-
'pink-darkest': '#45051e',
124-
'pink-darker': '#72173a',
123+
'pink-darkest': '#451225',
124+
'pink-darker': '#6f213f',
125125
'pink-dark': '#eb5286',
126126
'pink': '#f66d9b',
127127
'pink-light': '#fa7ea8',
@@ -864,10 +864,11 @@ module.exports = {
864864
width: ['responsive'],
865865
zIndex: ['responsive'],
866866
},
867-
867+
868+
868869
/*
869870
|-----------------------------------------------------------------------------
870-
| Advanced Options https://tailwindcss.com/docs/configuration#options
871+
| Advanced Options https://tailwindcss.com/docs/configuration#options
871872
|-----------------------------------------------------------------------------
872873
|
873874
| Here is where you can tweak advanced configuration options. We recommend

0 commit comments

Comments
 (0)