Merge branch 'master' of github.com:nothingworksinc/tailwindcss

This commit is contained in:
Jonathan Reinink 2017-10-31 20:25:07 -04:00
commit 54e65e6ed2
3 changed files with 8 additions and 11 deletions

View File

@ -10,9 +10,8 @@
<svg class="h-8" viewBox="0 0 60 36" xmlns="http://www.w3.org/2000/svg"><path d="M15 12c2-8 7-12 15-12 12 0 13.5 9 19.5 10.5 4 1 7.5-.5 10.5-4.5-2 8-7 12-15 12-12 0-13.5-9-19.5-10.5-4-1-7.5.5-10.5 4.5zM0 30c2-8 7-12 15-12 12 0 13.5 9 19.5 10.5 4 1 7.5-.5 10.5-4.5-2 8-7 12-15 12-12 0-13.5-9-19.5-10.5-4-1-7.5.5-10.5 4.5z" fill="url(#logoGradient)" fill-rule="evenodd"></path></svg>
</a>
</div>
<div class="relative">
<div class="absolute h-full ml-10 pin-l text-slate-lighter text-sm leading-none flex items-center">Search coming soon</div>
<input class="rounded bg-white border border-smoke py-2 pr-4 pl-10 block w-full" type="text" {{-- placeholder="Search" --}} disabled>
<div class="relative opacity-75">
<input class="rounded bg-white border border-smoke py-2 pr-4 pl-10 block w-full cursor-not-allowed" type="text" placeholder="Search coming soon!" disabled>
<div class="pointer-events-none absolute pin-y pin-l pl-3 flex items-center">
<svg class="pointer-events-none text-slate h-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M12.9 14.32a8 8 0 1 1 1.41-1.41l5.35 5.33-1.42 1.42-5.33-5.34zM8 14A6 6 0 1 0 8 2a6 6 0 0 0 0 12z"/></svg>
</div>

View File

@ -3,10 +3,10 @@ extends: _layouts.documentation
title: "Style & Decoration"
---
# Style & Decoration
# Text Style & Decoration
<div class="text-xl text-slate-light mb-4">
Utilities for controlling the text style of an element.
Utilities for controlling the style of text.
</div>
@include('_partials.feature-badges', [

View File

@ -17,7 +17,7 @@ It doesn't have a default theme and there's no built-in UI components.
On the flip side, it also has no opinion about how your site should look and doesn't impose design decisions that you have to fight to undo.
If you're looking for a framework that comes with a menu of predesigned widgets to build your site from, Tailwind might not be the right framework for you.
If you're looking for a framework that comes with a menu of predesigned widgets to build your site with, Tailwind might not be the right framework for you.
But if you a want a huge head start implementing a custom design with its own identity, Tailwind might be just what you're looking for.
@ -52,14 +52,12 @@ Here's an example of a contact card component built with Tailwind without writin
<div class="mr-4">
<img class="h-24 rounded-full" src="https://avatars2.githubusercontent.com/u/4323180?s=400&u=4962a4441fae9fba5f0f86456c6c506a21ffca4f&v=4" alt="">
</div>
<div class="flex-grow">
<div>
<div class="mb-4">
<p class="text-xl leading-tight">Adam Wathan</p>
<p class="text-xl leading-tight text-black">Adam Wathan</p>
<p class="text-sm leading-tight text-grey-dark">Developer at NothingWorks Inc.</p>
</div>
<div>
<button class="text-xs font-semibold rounded-full px-4 py-1 leading-normal bg-white border border-purple text-purple hover:bg-purple hover:text-white">Message</button>
</div>
<button class="text-xs font-semibold rounded-full px-4 py-1 leading-normal bg-white border border-purple text-purple hover:bg-purple hover:text-white">Message</button>
</div>
</div>
</div>