Skip to content

Commit 54e65e6

Browse files
committed
Merge branch 'master' of github.com:nothingworksinc/tailwindcss
2 parents c553682 + dee0e19 commit 54e65e6

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

docs/source/_layouts/documentation.blade.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
<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>
1111
</a>
1212
</div>
13-
<div class="relative">
14-
<div class="absolute h-full ml-10 pin-l text-slate-lighter text-sm leading-none flex items-center">Search coming soon</div>
15-
<input class="rounded bg-white border border-smoke py-2 pr-4 pl-10 block w-full" type="text" {{-- placeholder="Search" --}} disabled>
13+
<div class="relative opacity-75">
14+
<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>
1615
<div class="pointer-events-none absolute pin-y pin-l pl-3 flex items-center">
1716
<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>
1817
</div>

docs/source/docs/text-style.blade.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ extends: _layouts.documentation
33
title: "Style & Decoration"
44
---
55

6-
# Style & Decoration
6+
# Text Style & Decoration
77

88
<div class="text-xl text-slate-light mb-4">
9-
Utilities for controlling the text style of an element.
9+
Utilities for controlling the style of text.
1010
</div>
1111

1212
@include('_partials.feature-badges', [

docs/source/docs/what-is-tailwind.blade.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ It doesn't have a default theme and there's no built-in UI components.
1717

1818
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.
1919

20-
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.
20+
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.
2121

2222
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.
2323

@@ -52,14 +52,12 @@ Here's an example of a contact card component built with Tailwind without writin
5252
<div class="mr-4">
5353
<img class="h-24 rounded-full" src="https://avatars2.githubusercontent.com/u/4323180?s=400&u=4962a4441fae9fba5f0f86456c6c506a21ffca4f&v=4" alt="">
5454
</div>
55-
<div class="flex-grow">
55+
<div>
5656
<div class="mb-4">
57-
<p class="text-xl leading-tight">Adam Wathan</p>
57+
<p class="text-xl leading-tight text-black">Adam Wathan</p>
5858
<p class="text-sm leading-tight text-grey-dark">Developer at NothingWorks Inc.</p>
5959
</div>
60-
<div>
61-
<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>
62-
</div>
60+
<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>
6361
</div>
6462
</div>
6563
</div>

0 commit comments

Comments
 (0)