Skip to content

Commit 45c1c48

Browse files
adamwathanadamwathan
committed
Merge branch 'master' into 0.3
2 parents be1f5b9 + 5ec9c5a commit 45c1c48

15 files changed

+99
-81
lines changed

‎docs/source/_partials/class-table.blade.php‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
<div class="border-t border-b border-grey-light">
2-
<div class="{{ count($rows) > 10 ? 'max-h-sm' : '' }} overflow-y-scroll">
1+
@php
2+
$scroll = isset($scroll) ? $scroll : true;
3+
$scroll = (count($rows) > 10 && ($scroll !== false));
4+
@endphp
5+
6+
<div class="border-t border-b border-grey-light overflow-hidden relative">
7+
<div class="{{ $scroll ? 'max-h-sm pb-10' : '' }} overflow-y-scroll">
38
<table class="w-full text-left table-collapse">
49
<thead>
510
<tr>
@@ -19,4 +24,9 @@
1924
</tbody>
2025
</table>
2126
</div>
27+
@if ($scroll)
28+
<div class="bg-white opacity-50 text-center absolute pin-b pin-x py-2 flex justify-center shadow-md-light">
29+
<svg class="h-6 w-6 text-grey-dark" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z"/></svg>
30+
</div>
31+
@endif
2232
</div>

‎docs/source/_partials/work-in-progress-example.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="mt-8">
2-
<div class="bg-blue-lightest border-l-4 border-blue-light rounded-b text-blue-darkest px-4 py-3">
2+
<div class="bg-blue-lightest border-l-4 border-blue-light text-blue-darkest px-4 py-3">
33
<div class="flex">
44
<div class="py-1">
55
<svg class="fill-current h-6 w-6 text-blue-light mr-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M10 20C4.477 20 0 15.523 0 10S4.477 0 10 0s10 4.477 10 10-4.477 10-10 10zm0-2c4.418 0 8-3.582 8-8s-3.582-8-8-8-8 3.582-8 8 3.582 8 8 8zm-.5-5h1c.276 0 .5.224.5.5v1c0 .276-.224.5-.5.5h-1c-.276 0-.5-.224-.5-.5v-1c0-.276.224-.5.5-.5zm0-8h1c.276 0 .5.224.5.5V8l-.5 3-1 .5L9 8V5.5c0-.276.224-.5.5-.5z"/></svg>

‎docs/source/_partials/work-in-progress.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="bg-blue-lightest border-l-4 border-blue-light rounded-b text-blue-darkest px-4 py-3 mb-4">
1+
<div class="bg-blue-lightest border-l-4 border-blue-light text-blue-darkest px-4 py-3 mb-4">
22
<div class="flex">
33
<div class="py-1">
44
<svg class="fill-current h-6 w-6 text-blue-light mr-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M10 20C4.477 20 0 15.523 0 10S4.477 0 10 0s10 4.477 10 10-4.477 10-10 10zm0-2c4.418 0 8-3.582 8-8s-3.582-8-8-8-8 3.582-8 8 3.582 8 8 8zm-.5-5h1c.276 0 .5.224.5.5v1c0 .276-.224.5-.5.5h-1c-.276 0-.5-.224-.5-.5v-1c0-.276.224-.5.5-.5zm0-8h1c.276 0 .5.224.5.5V8l-.5 3-1 .5L9 8V5.5c0-.276.224-.5.5-.5z"/></svg>

