mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch 'v4-dev' into v4-grid-fixes

Browse Source
This commit is contained in:
Mark Otto
2016-07-23 20:40:52 -07:00
parent cdc55a46c2 2ab662095b
commit b36e6dae2f
11 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
-2
View File
@@ -392,7 +392,6 @@ a:focus, a:hover {
} }
a:focus { a:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }
@@ -2492,7 +2491,6 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
} }
.btn:focus, .btn.focus, .btn:active:focus, .btn:active.focus, .btn.active:focus, .btn.active.focus { .btn:focus, .btn.focus, .btn:active:focus, .btn:active.focus, .btn.active:focus, .btn.active.focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/css/docs.min.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/scss/_clipboard-js.scss
+1 -1
View File
@@ -1,6 +1,6 @@
// clipboard.js // clipboard.js
// //
// Flash-based `Copy` buttons for code snippets. // JS-based `Copy` buttons for code snippets.
.bd-clipboard { .bd-clipboard {
position: relative; position: relative;
docs/dist/css/bootstrap.css
-2
View File
@@ -392,7 +392,6 @@ a:focus, a:hover {
} }
a:focus { a:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }
@@ -2492,7 +2491,6 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
} }
.btn:focus, .btn.focus, .btn:active:focus, .btn:active.focus, .btn.active:focus, .btn.active.focus { .btn:focus, .btn.focus, .btn:active:focus, .btn:active.focus, .btn.active:focus, .btn.active.focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }
docs/dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/layout/grid.md
+1 -1
View File
@@ -444,7 +444,7 @@ To nest your content with the default grid, add a new `.row` and set of `.col-sm
### Example: Column ordering ### Example: Column ordering
Easily change the order of our built-in grid columns with `.col-md-push-*` and `.col-md-pull-*` modifier classes. Easily change the order of our built-in grid columns with `.push-md-*` and `.pull-md-*` modifier classes.
<div class="bd-example-row"> <div class="bd-example-row">
{% example html %} {% example html %}