Skip to content

Commit 4a2ee4d

Browse files
committed
Merge branch 'master' of github.com:Semantic-Org/Semantic-UI-Docs into next
2 parents 87571d1 + 28a1eae commit 4a2ee4d

8 files changed

Lines changed: 15 additions & 19 deletions

File tree

server/documents/behaviors/form.html.eco

Lines changed: 1 addition & 1 deletion
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.
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.
3232
</div>
3333
<div class="ignore code" data-title="Shorthand Validation">
3434
$('.ui.form')

server/documents/elements/container.html.eco

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ themes : ['Default']
3232

3333
<h3 class="ui header">Container Sizes</h3>
3434

35-
<p>Containers are designed to responsively adjust their maximum width based on the size of the screen they are appearing.</p>
35+
<p>Containers are designed to responsively adjust their maximum width based on the size of the screen on which they are appearing.</p>
3636

3737
<table class="ui celled definition table">
3838
<thead>

server/documents/elements/divider.html.eco

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ themes : ['default']
3737
<div class="ui info ignored message">
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>
40+
<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
42+
</div>
4043
<div class="ui three column very relaxed grid">
4144
<div class="column">
4245
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
@@ -205,4 +208,4 @@ themes : ['default']
205208
</div>
206209
</div>
207210

208-
</div>
211+
</div>

server/documents/elements/icon.html.eco

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,6 @@ themes : ['Default']
13691369
<div class="column"><i class="pied piper hat icon"></i>Pied Piper Hat</div>
13701370
<div class="column"><i class="pied piper icon"></i>Pied Piper</div>
13711371
<div class="column"><i class="pinterest icon"></i>Pinterest</div>
1372-
<div class="column"><i class="pinterest icon"></i>Pinterest</div>
13731372
<div class="column"><i class="pinterest square icon"></i>Pinterest Square</div>
13741373
<div class="column"><i class="pocket icon"></i>Pocket</div>
13751374
<div class="column"><i class="product hunt icon"></i>Product Hunt</div>

server/documents/introduction/getting-started.html.eco

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,6 @@ type : 'Main'
124124
<h4>Include in Your HTML</h4>
125125
<p>Running the gulp build tools will compile CSS and Javascript for use in your project. Just link to these files in your HTML along with the latest <a href="http://www.jquery.com" target="_blank">jQuery</a>.</p>
126126
<div class="ignored code" data-type="html" data-escape="true">
127-
<script
128-
src="https://code.jquery.com/jquery-3.1.1.min.js"
129-
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8="
130-
crossorigin="anonymous"></script>
131-
132-
&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;semantic/dist/semantic.min.css&quot;&gt;
133127
&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;semantic/dist/semantic.min.css&quot;&gt;
134128
&lt;script
135129
src="https://code.jquery.com/jquery-3.1.1.min.js"

server/documents/modules/popup.html.eco

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ themes : ['Default']
867867
<td>onUnplaceable</td>
868868
<td>$module</td>
869869
<td>$popup</td>
870-
<td>Callback after popup cannot be plaed on screen</td>
870+
<td>Callback after popup cannot be placed on screen</td>
871871
</tr>
872872
</tbody>
873873
</table>

server/documents/usage/layout.html.eco

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ type : 'Usage'
4343
<div class="content">
4444
<div class="header">Grid</div>
4545
<div class="description">
46-
An introduction to using Semantic UI grids
46+
An introduction to using Semantic UI grids.
4747
</div>
4848
</div>
4949
</a>
@@ -54,7 +54,7 @@ type : 'Usage'
5454
<div class="content">
5555
<div class="header">Attached Content</div>
5656
<div class="description">
57-
Examples of content that can attach to other content
57+
Examples of content that can attach to other content.
5858
</div>
5959
</div>
6060
</a>
@@ -65,7 +65,7 @@ type : 'Usage'
6565
<div class="content">
6666
<div class="header">Bootstrap Migration</div>
6767
<div class="description">
68-
Examples of replacements for components found in Bootstrap
68+
Examples of replacements for components found in Bootstrap.
6969
</div>
7070
</div>
7171
</a>
@@ -81,7 +81,7 @@ type : 'Usage'
8181
<div class="content">
8282
<div class="header">Homepage</div>
8383
<div class="description">
84-
A simple, responsive homepage design with sidebar
84+
A simple, responsive homepage design with sidebar.
8585
</div>
8686
</div>
8787
</a>
@@ -92,7 +92,7 @@ type : 'Usage'
9292
<div class="content">
9393
<div class="header">Sticky Menus</div>
9494
<div class="description">
95-
Using visibility APIs to fix content after passing position in page
95+
Using visibility APIs to fix content after passing position in page.
9696
</div>
9797
</div>
9898
</a>
@@ -103,7 +103,7 @@ type : 'Usage'
103103
<div class="content">
104104
<div class="header">Fixed Menu</div>
105105
<div class="description">
106-
Using a fixed menu with page content
106+
Using a fixed menu with page content.
107107
</div>
108108
</div>
109109
</a>

server/partials/examples/single/flag-menu.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<div class="item" data-value="bn"><i class="bn flag"></i>Brunei</div>
3434
<div class="item" data-value="bg"><i class="bg flag"></i>Bulgaria</div>
3535
<div class="item" data-value="bf"><i class="bf flag"></i>Burkina Faso</div>
36-
<div class="item" data-value="ar"><i class="ar flag"></i>Burma</div>
36+
<div class="item" data-value="mm"><i class="mm flag"></i>Burma</div>
3737
<div class="item" data-value="bi"><i class="bi flag"></i>Burundi</div>
3838
<div class="item" data-value="tc"><i class="tc flag"></i>Caicos Islands</div>
3939
<div class="item" data-value="kh"><i class="kh flag"></i>Cambodia</div>
@@ -241,4 +241,4 @@
241241
<div class="item" data-value="ye"><i class="ye flag"></i>Yemen</div>
242242
<div class="item" data-value="zm"><i class="zm flag"></i>Zambia</div>
243243
<div class="item" data-value="zw"><i class="zw flag"></i>Zimbabwe</div>
244-
</div>
244+
</div>

0 commit comments

Comments
 (0)