WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 4bffac2

Browse files
gakimballgakimball
committed
Merge branch '5.4-before-craziness'
2 parents f0839b4 + 5532391 commit 4bffac2

File tree

65 files changed

+867
-236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+867
-236
lines changed

‎doc/includes/alert/examples_alert_aria.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{{#markdown}}
2+
```html
3+
<div id="mainAlert1" data-alert class="alert-box" tabindex="0" aria-live="assertive" role="dialogalert">
4+
Your content goes here
5+
<button href="#" tabindex="0" class="close" aria-label="Close Alert">&times;</button>
6+
</div>
7+
```
8+
{{/markdown}}

‎doc/includes/alert/examples_alert_aria_rendered.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<div id="mainAlert1" data-alert class="alert-box" tabindex="0" aria-live="assertive" role="dialogalert">
2+
Your content goes here
3+
<button href="#" tabindex="0" class="close" aria-label="Close Alert">&times;</button>
4+
</div>

‎doc/includes/form/examples_form_labels.html‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</div>
99
</div>
1010
<div class="row">
11-
<div class="large-6 columns">
11+
<div class="large-12 columns">
1212
<div class="row collapse">
1313
<div class="small-10 columns">
1414
<input type="text" placeholder="Hex Value">
@@ -18,15 +18,49 @@
1818
</div>
1919
</div>
2020
</div>
21+
</div>
22+
<div class="row">
2123
<div class="large-6 columns">
22-
<div class="row collapse">
24+
<div class="row collapse prefix-radius">
25+
<div class="small-3 columns">
26+
<span class="prefix">Label</span>
27+
</div>
28+
<div class="small-9 columns">
29+
<input type="text" placeholder="Value">
30+
</div>
31+
</div>
32+
</div>
33+
<div class="large-6 columns">
34+
<div class="row collapse postfix-radius">
2335
<div class="small-9 columns">
2436
<input type="text" placeholder="Value">
2537
</div>
2638
<div class="small-3 columns">
27-
<span class="postfix radius">Label</span>
39+
<span class="postfix">Label</span>
40+
</div>
41+
</div>
42+
</div>
43+
</div>
44+
<div class="row">
45+
<div class="large-6 columns">
46+
<div class="row collapse prefix-round">
47+
<div class="small-3 columns">
48+
<a href="#" class="button prefix">Go</a>
49+
</div>
50+
<div class="small-9 columns">
51+
<input type="text" placeholder="Value">
52+
</div>
53+
</div>
54+
</div>
55+
<div class="large-6 columns">
56+
<div class="row collapse postfix-round">
57+
<div class="small-9 columns">
58+
<input type="text" placeholder="Value">
59+
</div>
60+
<div class="small-3 columns">
61+
<a href="#" class="button postfix">Go</a>
2862
</div>
2963
</div>
3064
</div>
3165
</div>
32-
</form>
66+
</form>

‎doc/includes/form/examples_form_labels_rendered.html‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</div>
1111
</div>
1212
<div class="row">
13-
<div class="large-6 columns">
13+
<div class="large-12 columns">
1414
<div class="row collapse">
1515
<div class="small-10 columns">
1616
<input type="text" placeholder="Hex Value">
@@ -20,17 +20,51 @@
2020
</div>
2121
</div>
2222
</div>
23+
</div>
24+
<div class="row">
2325
<div class="large-6 columns">
24-
<div class="row collapse">
26+
<div class="row collapse prefix-radius">
27+
<div class="small-3 columns">
28+
<span class="prefix">Label</span>
29+
</div>
30+
<div class="small-9 columns">
31+
<input type="text" placeholder="Value">
32+
</div>
33+
</div>
34+
</div>
35+
<div class="large-6 columns">
36+
<div class="row collapse postfix-radius">
2537
<div class="small-9 columns">
2638
<input type="text" placeholder="Value">
2739
</div>
2840
<div class="small-3 columns">
29-
<span class="postfix radius">Label</span>
41+
<span class="postfix">Label</span>
42+
</div>
43+
</div>
44+
</div>
45+
</div>
46+
<div class="row">
47+
<div class="large-6 columns">
48+
<div class="row collapse prefix-round">
49+
<div class="small-3 columns">
50+
<a href="#" class="button prefix">Go</a>
51+
</div>
52+
<div class="small-9 columns">
53+
<input type="text" placeholder="Value">
54+
</div>
55+
</div>
56+
</div>
57+
<div class="large-6 columns">
58+
<div class="row collapse postfix-round">
59+
<div class="small-9 columns">
60+
<input type="text" placeholder="Value">
61+
</div>
62+
<div class="small-3 columns">
63+
<a href="#" class="button postfix">Go</a>
3064
</div>
3165
</div>
3266
</div>
3367
</div>
3468
</form>
3569
```
36-
{{/markdown}}
70+
{{/markdown}}

‎doc/includes/icon-bar/examples_icon_bar_iconfont.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
</a>
1919
</div>
2020
```
21-
{{/markdown}}
21+
{{/markdown}}

‎doc/includes/icon-bar/examples_icon_bar_iconfont_aria.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{{#markdown}}
22
```html
3-
<div class="icon-bar five-up">
4-
<a class="item" aria-label="Home">
3+
<div class="icon-bar five-up" role="navigation">
4+
<a class="item" role="button" tabindex="0" aria-label="home">
55
<i class="fi-home"></i>
66
</a>
7-
<a class="item" aria-label="Bookmark">
7+
<a class="item" role="button" tabindex="0" aria-label="Bookmark">
88
<i class="fi-bookmark"></i>
99
</a>
10-
<a class="item" aria-label="Information">
10+
<a class="item" role="button" tabindex="0" aria-label="Information">
1111
<i class="fi-info"></i>
1212
</a>
13-
<a class="item" aria-label="Mail">
13+
<a class="item" role="button" tabindex="0" aria-label="Mail">
1414
<i class="fi-mail"></i>
1515
</a>
16-
<a class="item" aria-label="Like">
17-
<i class="fi-like" ></i>
16+
<a class="item" role="button" tabindex="0" aria-label="Like">
17+
<i class="fi-like"></i>
1818
</a>
1919
</div>
2020
```
21-
{{/markdown}}
21+
{{/markdown}}

‎doc/includes/icon-bar/examples_icon_bar_iconfont_aria_rendered.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<div class="icon-bar five-up">
2-
<a class="item" aria-label="Home">
1+
<div class="icon-bar five-up" role="navigation">
2+
<a class="item" role="button" tabindex="0" aria-label="home">
33
<i class="fi-home"></i>
44
</a>
5-
<a class="item" aria-label="Bookmark">
5+
<a class="item" role="button" tabindex="0" aria-label="Bookmark">
66
<i class="fi-bookmark"></i>
77
</a>
8-
<a class="item" aria-label="Information">
8+
<a class="item" role="button" tabindex="0" aria-label="Information">
99
<i class="fi-info"></i>
1010
</a>
11-
<a class="item" aria-label="Mail">
11+
<a class="item" role="button" tabindex="0" aria-label="Mail">
1212
<i class="fi-mail"></i>
1313
</a>
14-
<a class="item" aria-label="Like">
15-
<i class="fi-like" ></i>
14+
<a class="item" role="button" tabindex="0" aria-label="Like">
15+
<i class="fi-like"></i>
1616
</a>
1717
</div>

‎doc/includes/icon-bar/examples_icon_bar_text_aria.html‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{{#markdown}}
2+
```html
3+
<div class="icon-bar five-up" role="navigation">
4+
<a class="item" aria-labeledby="#itemlabel1">
5+
<img src="../assets/img/images/fi-home.svg" >
6+
<label id='itemlabel1'>Home</label>
7+
</a>
8+
<a class="item" aria-labeledby="#itemlabel2">
9+
<img src="../assets/img/images/fi-bookmark.svg" >
10+
<label id='itemlabel2'>Bookmark</label>
11+
</a>
12+
<a class="item" aria-labeledby="#itemlabel3">
13+
<img src="../assets/img/images/fi-info.svg" >
14+
<label id='itemlabel3'>Info</label>
15+
</a>
16+
<a class="item" aria-labeledby="#itemlabel4">
17+
<img src="../assets/img/images/fi-mail.svg" >
18+
<label id='itemlabel4'>Mail</label>
19+
</a>
20+
<a class="item" aria-labeledby="#itemlabel5">
21+
<img src="../assets/img/images/fi-like.svg" >
22+
<label id='itemlabel5'>Like</label>
23+
</a>
24+
</div>
25+
```
26+
{{/markdown}}

‎doc/includes/icon-bar/examples_icon_bar_text_aria_rendered.html‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<div class="icon-bar five-up" role="navigation">
2+
<a class="item" role="button" tabindex="0" aria-labeledby="#itemlabel1">
3+
<img src="../assets/img/images/fi-home.svg" >
4+
<label id='itemlabel1'>Home</label>
5+
</a>
6+
<a class="item" role="button" tabindex="0" aria-labeledby="#itemlabel2">
7+
<img src="../assets/img/images/fi-bookmark.svg" >
8+
<label id='itemlabel2'>Bookmark</label>
9+
</a>
10+
<a class="item" role="button" tabindex="0" aria-labeledby="#itemlabel3">
11+
<img src="../assets/img/images/fi-info.svg" >
12+
<label id='itemlabel3'>Info</label>
13+
</a>
14+
<a class="item" role="button" tabindex="0" aria-labeledby="#itemlabel4">
15+
<img src="../assets/img/images/fi-mail.svg" >
16+
<label id='itemlabel4'>Mail</label>
17+
</a>
18+
<a class="item" role="button" tabindex="0" aria-labeledby="#itemlabel5">
19+
<img src="../assets/img/images/fi-like.svg" >
20+
<label id='itemlabel5'>Like</label>
21+
</a>
22+
</div>

‎doc/includes/kitchen/examples_kitchen_type.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
<div class="type-demo">
2+
13
<h1>h1. This is a very large header.</h1>
24
<h2>h2. This is a large header.</h2>
35
<h3>h3. This is a medium header.</h3>
@@ -65,4 +67,6 @@ <h5>Vcard</h5>
6567
<li class="locality">Caprica City</li>
6668
<li><span class="state">Caprica</span>, <span class="zip">12345</span></li>
6769
<li class="email"><a href="#">[email protected]</a></li>
68-
</ul>
70+
</ul>
71+
72+
</div>

0 commit comments

Comments
 (0)