diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js index 8562e4238..9b8412616 100644 --- a/defaultConfig.stub.js +++ b/defaultConfig.stub.js @@ -46,15 +46,15 @@ View the full documentation at https://tailwindcss.com. let colors = { 'transparent': 'transparent', - 'black': '#222b2f', - 'grey-darkest': '#364349', - 'grey-darker': '#596a73', - 'grey-dark': '#70818a', - 'grey': '#9babb4', - 'grey-light': '#dae4e9', - 'grey-lighter': '#f3f7f9', - 'grey-lightest': '#fafcfc', - 'white': '#ffffff', + 'black': 'hsl(208, 16%, 16%)', + 'grey-darkest': 'hsl(208, 15%, 28%)', + 'grey-darker': 'hsl(208, 12%, 43%)', + 'grey-dark': 'hsl(208, 12%, 58%)', + 'grey': 'hsl(208, 16%, 76%)', + 'grey-light': 'hsl(208, 20%, 88%)', + 'grey-lighter': 'hsl(208, 33%, 96%)', + 'grey-lightest': 'hsl(208, 35%, 98%)', + 'white': 'hsl(208, 0%, 100%)', 'red-darkest': '#420806', 'red-darker': '#6a1b19', diff --git a/docs/source/docs/colors.blade.md b/docs/source/docs/colors.blade.md index 5b5f8d28c..5c2876867 100644 --- a/docs/source/docs/colors.blade.md +++ b/docs/source/docs/colors.blade.md @@ -10,90 +10,51 @@ Developing an organized, consistent and beautiful color palette is critical to t To get you started, we've provided a generous palette of great looking colors that are perfect for prototyping, or even as a starting point for your color palette. That said, don't hesitate to [customize](#customizing) them for your project. -
-
+
+
-
+
Proposed Greys
Base - {{ strtoupper($page->config['colors']['new-grey']) }} -
-
-
- White - {{ strtoupper($page->config['colors']['new-white']) }} -
-
- Lightest - {{ strtoupper($page->config['colors']['new-grey-lightest']) }} -
-
- Lighter - {{ strtoupper($page->config['colors']['new-grey-lighter']) }} -
-
- Light - {{ strtoupper($page->config['colors']['new-grey-light']) }} -
-
- Base - {{ strtoupper($page->config['colors']['new-grey']) }} -
-
- Dark - {{ strtoupper($page->config['colors']['new-grey-dark']) }} -
-
- Darker - {{ strtoupper($page->config['colors']['new-grey-darker']) }} -
-
- Darkest - {{ strtoupper($page->config['colors']['new-grey-darkest']) }} -
-
- Black - {{ strtoupper($page->config['colors']['new-black']) }} -
-
-
- -
-
-
-
Legacy Greys
-
- Base - {{ strtoupper($page->config['colors']['grey']) }} + {{ strtoupper($page->config['colors']['grey']) }}
- White + White + {{ strtoupper($page->config['colors']['white']) }}
- grey-light Lighter + Lightest + {{ strtoupper($page->config['colors']['grey-lightest']) }}
- grey-light Light + Lighter + {{ strtoupper($page->config['colors']['grey-lighter']) }}
- grey-light + Light + {{ strtoupper($page->config['colors']['grey-light']) }}
- grey-light Dark / Slate Lighter + Base + {{ strtoupper($page->config['colors']['grey']) }}
- grey-light Darker / Slate Light + Dark + {{ strtoupper($page->config['colors']['grey-dark']) }}
- Slate + Darker + {{ strtoupper($page->config['colors']['grey-darker']) }}
- Slate Dark + Darkest + {{ strtoupper($page->config['colors']['grey-darkest']) }}
- Slate Darker + Black + {{ strtoupper($page->config['colors']['black']) }}
diff --git a/docs/tailwind.js b/docs/tailwind.js index 7a723d7f2..732b7072a 100644 --- a/docs/tailwind.js +++ b/docs/tailwind.js @@ -1,33 +1,11 @@ var config = require('../defaultConfig')() config.colors = Object.assign(config.colors, { - 'new-white': 'hsl(208, 0%, 100%)', - 'new-grey-lightest': 'hsl(208, 35%, 98%)', - 'new-grey-lighter': 'hsl(208, 33%, 96%)', - 'new-grey-light': 'hsl(208, 20%, 88%)', - 'new-grey': 'hsl(208, 16%, 76%)', - 'new-grey-dark': 'hsl(208, 12%, 58%)', - 'new-grey-darker': 'hsl(208, 12%, 43%)', - 'new-grey-darkest': 'hsl(208, 15%, 28%)', - 'new-black': 'hsl(208, 16%, 16%)', - 'tailwind-teal-light': '#5ebcca', 'tailwind-teal': '#44a8b3', 'tailwind-teal-dark': '#2f8696', }) -config.colors = Object.assign(config.colors, { - 'white': config.colors['new-white'], - 'grey-lightest': config.colors['new-grey-lightest'], - 'grey-lighter': config.colors['new-grey-lighter'], - 'grey-light': config.colors['new-grey-light'], - 'grey': config.colors['new-grey'], - 'grey-dark': config.colors['new-grey-dark'], - 'grey-darker': config.colors['new-grey-darker'], - 'grey-darkest': config.colors['new-grey-darkest'], - 'black': config.colors['new-black'], -}) - config.fonts = { 'sans': 'aktiv-grotesk, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue', 'serif': 'Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif',