Skip to content

Commit d877b5f

Browse files
committed
Merge branch 'master' of github.com:Semantic-Org/Semantic-UI-Docs into next
2 parents d2d8d54 + 566857e commit d877b5f

26 files changed

Lines changed: 96 additions & 113 deletions

server/documents/behaviors/api.html.eco

Lines changed: 32 additions & 30 deletions
Large diffs are not rendered by default.

server/documents/behaviors/form.html.eco

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type : 'UI Behavior'
2828
<h4 class="ui header">Specifying Validation Rules</h4>
2929
<p>Form validation requires passing in a validation object with the rules required to validate your form.</p>
3030
<div class="ui ignored info message">
31-
A validation object includes a list of form elements, and rules to validate each field against. Fields are matched by either the <code>id</code>, <code>name</code>, or <code>data-validate</code> property matching the identifier specified in the settings object. Validation objects must use either shorthand or longhand exclusively.
31+
A validation object includes a list of form elements, and rules to validate each field against. Fields are matched by either the <code>id</code>, <code>name</code>, or <code>data-validate</code> property (in that order) matching the identifier specified in the settings object. Validation objects must use either shorthand or longhand exclusively.
3232
</div>
3333
<div class="ignore code" data-title="Shorthand Validation">
3434
$('.ui.form')
@@ -312,10 +312,10 @@ type : 'UI Behavior'
312312
<div class="ignored code">
313313
$('.ui.form')
314314
.form({
315-
fields: [
315+
fields: {
316316
email: 'empty',
317317
name: 'empty'
318-
]
318+
}
319319
})
320320
;
321321
if( $('.ui.form').form('is valid', 'email')) {
@@ -427,7 +427,7 @@ type : 'UI Behavior'
427427
</tr>
428428
<tr>
429429
<td>doesntContainExactly</td>
430-
<td>A field doesn't text (case sensitive)</td>
430+
<td>A field doesn't contain text (case sensitive)</td>
431431
<td><code>doesntContainExactly[foo]</code></td>
432432
</tr>
433433
<tr>
@@ -1588,7 +1588,7 @@ type : 'UI Behavior'
15881588
<p>Adding the parameter <code>optional: true</code> will only add your validation rules when the field is <b>not empty</b>.
15891589
<div class="ignored code">
15901590
$('.ui.form')
1591-
.form(
1591+
.form({
15921592
fields: {
15931593
email: {
15941594
identifier : 'email',
@@ -1875,6 +1875,10 @@ type : 'UI Behavior'
18751875
<td>add errors(errors)</td>
18761876
<td>Adds errors to form, given an array errors</td>
18771877
</tr>
1878+
<tr>
1879+
<td>add prompt(id, prompt)</td>
1880+
<td>Adds a custom user prompt for a given element with id</td>
1881+
</tr>
18781882
</table>
18791883

18801884
<h2 class="ui dividing header">Settings</h2>
@@ -2141,7 +2145,7 @@ type : 'UI Behavior'
21412145
</tr>
21422146
<tr>
21432147
<td>debug</td>
2144-
<td>True</td>
2148+
<td>False</td>
21452149
<td>Provides standard debug output to console</td>
21462150
</tr>
21472151
<tr>
@@ -2151,7 +2155,7 @@ type : 'UI Behavior'
21512155
</tr>
21522156
<tr>
21532157
<td>verbose</td>
2154-
<td>True</td>
2158+
<td>False</td>
21552159
<td>Provides ancillary debug output to console</td>
21562160
</tr>
21572161
<tr>

server/documents/collections/form.html.eco

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@ themes : ['Default', 'Flat', 'Chubby', 'GitHub']
12131213
</div>
12141214

12151215
<div class="example" data-use-content="true">
1216-
<h4 class="ui header">Equal Width</h4>
1216+
<h4 class="ui header">Equal Width Form</h4>
12171217
<p>Forms can automatically divide fields to be equal width</p>
12181218
<div class="ui equal width form">
12191219
<div class="fields">
@@ -1274,7 +1274,7 @@ themes : ['Default', 'Flat', 'Chubby', 'GitHub']
12741274
<h2 class="ui dividing header">Field Variations</h2>
12751275

12761276
<div data-use-content="true" class="example">
1277-
<h4 class="ui header">Inline</h4>
1277+
<h4 class="ui header">Inline Field</h4>
12781278
<p>A field can have its label next to instead of above it.</p>
12791279
<div class="ui form">
12801280
<div class="inline field">
@@ -1401,7 +1401,7 @@ themes : ['Default', 'Flat', 'Chubby', 'GitHub']
14011401
</div>
14021402

14031403
<div class="example" data-use-content="true">
1404-
<h4 class="ui header">Equal Width</h4>
1404+
<h4 class="ui header">Equal Width Fields</h4>
14051405
<p>Fields can automatically divide fields to be equal width</p>
14061406
<div class="ui form">
14071407
<div class="fields">
@@ -1433,7 +1433,7 @@ themes : ['Default', 'Flat', 'Chubby', 'GitHub']
14331433

14341434

14351435
<div class="example" data-use-content="true">
1436-
<h4 class="ui header">Inline</h4>
1436+
<h4 class="ui header">Inline Fields</h4>
14371437
<p>Multiple fields may be inline in a row</p>
14381438
<div class="ui form">
14391439
<div class="inline fields">

server/documents/collections/grid.html.eco

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ themes : ['Default']
4343
<div class="highlighted example" data-use-content="true" data-class="column">
4444
<h4 class="ui header">Columns</h4>
4545
<p>Grids divide horizontal space into indivisible units called "columns". All columns in a grid must specify their width as proportion of the total available row width.</p>
46-
<p>All grid systems chooses an arbitrary column count to allow per row. Semantic's default theme uses <b>16 columns</b>.</p>
46+
<p>All grid systems choose an arbitrary column count to allow per row. Semantic's default theme uses <b>16 columns</b>.</p>
4747

4848
<p>The example below shows four <code>four wide</code> columns will fit in the first row, <code>16 / 4 = 4</code>, and three various sized columns in the second row. <code>2 + 8 + 6 = 16</code></p>
4949

server/documents/collections/table.html.eco

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ themes : ['Default', 'Basic', 'Classic', 'GitHub']
325325

326326
<div class="ui ignored info message">
327327
<p>UI tables use <code>border-collapse: separate</code> to allow for tables to receive styles that cannot usually be applied to tables like <code>border-radius</code>. However this can cause some cell borders to appear missing with complex layouts that use <code>rowspan</code> or <code>colspan</code> and rows with varying column count.</p>
328-
<p><code>ui complex table</code> does not support some style features, but can correctly display all valid HTML table content.</p>
328+
<p><code>ui structured table</code> does not support some style features, but can correctly display all valid HTML table content.</p>
329329
</div>
330330

331331
<table class="ui celled structured table">
@@ -862,34 +862,6 @@ themes : ['Default', 'Basic', 'Classic', 'GitHub']
862862
</tbody>
863863
</table>
864864
</div>
865-
<div class="another example">
866-
<table class="ui selectable inverted table">
867-
<thead>
868-
<tr>
869-
<th>Name</th>
870-
<th>Status</th>
871-
<th class="right aligned">Notes</th>
872-
</tr>
873-
</thead>
874-
<tbody>
875-
<tr>
876-
<td>John</td>
877-
<td>Approved</td>
878-
<td class="right aligned">None</td>
879-
</tr>
880-
<tr>
881-
<td>Jamie</td>
882-
<td>Approved</td>
883-
<td class="right aligned">Requires call</td>
884-
</tr>
885-
<tr>
886-
<td>Jill</td>
887-
<td>Denied</td>
888-
<td class="right aligned">None</td>
889-
</tr>
890-
</tbody>
891-
</table>
892-
</div>
893865

894866
<div class="example">
895867
<h4 class="ui header">Vertical Alignment</h4>

server/documents/elements/divider.html.eco

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ themes : ['default']
3838
A vertical divider will automatically swap to a horizontal divider at mobile resolutions when used inside a <a href="/collections/grid.html#stackable-grid"><code>stackable grid</code></a>
3939
</div>
4040
<div class="ui warning ignored message">
41-
There is a know bug of vertical dividers after a W3C update. Please read <a href="https://github.com/Semantic-Org/Semantic-UI/issues/4342" target="_blank" rel="nofollow">#4342</a> for more information
41+
There is a known bug of vertical dividers after a W3C update. Please read <a href="https://github.com/Semantic-Org/Semantic-UI/issues/4342" target="_blank" rel="nofollow">#4342</a> for more information
4242
</div>
4343
<div class="ui three column very relaxed grid">
4444
<div class="column">

server/documents/elements/flag.html.eco

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ elementType : 'element'
66
standalone : true
77

88
title : 'Flag'
9-
description : 'A flag is is used to represent a political state'
9+
description : 'A flag is used to represent a political state'
1010
type : 'UI Element'
1111

1212
---

server/documents/elements/label.html.eco

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,8 @@ themes : ['Default', 'GitHub']
305305

306306
<div class="example" data-class="floating">
307307
<h4 class="ui header">Floating</h4>
308-
<p>A label can float above another element</p>
308+
<p>A label can float above another element.</p>
309+
<div class="ui ignored warning message">A floating label must be positioned inside a container with <b>position: relative</b> to display properly.</div>
309310
<div class="ui compact menu">
310311
<a class="item">
311312
<i class="icon mail"></i> Messages

server/documents/elements/loader.html.eco

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ themes : ['Default', 'Duo', 'Pulsar']
6868
<h4 class="ui header">Active</h4>
6969
<p>A loader can be active or visible</p>
7070
<div class="ui ignored info message">
71-
An active dimmer may not be clearly visible without using a <a href="/modules/dimmer.html">ui dimmer</a>
71+
An active loader may not be clearly visible without using a <a href="/modules/dimmer.html">ui dimmer</a>
7272
</div>
7373
<div class="ui segment">
7474
<div class="ui active loader"></div>

server/documents/globals/reset.html.eco

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ element : 'reset'
55
elementType : 'global'
66

77
title : 'Reset'
8-
description : 'A reset is a set of normalized values for CSS properties that correct for aberations in browser defaults'
8+
description : 'A reset is a set of normalized values for CSS properties that correct for abberations in browser defaults'
99
type : 'UI Global'
1010

1111
themes : ['Default', 'Basic', 'Resetcss']
@@ -19,6 +19,9 @@ themes : ['Default', 'Basic', 'Resetcss']
1919
<div class="ui active tab" data-tab="overview">
2020
<h2 class="ui dividing header">What's In Our Reset</h2>
2121
<p>Semantic's default theme includes the latest <a href="http://necolas.github.io/normalize.css/">Normalize CSS</a> to provide a base line HTML reset. In addition, Semantic UI requires a <b>Box-sizing</b> reset, to make sure that elements handle width definitions in the same way.</p>
22+
<div class="ui text message info ignore">
23+
The reset is required for Semantic UI components to function properly, and should also be included when using individual components.
24+
</div>
2225

2326
<h2 class="ui dividing header">Reset Options</h2>
2427
<p>

0 commit comments

Comments
 (0)