Skip to content

Commit 0089597

Browse files
mdomdo
committed
Merge branch 'master' of github.com:twbs/bootstrap
2 parents 7c8d955 + 26eb9f3 commit 0089597

13 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎components.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2027,7 +2027,7 @@ <h1 id="jumbotron">Jumbotron</h1>
20272027
<div class="container">
20282028
<h1>Hello, world!</h1>
20292029
<p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
2030-
<p><a class="btn btn-primary btn-lg">Learn more</a></p>
2030+
<p><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
20312031
</div>
20322032
</div>
20332033
</div>
@@ -2036,7 +2036,7 @@ <h1>Hello, world!</h1>
20362036
<div class="container">
20372037
<h1>Hello, world!</h1>
20382038
<p>...</p>
2039-
<p><a class="btn btn-primary btn-lg">Learn more</a></p>
2039+
<p><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
20402040
</div>
20412041
</div>
20422042
{% endhighlight %}
@@ -2120,7 +2120,7 @@ <h3 id="thumbnails-custom-content">Custom content</h3>
21202120
<div class="caption">
21212121
<h3>Thumbnail label</h3>
21222122
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
2123-
<p><a href="#" class="btn btn-primary">Button</a> <a href="#" class="btn btn-default">Button</a></p>
2123+
<p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
21242124
</div>
21252125
</div>
21262126
</div>
@@ -2130,7 +2130,7 @@ <h3>Thumbnail label</h3>
21302130
<div class="caption">
21312131
<h3>Thumbnail label</h3>
21322132
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
2133-
<p><a href="#" class="btn btn-primary">Button</a> <a href="#" class="btn btn-default">Button</a></p>
2133+
<p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
21342134
</div>
21352135
</div>
21362136
</div>
@@ -2140,7 +2140,7 @@ <h3>Thumbnail label</h3>
21402140
<div class="caption">
21412141
<h3>Thumbnail label</h3>
21422142
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
2143-
<p><a href="#" class="btn btn-primary">Button</a> <a href="#" class="btn btn-default">Button</a></p>
2143+
<p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
21442144
</div>
21452145
</div>
21462146
</div>
@@ -2154,7 +2154,7 @@ <h3>Thumbnail label</h3>
21542154
<div class="caption">
21552155
<h3>Thumbnail label</h3>
21562156
<p>...</p>
2157-
<p><a href="#" class="btn btn-primary">Button</a> <a href="#" class="btn btn-default">Button</a></p>
2157+
<p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
21582158
</div>
21592159
</div>
21602160
</div>

‎css.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2038,7 +2038,7 @@ <h2 id="buttons-options">Options</h2>
20382038
<button type="button" class="btn btn-link">Link</button>
20392039
</div>
20402040
{% highlight html %}
2041-
<!-- Standard gray button with gradient -->
2041+
<!-- Standard button -->
20422042
<button type="button" class="btn btn-default">Default</button>
20432043

20442044
<!-- Provides extra visual weight and identifies the primary action in a set of buttons -->
@@ -2134,12 +2134,12 @@ <h4>Cross-browser compatibility</h4>
21342134
<h3>Anchor element</h3>
21352135
<p>Add the <code>.disabled</code> class to <code>&lt;a&gt;</code> buttons.</p>
21362136
<p class="bs-example">
2137-
<a href="#" class="btn btn-primary btn-lg disabled">Primary link</a>
2138-
<a href="#" class="btn btn-default btn-lg disabled">Link</a>
2137+
<a href="#" class="btn btn-primary btn-lg disabled" role="button">Primary link</a>
2138+
<a href="#" class="btn btn-default btn-lg disabled" role="button">Link</a>
21392139
</p>
21402140
{% highlight html %}
2141-
<a href="#" class="btn btn-primary btn-lg disabled">Primary link</a>
2142-
<a href="#" class="btn btn-default btn-lg disabled">Link</a>
2141+
<a href="#" class="btn btn-primary btn-lg disabled" role="button">Primary link</a>
2142+
<a href="#" class="btn btn-default btn-lg disabled" role="button">Link</a>
21432143
{% endhighlight %}
21442144
<p>
21452145
We use <code>.disabled</code> as a utility class here, similar to the common <code>.active</code> class, so no prefix is required.
@@ -2153,13 +2153,13 @@ <h4>Link functionality not impacted</h4>
21532153
<h2 id="buttons-tags">Button tags</h2>
21542154
<p>Use the button classes on an <code>&lt;a&gt;</code>, <code>&lt;button&gt;</code>, or <code>&lt;input&gt;</code> element.</p>
21552155
<form class="bs-example">
2156-
<a class="btn btn-default" href="#">Link</a>
2156+
<a class="btn btn-default" href="#" role="button">Link</a>
21572157
<button class="btn btn-default" type="submit">Button</button>
21582158
<input class="btn btn-default" type="button" value="Input">
21592159
<input class="btn btn-default" type="submit" value="Submit">
21602160
</form>
21612161
{% highlight html %}
2162-
<a class="btn btn-default" href="#">Link</a>
2162+
<a class="btn btn-default" href="#" role="button">Link</a>
21632163
<button class="btn btn-default" type="submit">Button</button>
21642164
<input class="btn btn-default" type="button" value="Input">
21652165
<input class="btn btn-default" type="submit" value="Submit">

‎examples/carousel/index.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<div class="carousel-caption">
8080
<h1>Example headline.</h1>
8181
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
82-
<p><a class="btn btn-large btn-primary" href="#">Sign up today</a></p>
82+
<p><a class="btn btn-large btn-primary" href="#" role="button">Sign up today</a></p>
8383
</div>
8484
</div>
8585
</div>
@@ -89,7 +89,7 @@ <h1>Example headline.</h1>
8989
<div class="carousel-caption">
9090
<h1>Another example headline.</h1>
9191
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
92-
<p><a class="btn btn-large btn-primary" href="#">Learn more</a></p>
92+
<p><a class="btn btn-large btn-primary" href="#" role="button">Learn more</a></p>
9393
</div>
9494
</div>
9595
</div>
@@ -99,7 +99,7 @@ <h1>Another example headline.</h1>
9999
<div class="carousel-caption">
100100
<h1>One more for good measure.</h1>
101101
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
102-
<p><a class="btn btn-large btn-primary" href="#">Browse gallery</a></p>
102+
<p><a class="btn btn-large btn-primary" href="#" role="button">Browse gallery</a></p>
103103
</div>
104104
</div>
105105
</div>
@@ -122,19 +122,19 @@ <h1>One more for good measure.</h1>
122122
<img class="img-circle" src="data:image/png;base64," data-src="holder.js/140x140" alt="Generic placeholder image">
123123
<h2>Heading</h2>
124124
<p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.</p>
125-
<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
125+
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
126126
</div><!-- /.col-lg-4 -->
127127
<div class="col-lg-4">
128128
<img class="img-circle" src="data:image/png;base64," data-src="holder.js/140x140" alt="Generic placeholder image">
129129
<h2>Heading</h2>
130130
<p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p>
131-
<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
131+
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
132132
</div><!-- /.col-lg-4 -->
133133
<div class="col-lg-4">
134134
<img class="img-circle" src="data:image/png;base64," data-src="holder.js/140x140" alt="Generic placeholder image">
135135
<h2>Heading</h2>
136136
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
137-
<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
137+
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
138138
</div><!-- /.col-lg-4 -->
139139
</div><!-- /.row -->
140140

‎examples/jumbotron-narrow/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ <h3 class="text-muted">Project name</h3>
3737
<div class="jumbotron">
3838
<h1>Jumbotron heading</h1>
3939
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
40-
<p><a class="btn btn-lg btn-success" href="#">Sign up today</a></p>
40+
<p><a class="btn btn-lg btn-success" href="#" role="button">Sign up today</a></p>
4141
</div>
4242

4343
<div class="row marketing">

‎examples/jumbotron/index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<div class="container">
7171
<h1>Hello, world!</h1>
7272
<p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
73-
<p><a class="btn btn-primary btn-lg">Learn more &raquo;</a></p>
73+
<p><a class="btn btn-primary btn-lg" role="button">Learn more &raquo;</a></p>
7474
</div>
7575
</div>
7676

