Mark Otto
5073d07a47
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
2015-12-08 00:49:42 -08:00
Mark Otto
ac5be12f24
unfuck that border from rem to px
2015-12-08 00:49:31 -08:00
Chris Rebert
4e6e3860a6
docs/components/navbar.md: Nitpick phrasing
...
[ci skip]
2015-12-08 00:36:42 -08:00
Mark Otto
8fa5fb2857
fixes #17887 : restore hover/focus for cover nav
2015-12-08 00:20:43 -08:00
Mark Otto
11c287d1d7
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
2015-12-08 00:16:56 -08:00
Mark Otto
60ad55b8f7
fixes #17776
2015-12-08 00:16:46 -08:00
Mark Otto
9c55815898
Merge pull request #17930 from zalog/patch-12
...
v4 - .c-select shouldn't inherit white text color
2015-12-08 00:05:52 -08:00
Mark Otto
46fa32e397
Merge pull request #17946 from supergibbs/NuGet_badge_v4
...
Add NuGet badge
2015-12-08 00:05:31 -08:00
Mark Otto
1132e0c11d
Merge pull request #17952 from supergibbs/NuGet_Support
...
Add NuGet support
2015-12-08 00:04:05 -08:00
Chris Rebert
8b0d737a56
scss/_pagination.scss: Reassert #18257
...
[skip sauce]
2015-12-08 00:01:58 -08:00
Mark Otto
30aad997d0
tweak comment
2015-12-07 23:52:10 -08:00
Mark Otto
834ac49eee
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
2015-12-07 23:50:17 -08:00
Mark Otto
4fc721fe4a
grunt
2015-12-07 23:49:29 -08:00
Chris Rebert
bac09b7767
Add entry for pagination component changes to v4 migration guide
...
Refs #18110
[skip sauce]
2015-12-07 23:49:07 -08:00
Mark Otto
96dd9c57d2
Merge branch 'bassjobsen-patch-6' into v4-dev
2015-12-07 23:48:41 -08:00
Mark Otto
9e6d1c1ec6
Merge branch 'patch-6' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-6
2015-12-07 23:48:33 -08:00
Chris Rebert
9010ff8345
Fix header hierarchy in migration guide
...
[ci skip]
2015-12-07 23:47:13 -08:00
Mark Otto
04b3766452
grunt
2015-12-07 23:47:00 -08:00
Mark Otto
4dd60d8310
fix variable
2015-12-07 23:46:56 -08:00
Mark Otto
a9f53f0fc0
Merge pull request #18110 from twbs/pagination-classes
...
Refactor pagination classes to avoid tag selectors & child selectors
2015-12-07 23:41:55 -08:00
Mark Otto
38847f564c
grunt
2015-12-07 23:36:38 -08:00
Mark Otto
9e872efb3f
rip out the .blockquote-* children classes for margin utils
2015-12-07 23:36:35 -08:00
Mark Otto
886bbe9bc0
Merge pull request #18138 from bassjobsen/patch-12
...
refactor blockqoutes to to avoid tag selectors & child selectors
2015-12-07 23:32:31 -08:00
Mark Otto
7303977c52
grunt
2015-12-07 23:31:06 -08:00
Mark Otto
515ff1aacb
rewrite list-inline to use margin and simpler styles
2015-12-07 23:31:02 -08:00
Mark Otto
d3c87d32fa
Merge branch 'patch-11' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-11
2015-12-07 23:28:31 -08:00
Chris Rebert
e7edf10473
.page => .page-item
2015-12-07 22:37:17 -08:00
Chris Rebert
0c1df9912f
Refactor pagination code to remove unnecessary ancestor requirements in selectors
2015-12-07 22:37:17 -08:00
Chris Rebert
5f35ce2095
.page>{a,span => .page-link}
2015-12-07 22:37:17 -08:00
Chris Rebert
a878c4f0c6
.pagination>{li => .page}
2015-12-07 22:37:17 -08:00
Mark Otto
7eadfbc9b2
ignore that
2015-12-07 22:31:16 -08:00
Mark Otto
1e9f0ab99e
grunt
2015-12-07 22:11:27 -08:00
Mark Otto
7f8a05d3ef
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
2015-12-07 22:10:38 -08:00
Mark Otto
3d45bd6106
fixes #18293 : clean up sticky stuff
2015-12-07 22:05:37 -08:00
Mark Otto
0186ab5fff
Merge pull request #18325 from twbs/tooltip-a-nowrap
...
Prevent anchors in tooltip example from splitting across lines
2015-12-07 21:58:35 -08:00
Mark Otto
5a6a128728
fixes #18330
2015-12-07 21:57:06 -08:00
Mark Otto
e5b6922258
Merge pull request #18356 from lesleh/card-mixin
...
Card mixin
2015-12-07 21:55:26 -08:00
Mark Otto
bd5d25da44
fixes #18281
2015-12-07 21:51:04 -08:00
Mark Otto
c9eb483ca9
fixes #18320 : pull in suit base reset for button focus styles in FF and IE
2015-12-07 21:47:40 -08:00
Mark Otto
d36686afee
spacing
2015-12-07 21:46:03 -08:00
Mark Otto
78d3a083a0
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
2015-12-07 21:35:15 -08:00
Mark Otto
8f80b80c17
grunt
2015-12-07 21:35:05 -08:00
Mark Otto
4520b0f5d0
proper fix for #18439 w/ clippy placement and hover
2015-12-07 21:35:00 -08:00
Chris Rebert
5e3a20889f
Merge pull request #18455 from twbs/fix-18424
...
Use $input-border-width for both .form-control and .btn borders
2015-12-07 20:48:56 -08:00
Chris Rebert
9dacdce42c
Use $input-btn-border-width for both .form-control and .btn borders; fixes #18424
...
Both widgets need to use the same border width because of input groups.
Thus:
$btn-border-width => $input-btn-border-width
$input-border-width => $input-btn-border-width
[skip sauce]
2015-12-07 20:41:51 -08:00
Chris Rebert
ed0e6be863
Merge pull request #18460 from twbs/migration-stateful-btn
...
Add entry about stateful buttons to v4 migration guide
2015-12-07 17:02:48 -08:00
Chris Rebert
e117083694
Add entry about stateful buttons to v4 migration guide
...
Refs #18459 , #17178
[skip sauce]
2015-12-07 16:48:22 -08:00
Alexandr Kondrashov
750d45c9e9
Add an empty line at the end of the file
2015-12-08 03:46:16 +03:00
Chris Rebert
5d4fd87bfa
Consolidate duplicate "Buttons" section in v4 migration docs
...
[skip sauce]
2015-12-07 16:30:12 -08:00
Alexandr Kondrashov
d4e9dad3de
SVG: base64 > ASCII85 (fix merge)
2015-12-08 03:27:53 +03:00
