Skip to content

Commit 7259af6

Browse files
jlukicjlukic
committed
Merge branch 'next' of github.com:Semantic-Org/Semantic-UI-Docs
2 parents b08e9d7 + 0b37423 commit 7259af6

23 files changed

Lines changed: 867 additions & 111 deletions

‎docpad.coffee‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ docpadConfig = {
2929
# Here are some old site urls that you would like to redirect from
3030
oldUrls: [],
3131

32-
version: "2.3.3",
32+
version: "2.4.0",
3333

3434
branch: "master",
3535

‎server/documents/collections/table.html.eco‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,45 +30,27 @@ themes : ['Default', 'Basic', 'Classic', 'GitHub']
3030
</div>
3131
<table class="ui celled table">
3232
<thead>
33-
<th>Header</th>
34-
<th>Header</th>
35-
<th>Header</th>
33+
<th>Name</th>
34+
<th>Age</th>
35+
<th>Job</th>
3636
</thead>
3737
<tbody>
3838
<tr>
39-
<td>
40-
<div class="ui ribbon label">First</div>
41-
</td>
42-
<td>Cell</td>
43-
<td>Cell</td>
39+
<td data-label="Name">James</td>
40+
<td data-label="Age">24</td>
41+
<td data-label="Job">Engineer</td>
4442
</tr>
4543
<tr>
46-
<td>Cell</td>
47-
<td>Cell</td>
48-
<td>Cell</td>
44+
<td data-label="Name">Jill</td>
45+
<td data-label="Age">26</td>
46+
<td data-label="Job">Engineer</td>
4947
</tr>
5048
<tr>
51-
<td>Cell</td>
52-
<td>Cell</td>
53-
<td>Cell</td>
49+
<td data-label="Name">Elyse</td>
50+
<td data-label="Age">24</td>
51+
<td data-label="Job">Designer</td>
5452
</tr>
5553
</tbody>
56-
<tfoot>
57-
<th colspan="3">
58-
<div class="ui right floated pagination menu">
59-
<a class="icon item">
60-
<i class="left chevron icon"></i>
61-
</a>
62-
<a class="item">1</a>
63-
<a class="item">2</a>
64-
<a class="item">3</a>
65-
<a class="item">4</a>
66-
<a class="icon item">
67-
<i class="right chevron icon"></i>
68-
</a>
69-
</div>
70-
</th>
71-
</tfoot>
7254
</table>
7355
</div>
7456

@@ -116,6 +98,22 @@ themes : ['Default', 'Basic', 'Classic', 'GitHub']
11698
<td>Creatine is the reference compound for power improvement, with numbers from one meta-analysis to assess potency</td>
11799
</tr>
118100
</tbody>
101+
<tfoot>
102+
<th colspan="5">
103+
<div class="ui right floated pagination menu">
104+
<a class="icon item">
105+
<i class="left chevron icon"></i>
106+
</a>
107+
<a class="item">1</a>
108+
<a class="item">2</a>
109+
<a class="item">3</a>
110+
<a class="item">4</a>
111+
<a class="icon item">
112+
<i class="right chevron icon"></i>
113+
</a>
114+
</div>
115+
</th>
116+
</tfoot>
119117
</table>
120118
</div>
121119
<div class="another example">

‎server/documents/elements/divider.html.eco‎

Lines changed: 41 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -34,69 +34,64 @@ themes : ['default']
3434
<div class="ui ignored message">
3535
Vertical dividers requires <code>position: relative</code> on the element that you would like to contain the divider
3636
</div>
37-
<div class="ui info ignored message">
38-
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>
39-
</div>
4037
<div class="ui warning ignored message">
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
38+
Due to a change in W3C implementation of <a href="https://github.com/w3c/csswg-drafts/issues/401" target="_blank" rel="nofollow">absolutely positioned elements in flex containers</a> vertical dividers now currently only support 50/50 splits automatically, and only if not positioned <b>as direct children of flex containers</b> (like grid).
4239
</div>
43-
<div class="ui three column very relaxed grid">
44-
<div class="column">
45-
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
46-
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
47-
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
48-
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
40+
<div class="ui segment">
41+
<div class="ui two column very relaxed grid">
42+
<div class="column">
43+
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
44+
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
45+
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
46+
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
47+
</div>
48+
<div class="column">
49+
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
50+
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
51+
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
52+
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
53+
</div>
4954
</div>
5055
<div class="ui vertical divider">
5156
and
5257
</div>
53-
<div class="column">
54-
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
55-
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
56-
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
57-
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
58-
</div>
59-
<div class="ui vertical divider">
60-
not
61-
</div>
62-
<div class="column">
63-
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
64-
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
65-
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
66-
<img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
67-
</div>
6858
</div>
6959
</div>
7060
<div class="another example">
71-
<div class="ui two column middle aligned very relaxed stackable grid">
72-
<div class="column">
73-
<div class="ui form">
74-
<div class="field">
75-
<label>Username</label>
76-
<div class="ui left icon input">
77-
<input type="text" placeholder="Username">
78-
<i class="user icon"></i>
61+
<div class="ui info ignored message">
62+
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>
63+
</div>
64+
<div class="ui placeholder segment">
65+
<div class="ui two column very relaxed stackable grid">
66+
<div class="column">
67+
<div class="ui form">
68+
<div class="field">
69+
<label>Username</label>
70+
<div class="ui left icon input">
71+
<input type="text" placeholder="Username">
72+
<i class="user icon"></i>
73+
</div>
7974
</div>
80-
</div>
81-
<div class="field">
82-
<label>Password</label>
83-
<div class="ui left icon input">
84-
<input type="password">
85-
<i class="lock icon"></i>
75+
<div class="field">
76+
<label>Password</label>
77+
<div class="ui left icon input">
78+
<input type="password">
79+
<i class="lock icon"></i>
80+
</div>
8681
</div>
82+
<div class="ui blue submit button">Login</div>
83+
</div>
84+
</div>
85+
<div class="middle aligned column">
86+
<div class="ui big button">
87+
<i class="signup icon"></i>
88+
Sign Up
8789
</div>
88-
<div class="ui blue submit button">Login</div>
8990
</div>
9091
</div>
9192
<div class="ui vertical divider">
9293
Or
9394
</div>
94-
<div class="center aligned column">
95-
<div class="ui big green labeled icon button">
96-
<i class="signup icon"></i>
97-
Sign Up
98-
</div>
99-
</div>
10095
</div>
10196
</div>
10297

‎server/documents/elements/flag.html.eco‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ type : 'UI Element'
495495
<tr>
496496
<td><i class="united kingdom flag"></i></td>
497497
<td>United Kingdom</td>
498-
<td>gb</td>
498+
<td>gb uk</td>
499499
<td class="disabled"></td>
500500
</tr>
501501
<tr>

‎server/documents/elements/icon.html.eco‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1415,6 +1415,7 @@ themes : ['Default']
14151415
<div class="column"><i class="cloud icon"></i>cloud</div>
14161416
<div class="column"><i class="cloud download icon"></i>cloud download</div>
14171417
<div class="column"><i class="cloud upload icon"></i>cloud upload</div>
1418+
<div class="column"><i class="close icon"></i>close icon</div>
14181419
<div class="column"><i class="coffee icon"></i>coffee</div>
14191420
<div class="column"><i class="cog icon"></i>cog</div>
14201421
<div class="column"><i class="cogs icon"></i>cogs</div>
@@ -1546,6 +1547,7 @@ themes : ['Default']
15461547
<div class="column"><i class="user circle icon"></i>user circle</div>
15471548
<div class="column"><i class="user circle outline icon"></i>user circle outline</div>
15481549
<div class="column"><i class="wifi icon"></i>wifi</div>
1550+
<div class="column"><i class="x icon"></i>x icon</div>
15491551
</div>
15501552
<div class="existing code">
15511553
<i class="ban icon"></i>

‎server/documents/elements/loader.html.eco‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ themes : ['Default', 'Duo', 'Pulsar']
1515

1616
<%- @partial('header') %>
1717
<link rel="stylesheet/less" type="text/css" href="/src/definitions/elements/loader.less" />
18+
<script src="/javascript/loader.js"></script>
1819

1920
<div class="main ui container">
2021

0 commit comments

Comments
 (0)