@@ -80,17 +80,17 @@ <h1>Hello, world!</h1>
8080
<div class="col-md-4">
8181
<h2>Heading</h2>
8282
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
83-
<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
83+
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
8484
</div>
8585
<div class="col-md-4">
8686
<h2>Heading</h2>
8787
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
88-
<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
88+
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
8989
</div>
9090
<div class="col-md-4">
9191
<h2>Heading</h2>
9292
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
93-
<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
93+
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
9494
</div>
9595
</div>
9696

‎examples/justified-nav/index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,25 @@ <h3 class="text-muted">Project name</h3>
4242
<div class="jumbotron">
4343
<h1>Marketing stuff!</h1>
4444
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet.</p>
45-
<p><a class="btn btn-lg btn-success" href="#">Get started today</a></p>
45+
<p><a class="btn btn-lg btn-success" href="#" role="button">Get started today</a></p>
4646
</div>
4747

4848
<!-- Example row of columns -->
4949
<div class="row">
5050
<div class="col-lg-4">
5151
<h2>Heading</h2>
5252
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
53-
<p><a class="btn btn-primary" href="#">View details &raquo;</a></p>
53+
<p><a class="btn btn-primary" href="#" role="button">View details &raquo;</a></p>
5454
</div>
5555
<div class="col-lg-4">
5656
<h2>Heading</h2>
5757
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
58-
<p><a class="btn btn-primary" href="#">View details &raquo;</a></p>
58+
<p><a class="btn btn-primary" href="#" role="button">View details &raquo;</a></p>
5959
</div>
6060
<div class="col-lg-4">
6161
<h2>Heading</h2>
6262
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa.</p>
63-
<p><a class="btn btn-primary" href="#">View details &raquo;</a></p>
63+
<p><a class="btn btn-primary" href="#" role="button">View details &raquo;</a></p>
6464
</div>
6565
</div>
6666

‎examples/navbar-fixed-top/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ <h1>Navbar example</h1>
7070
<p>This example is a quick exercise to illustrate how the default, static and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
7171
<p>To see the difference between static and fixed top navbars, just scroll.</p>
7272
<p>
73-
<a class="btn btn-lg btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
73+
<a class="btn btn-lg btn-primary" href="../../components/#navbar" role="button">View navbar docs &raquo;</a>
7474
</p>
7575
</div>
7676

‎examples/navbar-static-top/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ <h1>Navbar example</h1>
7171
<p>This example is a quick exercise to illustrate how the default, static and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
7272
<p>To see the difference between static and fixed top navbars, just scroll.</p>
7373
<p>
74-
<a class="btn btn-lg btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
74+
<a class="btn btn-lg btn-primary" href="../../components/#navbar" role="button">View navbar docs &raquo;</a>
7575
</p>
7676
</div>
7777

‎examples/navbar/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<h1>Navbar example</h1>
6868
<p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
6969
<p>
70-
<a class="btn btn-lg btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
70+
<a class="btn btn-lg btn-primary" href="../../components/#navbar" role="button">View navbar docs &raquo;</a>
7171
</p>
7272
</div>
7373

‎examples/offcanvas/index.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,32 +58,32 @@ <h1>Hello, world!</h1>
5858
<div class="col-6 col-sm-6 col-lg-4">
5959
<h2>Heading</h2>
6060
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
61-
<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
61+
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
6262
</div><!--/span-->
6363
<div class="col-6 col-sm-6 col-lg-4">
6464
<h2>Heading</h2>
6565
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
66-
<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
66+
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
6767
</div><!--/span-->
6868
<div class="col-6 col-sm-6 col-lg-4">
6969
<h2>Heading</h2>
7070
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
71-
<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
71+
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
7272
</div><!--/span-->
7373
<div class="col-6 col-sm-6 col-lg-4">
7474
<h2>Heading</h2>
7575
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
76-
<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
76+
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
7777
</div><!--/span-->
7878
<div class="col-6 col-sm-6 col-lg-4">
7979
<h2>Heading</h2>
8080
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
81-
<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
81+
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
8282
</div><!--/span-->
8383
<div class="col-6 col-sm-6 col-lg-4">
8484
<h2>Heading</h2>
8585
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
86-
<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
86+
<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
8787
</div><!--/span-->
8888
</div><!--/row-->
8989
</div><!--/span-->

0 commit comments

Comments
 (0)