Hopiu/bootstrap
1
0
Fork 0
mirror of https://github.com/Hopiu/bootstrap.git synced 2026-03-17 13:10:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit b36e6dae2f
11 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/css/bootstrap.css
View file

@ -392,7 +392,6 @@ a:focus, a:hover {
}
a:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
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 {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}

BIN
dist/css/bootstrap.css.map vendored
View file

Binary file not shown.

2
dist/css/bootstrap.min.css vendored
View file

File diff suppressed because one or more lines are too long

BIN
dist/css/bootstrap.min.css.map vendored
View file

Binary file not shown.

BIN
docs/assets/css/docs.min.css.map
View file

Binary file not shown.

2
docs/assets/scss/_clipboard-js.scss
View file

@ -1,6 +1,6 @@
// clipboard.js
//
// Flash-based `Copy` buttons for code snippets.
// JS-based `Copy` buttons for code snippets.
.bd-clipboard {
position: relative;

2
docs/dist/css/bootstrap.css
View file

@ -392,7 +392,6 @@ a:focus, a:hover {
}
a:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
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 {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}

BIN
docs/dist/css/bootstrap.css.map vendored
View file

Binary file not shown.

2
docs/dist/css/bootstrap.min.css vendored
View file

File diff suppressed because one or more lines are too long

BIN
docs/dist/css/bootstrap.min.css.map vendored
View file

Binary file not shown.

2
docs/layout/grid.md
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
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">
{% example html %}