Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Semantic-Org/Semantic-UI-Docs int…
Browse files Browse the repository at this point in the history
…o next
  • Loading branch information
jlukic committed Feb 20, 2017
2 parents 87571d1 + 28a1eae commit 4a2ee4d
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 19 deletions.
2 changes: 1 addition & 1 deletion server/documents/behaviors/form.html.eco
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type : 'UI Behavior'
<h4 class="ui header">Specifying Validation Rules</h4>
<p>Form validation requires passing in a validation object with the rules required to validate your form.</p>
<div class="ui ignored info message">
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.
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.
</div>
<div class="ignore code" data-title="Shorthand Validation">
$('.ui.form')
Expand Down
2 changes: 1 addition & 1 deletion server/documents/elements/container.html.eco
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ themes : ['Default']

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

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

<table class="ui celled definition table">
<thead>
Expand Down
5 changes: 4 additions & 1 deletion server/documents/elements/divider.html.eco
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ themes : ['default']
<div class="ui info ignored message">
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>
</div>
<div class="ui warning ignored message">
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
</div>
<div class="ui three column very relaxed grid">
<div class="column">
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
Expand Down Expand Up @@ -205,4 +208,4 @@ themes : ['default']
</div>
</div>

</div>
</div>
1 change: 0 additions & 1 deletion server/documents/elements/icon.html.eco
Original file line number Diff line number Diff line change
Expand Up @@ -1369,7 +1369,6 @@ themes : ['Default']
<div class="column"><i class="pied piper hat icon"></i>Pied Piper Hat</div>
<div class="column"><i class="pied piper icon"></i>Pied Piper</div>
<div class="column"><i class="pinterest icon"></i>Pinterest</div>
<div class="column"><i class="pinterest icon"></i>Pinterest</div>
<div class="column"><i class="pinterest square icon"></i>Pinterest Square</div>
<div class="column"><i class="pocket icon"></i>Pocket</div>
<div class="column"><i class="product hunt icon"></i>Product Hunt</div>
Expand Down
6 changes: 0 additions & 6 deletions server/documents/introduction/getting-started.html.eco
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,6 @@ type : 'Main'
<h4>Include in Your HTML</h4>
<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>
<div class="ignored code" data-type="html" data-escape="true">
<script
src="https://code.jquery.com/jquery-3.1.1.min.js"
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8="
crossorigin="anonymous"></script>

&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;semantic/dist/semantic.min.css&quot;&gt;
&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;semantic/dist/semantic.min.css&quot;&gt;
&lt;script
src="https://code.jquery.com/jquery-3.1.1.min.js"
Expand Down
2 changes: 1 addition & 1 deletion server/documents/modules/popup.html.eco
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,7 @@ themes : ['Default']
<td>onUnplaceable</td>
<td>$module</td>
<td>$popup</td>
<td>Callback after popup cannot be plaed on screen</td>
<td>Callback after popup cannot be placed on screen</td>
</tr>
</tbody>
</table>
Expand Down
12 changes: 6 additions & 6 deletions server/documents/usage/layout.html.eco
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ type : 'Usage'
<div class="content">
<div class="header">Grid</div>
<div class="description">
An introduction to using Semantic UI grids
An introduction to using Semantic UI grids.
</div>
</div>
</a>
Expand All @@ -54,7 +54,7 @@ type : 'Usage'
<div class="content">
<div class="header">Attached Content</div>
<div class="description">
Examples of content that can attach to other content
Examples of content that can attach to other content.
</div>
</div>
</a>
Expand All @@ -65,7 +65,7 @@ type : 'Usage'
<div class="content">
<div class="header">Bootstrap Migration</div>
<div class="description">
Examples of replacements for components found in Bootstrap
Examples of replacements for components found in Bootstrap.
</div>
</div>
</a>
Expand All @@ -81,7 +81,7 @@ type : 'Usage'
<div class="content">
<div class="header">Homepage</div>
<div class="description">
A simple, responsive homepage design with sidebar
A simple, responsive homepage design with sidebar.
</div>
</div>
</a>
Expand All @@ -92,7 +92,7 @@ type : 'Usage'
<div class="content">
<div class="header">Sticky Menus</div>
<div class="description">
Using visibility APIs to fix content after passing position in page
Using visibility APIs to fix content after passing position in page.
</div>
</div>
</a>
Expand All @@ -103,7 +103,7 @@ type : 'Usage'
<div class="content">
<div class="header">Fixed Menu</div>
<div class="description">
Using a fixed menu with page content
Using a fixed menu with page content.
</div>
</div>
</a>
Expand Down
4 changes: 2 additions & 2 deletions server/partials/examples/single/flag-menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<div class="item" data-value="bn"><i class="bn flag"></i>Brunei</div>
<div class="item" data-value="bg"><i class="bg flag"></i>Bulgaria</div>
<div class="item" data-value="bf"><i class="bf flag"></i>Burkina Faso</div>
<div class="item" data-value="ar"><i class="ar flag"></i>Burma</div>
<div class="item" data-value="mm"><i class="mm flag"></i>Burma</div>
<div class="item" data-value="bi"><i class="bi flag"></i>Burundi</div>
<div class="item" data-value="tc"><i class="tc flag"></i>Caicos Islands</div>
<div class="item" data-value="kh"><i class="kh flag"></i>Cambodia</div>
Expand Down Expand Up @@ -241,4 +241,4 @@
<div class="item" data-value="ye"><i class="ye flag"></i>Yemen</div>
<div class="item" data-value="zm"><i class="zm flag"></i>Zambia</div>
<div class="item" data-value="zw"><i class="zw flag"></i>Zimbabwe</div>
</div>
</div>

0 comments on commit 4a2ee4d

Please sign in to comment.