‎docs/source/docs/border-radius.blade.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ features:
2424
[
2525
'.rounded',
2626
'border-radius: .25rem;',
27-
"Apply a medium border radius to all corners of an element.",
27+
"Apply the default border radius to all corners of an element.",
2828
],
2929
[
3030
'.rounded-lg',
@@ -79,22 +79,22 @@ features:
7979
[
8080
'.rounded-t',
8181
"border-top-left-radius: .25rem;\nborder-top-right-radius: .25rem;",
82-
"Apply a medium border radius to the top corners of an element.",
82+
"Apply the default border radius to the top corners of an element.",
8383
],
8484
[
8585
'.rounded-r',
8686
"border-top-right-radius: .25rem;\nborder-bottom-right-radius: .25rem;",
87-
"Apply a medium border radius to the right corners of an element.",
87+
"Apply the default border radius to the right corners of an element.",
8888
],
8989
[
9090
'.rounded-b',
9191
"border-bottom-right-radius: .25rem;\nborder-bottom-left-radius: .25rem;",
92-
"Apply a medium border radius to the bottom corners of an element.",
92+
"Apply the default border radius to the bottom corners of an element.",
9393
],
9494
[
9595
'.rounded-l',
9696
"border-top-left-radius: .25rem;\nborder-bottom-left-radius: .25rem;",
97-
"Apply a medium border radius to the left corners of an element.",
97+
"Apply the default border radius to the left corners of an element.",
9898
],
9999
[
100100
'.rounded-t-lg',
@@ -179,22 +179,22 @@ features:
179179
[
180180
'.rounded-tl',
181181
'border-top-left-radius: .25rem;',
182-
"Apply a medium border radius to the top left corner of an element.",
182+
"Apply the default border radius to the top left corner of an element.",
183183
],
184184
[
185185
'.rounded-tr',
186186
'border-top-right-radius: .25rem;',
187-
"Apply a medium border radius to the top right corner of an element.",
187+
"Apply the default border radius to the top right corner of an element.",
188188
],
189189
[
190190
'.rounded-br',
191191
'border-bottom-right-radius: .25rem;',
192-
"Apply a medium border radius to the bottom right corner of an element.",
192+
"Apply the default border radius to the bottom right corner of an element.",
193193
],
194194
[
195195
'.rounded-bl',
196196
'border-bottom-left-radius: .25rem;',
197-
"Apply a medium border radius to the bottom left corner of an element.",
197+
"Apply the default border radius to the bottom left corner of an element.",
198198
],
199199
[
200200
'.rounded-tl-lg',

‎docs/source/docs/height.blade.md‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,91 +12,92 @@ features:
1212
@include('_partials.work-in-progress')
1313

1414
@include('_partials.class-table', [
15+
'scroll' => false,
1516
'rows' => [
1617
[
1718
'.h-1',
1819
'height: 0.25rem;',
19-
"Set the element's height to <code>0.25rem</code>.",
20+
"Set the element's height to 0.25rem.",
2021
],
2122
[
2223
'.h-2',
2324
'height: 0.5rem;',
24-
"Set the element's height to <code>0.5rem</code>.",
25+
"Set the element's height to 0.5rem.",
2526
],
2627
[
2728
'.h-3',
2829
'height: 0.75rem;',
29-
"Set the element's height to <code>0.75rem</code>.",
30+
"Set the element's height to 0.75rem.",
3031
],
3132
[
3233
'.h-4',
3334
'height: 1rem;',
34-
"Set the element's height to <code>1rem</code>.",
35+
"Set the element's height to 1rem.",
3536
],
3637
[
3738
'.h-6',
3839
'height: 1.5rem;',
39-
"Set the element's height to <code>1.5rem</code>.",
40+
"Set the element's height to 1.5rem.",
4041
],
4142
[
4243
'.h-8',
4344
'height: 2rem;',
44-
"Set the element's height to <code>2rem</code>.",
45+
"Set the element's height to 2rem.",
4546
],
4647
[
4748
'.h-10',
4849
'height: 2.5rem;',
49-
"Set the element's height to <code>2.5rem</code>.",
50+
"Set the element's height to 2.5rem.",
5051
],
5152
[
5253
'.h-12',
5354
'height: 3rem;',
54-
"Set the element's height to <code>3rem</code>.",
55+
"Set the element's height to 3rem.",
5556
],
5657
[
5758
'.h-16',
5859
'height: 4rem;',
59-
"Set the element's height to <code>4rem</code>.",
60+
"Set the element's height to 4rem.",
6061
],
6162
[
6263
'.h-24',
6364
'height: 6rem;',
64-
"Set the element's height to <code>6rem</code>.",
65+
"Set the element's height to 6rem.",
6566
],
6667
[
6768
'.h-32',
6869
'height: 8rem;',
69-
"Set the element's height to <code>8rem</code>.",
70+
"Set the element's height to 8rem.",
7071
],
7172
[
7273
'.h-48',
7374
'height: 12rem;',
74-
"Set the element's height to <code>12rem</code>.",
75+
"Set the element's height to 12rem.",
7576
],
7677
[
7778
'.h-64',
7879
'height: 16rem;',
79-
"Set the element's height to <code>16rem</code>.",
80+
"Set the element's height to 16rem.",
8081
],
8182
[
8283
'.h-auto',
8384
'height: auto;',
84-
"Set the element's height to <code>auto</code>.",
85+
"Set the element's height to auto.",
8586
],
8687
[
8788
'.h-px',
8889
'height: 1px;',
89-
"Set the element's height to <code>1px</code>.",
90+
"Set the element's height to 1px.",
9091
],
9192
[
9293
'.h-full',
9394
'height: 100%;',
94-
"Set the element's height to <code>100%</code>.",
95+
"Set the element's height to 100%.",
9596
],
9697
[
9798
'.h-screen',
9899
'height: 100vh;',
99-
"Set the element's height to <code>100vh</code>.",
100+
"Set the element's height to 100vh.",
100101
],
101102
]
102103
])

‎docs/source/docs/max-height.blade.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@ features:
1212
@include('_partials.work-in-progress')
1313

1414
@include('_partials.class-table', [
15+
'scroll' => false,
1516
'rows' => [
1617
[
1718
'.max-h-full',
1819
'max-height: 100%;',
19-
"Set the element's maximum height to <code>100%</code>.",
20+
"Set the element's maximum height to 100%.",
2021
],
2122
[
2223
'.max-h-screen',
2324
'max-height: 100vh;',
24-
"Set the element's maximum height to <code>100vh</code>.",
25+
"Set the element's maximum height to 100vh.",
2526
],
2627
]
2728
])

‎docs/source/docs/max-width.blade.md‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,56 +12,57 @@ features:
1212
@include('_partials.work-in-progress')
1313

1414
@include('_partials.class-table', [
15+
'scroll' => false,
1516
'rows' => [
1617
[
1718
'.max-w-xs',
1819
'max-width: 20rem;',
19-
"Set the element's maximum width to <code>20rem</code>.",
20+
"Set the element's maximum width to 20rem.",
2021
],
2122
[
2223
'.max-w-sm',
2324
'max-width: 30rem;',
24-
"Set the element's maximum width to <code>30rem</code>.",
25+
"Set the element's maximum width to 30rem.",
2526
],
2627
[
2728
'.max-w-md',
2829
'max-width: 40rem;',
29-
"Set the element's maximum width to <code>40rem</code>.",
30+
"Set the element's maximum width to 40rem.",
3031
],
3132
[
3233
'.max-w-lg',
3334
'max-width: 50rem;',
34-
"Set the element's maximum width to <code>50rem</code>.",
35+
"Set the element's maximum width to 50rem.",
3536
],
3637
[
3738
'.max-w-xl',
3839
'max-width: 60rem;',
39-
"Set the element's maximum width to <code>60rem</code>.",
40+
"Set the element's maximum width to 60rem.",
4041
],
4142
[
4243
'.max-w-2xl',
4344
'max-width: 70rem;',
44-
"Set the element's maximum width to <code>70rem</code>.",
45+
"Set the element's maximum width to 70rem.",
4546
],
4647
[
4748
'.max-w-3xl',
4849
'max-width: 80rem;',
49-
"Set the element's maximum width to <code>80rem</code>.",
50+
"Set the element's maximum width to 80rem.",
5051
],
5152
[
5253
'.max-w-4xl',
5354
'max-width: 90rem;',
54-
"Set the element's maximum width to <code>90rem</code>.",
55+
"Set the element's maximum width to 90rem.",
5556
],
5657
[
5758
'.max-w-5xl',
5859
'max-width: 100rem;',
59-
"Set the element's maximum width to <code>100rem</code>.",
60+
"Set the element's maximum width to 100rem.",
6061
],
6162
[
6263
'.max-w-full',
6364
'max-width: 100%;',
64-
"Set the element's maximum width to <code>100%</code>.",
65+
"Set the element's maximum width to 100%.",
6566
],
6667
]
6768
])

‎docs/source/docs/min-height.blade.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,22 @@ features:
1212
@include('_partials.work-in-progress')
1313

1414
@include('_partials.class-table', [
15+
'scroll' => false,
1516
'rows' => [
1617
[
1718
'.min-h-0',
1819
'min-height: 0;',
19-
"Set the element's minimum height to <code>0</code>.",
20+
"Set the element's minimum height to 0.",
2021
],
2122
[
2223
'.min-h-full',
2324
'min-height: 100%;',
24-
"Set the element's minimum height to <code>100%</code>.",
25+
"Set the element's minimum height to 100%.",
2526
],
2627
[
2728
'.min-h-screen',
2829
'min-height: 100vh;',
29-
"Set the element's minimum height to <code>100vh</code>.",
30+
"Set the element's minimum height to 100vh.",
3031
],
3132
]
3233
])

‎docs/source/docs/min-width.blade.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@ features:
1212
@include('_partials.work-in-progress')
1313

1414
@include('_partials.class-table', [
15+
'scroll' => false,
1516
'rows' => [
1617
[
1718
'.min-w-0',
1819
'min-width: 0;',
19-
"Set the element's minimum width to <code>0</code>.",
20+
"Set the element's minimum width to 0.",
2021
],
2122
[
2223
'.min-w-full',
2324
'min-width: 100%;',
24-
"Set the element's minimum width to <code>100%</code>.",
25+
"Set the element's minimum width to 100%.",
2526
],
2627
]
2728
])

0 commit comments

Comments
 (0)