wrapper/tailwindcss
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
Adam Wathan 2017-11-16 12:28:37 -05:00
commit a33596831e
5 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/source/_layouts/documentation.blade.php
View file

@ -7,6 +7,11 @@
<meta name="twitter:description" content="{{ $page->description ? $page->description : 'Documentation for the Tailwind CSS framework.' }}">
<meta name="twitter:image" content="https://tailwindcss.com/img/tailwind-square.png">
<meta name="twitter:creator" content="@tailwindcss">
<meta property="og:url" content="https://tailwindcss.com/" />
<meta property="og:type" content="article" />
<meta property="og:title" content="{{ $page->title ? $page->title . ' - Tailwind CSS' : 'Tailwind CSS - A Utility-First CSS Framework for Rapid UI Development' }}" />
<meta property="og:description" content="{{ $page->description ? $page->description : 'Documentation for the Tailwind CSS framework.' }}" />
<meta property="og:image" content="https://tailwindcss.com/img/twitter-card.png" />
@endsection
@section('body')

6
docs/source/_layouts/master.blade.php
View file

@ -12,11 +12,9 @@
<title>{{ $page->title ? $page->title . ' - Tailwind CSS' : 'Tailwind CSS - A Utility-First CSS Framework for Rapid UI Development' }}</title>
<meta name="theme-color" content="#ffffff">
@yield('meta')
<style>
@import url("https://use.typekit.net/iqy1okj.css");
</style>
<link rel="stylesheet" href="https://use.typekit.net/iqy1okj.css">
<link rel="stylesheet" href="{{ mix('/css/main.css') }}">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css">
<script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
<script src="{{ mix('/js/nav.js') }}"></script>
</head>

2
docs/source/docs/flexbox-flex-grow-shrink.blade.md
View file

@ -371,7 +371,7 @@ For more information about Tailwind's responsive design features, check out the
<div class="flex ...">
<!-- ... -->
<div class="none:flex-none sm:flex-grow md:flex-shrink lg:flex-1 xl:flex-auto ...">
Item that cannot grow or shrink
Responsive flex item
</div>
<!-- ... -->
</div>

16
docs/source/docs/installation.blade.md
View file

@ -62,6 +62,12 @@ To avoid specificity issues, we highly recommend structuring your main styleshee
*
* You can see the styles here:
* https://github.com/tailwindcss/tailwindcss/blob/master/css/preflight.css
*
* If using `postcss-import`, you should import this line from it's own file:
*
* @@import "./tailwind-preflight.css";
*
* See: https://github.com/tailwindcss/tailwindcss/issues/53#issuecomment-341413622
*/
@@tailwind preflight;
@ -75,7 +81,7 @@ To avoid specificity issues, we highly recommend structuring your main styleshee
* .btn { ... }
* .form-input { ... }
*
* Or if using a preprocessor:
* Or if using a preprocessor or `postcss-import`:
*
* @@import "components/buttons";
* @@import "components/forms";
@ -84,6 +90,12 @@ To avoid specificity issues, we highly recommend structuring your main styleshee
/**
* This injects all of Tailwind's utility classes, generated based on your
* config file.
*
* If using `postcss-import`, you should import this line from it's own file:
*
* @@import "./tailwind-utilities.css";
*
* See: https://github.com/tailwindcss/tailwindcss/issues/53#issuecomment-341413622
*/
@@tailwind utilities;
@ -96,7 +108,7 @@ To avoid specificity issues, we highly recommend structuring your main styleshee
* .bg-pattern-graph-paper { ... }
* .skew-45 { ... }
*
* Or if using a preprocessor..
* Or if using a preprocessor or `postcss-import`:
*
* @@import "utilities/background-patterns";
* @@import "utilities/skew-transforms";

5
docs/source/index.blade.php
View file

@ -7,6 +7,11 @@
<meta name="twitter:description" content="A utility-first CSS framework for rapidly building custom user interfaces.">
<meta name="twitter:image" content="https://tailwindcss.com/img/launch-card-optimized.png">
<meta name="twitter:creator" content="@tailwindcss">
<meta property="og:url" content="https://tailwindcss.com/" />
<meta property="og:type" content="article" />
<meta property="og:title" content="Tailwind CSS" />
<meta property="og:description" content="A utility-first CSS framework for rapidly building custom user interfaces." />
<meta property="og:image" content="https://tailwindcss.com/img/twitter-card.png" />
@endsection
@section('body')