From 8cf83ce4646dd3e2c2f5eed4fd25b880b0fd6970 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 19 Oct 2017 19:18:48 -0400 Subject: [PATCH] Working on new docs design --- docs/source/_assets/less/markdown.less | 15 +- docs/source/_assets/less/prism.less | 29 +- docs/source/_layouts/master.blade.php | 297 ++++++++++---------- docs/source/_partials/code-sample.blade.php | 4 +- docs/tailwind.js | 16 +- 5 files changed, 188 insertions(+), 173 deletions(-) diff --git a/docs/source/_assets/less/markdown.less b/docs/source/_assets/less/markdown.less index a22c76be3..7b05ee426 100644 --- a/docs/source/_assets/less/markdown.less +++ b/docs/source/_assets/less/markdown.less @@ -8,7 +8,7 @@ .subnav-link, .subnav-link& { @apply .mr-6; @apply .leading-none; - @apply .text-slate; + @apply .text-slate-dark; @apply .text-sm; } } @@ -38,11 +38,12 @@ > pre, pre& { @apply .font-mono; + @apply .font-medium; } > blockquote, blockquote& { @apply .italic; - @apply .text-slate; + @apply .text-slate-dark; @apply .text-sm; } @@ -50,7 +51,7 @@ @apply .mb-4; @apply .leading-none; @apply .text-slate-darker; - @apply .font-bold; + @apply .font-semibold; @apply .text-3xl; } @@ -59,7 +60,7 @@ @apply .mb-8; @apply .text-slate-darker; @apply .leading-none; - @apply .font-bold; + @apply .font-semibold; @apply .text-xl; } @@ -73,14 +74,14 @@ } > p, p&, > blockquote > p { - @apply .text-slate; + @apply .text-slate-dark; @apply .mt-4; @apply .mb-4; line-height: 1.75; } > ul, > ol { - @apply .text-slate; + @apply .text-slate-dark; margin: 0 0 2em; } @@ -94,7 +95,7 @@ > li { @apply .my-2; - @apply .text-slate; + @apply .text-slate-dark; } > :not(pre) > code[class*="language-"], > pre[class*="language-"], pre[class*="language-"]& { diff --git a/docs/source/_assets/less/prism.less b/docs/source/_assets/less/prism.less index 3d0f09378..9cae792bb 100644 --- a/docs/source/_assets/less/prism.less +++ b/docs/source/_assets/less/prism.less @@ -7,10 +7,12 @@ code[class*="language-"], pre[class*="language-"] { + @apply .font-mono; + color: black; background: none; text-shadow: 0 1px white; - font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; + // font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; text-align: left; white-space: pre; word-spacing: normal; @@ -74,7 +76,8 @@ pre[class*="language-"] { } .token.punctuation { - color: #999; + @apply .text-blue-dark; + // color: #999; } .namespace { @@ -88,17 +91,18 @@ pre[class*="language-"] { .token.constant, .token.symbol, .token.deleted { - color: #905; + @apply .text-blue-dark; + // color: #905; } -.token.selector, -.token.attr-name, -.token.string, -.token.char, -.token.builtin, -.token.inserted { - color: #690; -} +// .token.selector, +// .token.attr-name, +// .token.string, +// .token.char, +// .token.builtin, +// .token.inserted { +// color: #690; +// } .token.operator, .token.entity, @@ -112,7 +116,8 @@ pre[class*="language-"] { .token.atrule, .token.attr-value, .token.keyword { - color: #07a; + @apply .text-purple-dark; + // color: #07a; } .token.function { diff --git a/docs/source/_layouts/master.blade.php b/docs/source/_layouts/master.blade.php index dcd646661..2deb49431 100644 --- a/docs/source/_layouts/master.blade.php +++ b/docs/source/_layouts/master.blade.php @@ -6,163 +6,160 @@ {{ $page->title ? $page->title . ' - Tailwind CSS' : 'Tailwind CSS' }} - -
-
-
-
-
- + +
+
+
+ + Tailwind CSS + {{-- --}} + {{-- Tailwind CSS --}} + {{-- --}} + {{-- --}} +
+
+
+ +
+ +
- - Tailwind CSS - - -
-
- GitHub
+
-
-
-
-
- -
-
-
- @yield('body') -
+
+
+ @yield('body')
diff --git a/docs/source/_partials/code-sample.blade.php b/docs/source/_partials/code-sample.blade.php index 710241377..8002352be 100644 --- a/docs/source/_partials/code-sample.blade.php +++ b/docs/source/_partials/code-sample.blade.php @@ -1,5 +1,5 @@ -
-
+
+
{{ $slot }}
diff --git a/docs/tailwind.js b/docs/tailwind.js index 917ccfb71..260bfac1e 100644 --- a/docs/tailwind.js +++ b/docs/tailwind.js @@ -80,9 +80,9 @@ module.exports = { }, text: { fonts: { - 'sans': '-apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue', + 'sans': '"Lato", -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', - 'mono': 'Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace', + 'mono': '"Roboto Mono", Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace', }, sizes: { 'base': '1rem', // 16px @@ -174,6 +174,15 @@ module.exports = { '4/5': '80%', '1/6': '16.66667%', '5/6': '83.33333%', + 'xs': '20rem', + 'sm': '30rem', + 'md': '40rem', + 'lg': '50rem', + 'xl': '60rem', + '2xl': '70rem', + '3xl': '80rem', + '4xl': '90rem', + '5xl': '100rem', 'full': '100%', 'screen': '100vw' }, @@ -232,6 +241,7 @@ module.exports = { '4': '1rem', '6': '1.5rem', '8': '2rem', + '10': '2.5rem', '12': '3rem', '16': '4rem' }, @@ -244,6 +254,7 @@ module.exports = { '4': '1rem', '6': '1.5rem', '8': '2rem', + '10': '2.5rem', '12': '3rem', '16': '4rem' }, @@ -256,6 +267,7 @@ module.exports = { '4': '1rem', '6': '1.5rem', '8': '2rem', + '10': '2.5rem', '12': '3rem', '16': '4rem' },