0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-14 02:24:00 +01:00
Commit Graph

11936 Commits

Author SHA1 Message Date
Mark Otto
8454382b6a Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2014-12-04 21:20:54 -08:00
Mark Otto
a1a3a007b6 tweak grid docs, add new tier 2014-12-04 21:02:04 -08:00
Chris Rebert
0c5a5563b2 Merge pull request #15214 from twbs/example-ids
Give all embedded live docs examples data-example-id attrs
[skip sauce]
2014-12-04 19:18:29 -08:00
Chris Rebert
fc9b7e5464 Merge pull request #2 from twbs/data-example-id
Add support for example IDs to {% example %} template tag
2014-12-04 19:14:55 -08:00
Mark Otto
156750941b move media queries docs to new section of layout 2014-12-04 16:51:19 -08:00
TJ
f837a3f775 Remove "Separated link" in example where it's not
Removed "Separated link" in example where it's not separated. This may confuse people to think that it is separated.

I don't want to sound nitpick, but I've been working with a client maintaining a custom internal Bootstrap installation with customized docs, so I've been getting a lot of feedback from client developers using the docs.
2014-12-04 19:00:31 -05:00
Mark Otto
824f26a3c0 grunt dist 2014-12-04 15:29:53 -08:00
Mark Otto
32878bca7f fix margin on tables 2014-12-04 15:25:57 -08:00
Mark Otto
7bc020cce0 sass, not less 2014-12-04 15:25:24 -08:00
Mark Otto
d05e58449a linting 2014-12-04 15:20:55 -08:00
Mark Otto
2fa4ab8209 grunt 2014-12-04 15:20:45 -08:00
Mark Otto
854dc065e4 fix blockquote margins, remify values 2014-12-04 15:19:23 -08:00
Mark Otto
8e454b6f1d fix hr margins, remify border width 2014-12-04 15:18:16 -08:00
Mark Otto
aab9218c7f rem-ify blog example and clean a few visuals up 2014-12-04 14:32:13 -08:00
Mark Otto
b811553147 new look for carousel example, convert to rems 2014-12-04 14:18:13 -08:00
Mark Otto
908f776c08 more rem fixes for examples 2014-12-04 14:02:38 -08:00
Mark Otto
0d7115928b convert narrow jumbotron to rems 2014-12-04 01:10:26 -08:00
Mark Otto
7c391867d7 use static top navbar in jumbotron 2014-12-04 01:07:04 -08:00
Mark Otto
04d9091158 rename css file 2014-12-04 01:06:09 -08:00
Mark Otto
15ec0e9811 rename 2014-12-04 01:05:43 -08:00
Mark Otto
471e5969ac convert jumbotron example to new navbar, fix container, and use rems in css 2014-12-04 01:04:07 -08:00
Mark Otto
d0cffbb680 grunt dist 2014-12-04 01:03:54 -08:00
Mark Otto
6fe75ead07 no need for .container's max-width: 100% since we use max-width now on all containers 2014-12-04 01:03:41 -08:00
Mark Otto
248e0e4059 fix heading margins 2014-12-04 01:03:23 -08:00
Mark Otto
95e27d0034 fix nav for grid template 2014-12-04 01:00:15 -08:00
Mark Otto
c7c46acf48 update starter template to use new navbar 2014-12-04 00:59:36 -08:00
Mark Otto
4474630d77 restore px to base font size var 2014-12-04 00:10:24 -08:00
Mark Otto
c213ff820a fix the variables i broke, temporarily disabling line-height-computed 2014-12-04 00:09:37 -08:00
Mark Otto
bad40d5c4a Merge pull request #1 from twbs/scss
Move to Sass
2014-12-03 18:15:37 -08:00
Mark Otto
bafd0b057e fix broken textarea.form-control reported by @thomas-mcdonald 2014-12-03 11:23:53 -08:00
Matt Smith
dbe4765416 Nested button groups with only one child now have rounded corners (Iss.#15270) 2014-12-03 11:44:35 -05:00
Bootstrap's Grunt bot
ac49a09906 automatic grunt dist 2014-12-03 07:20:27 +00:00
Chris Rebert
66217e4a85 Temporarily revert "automatic grunt dist" so Grunt bot will run again.
This reverts commit 2c1c885ed4.
2014-12-02 23:02:46 -08:00
Chris Rebert
833f391090 Add support for example IDs to {% example %} template tag
e.g. {% example html id=some-example-id-here %}
2014-12-02 18:46:42 -08:00
Bootstrap's Grunt bot
2c1c885ed4 automatic grunt dist 2014-12-03 00:51:08 +00:00
Mark Otto
c80b7e468a bit of cleanup 2014-12-02 14:03:43 -08:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -08:00
Chris Rebert
5cb0d933c9 Merge pull request #15269 from twbs/role-separator
Whitelist <li role="separator">...</li>
[skip sauce]
2014-12-02 15:16:34 -06:00
Chris Rebert
a527aaa114 Whitelist <li role="separator">...</li>
Refs https://www.w3.org/Bugs/Public/show_bug.cgi?id=27120
Refs #15263

[skip sauce]
2014-12-02 12:56:30 -08:00
Chris Rebert
0445f23b72 Update Wall of Browser Bugs entry for #14972
http://crbug.com/175502 is fixed in Chrome 40 and has been closed.
But Windows is still broken due to http://crbug.com/438064 ,
  which is open and currently targeting Chrome 41.
2014-12-02 12:31:55 -08:00
Mark Otto
6bd84210ff remove broken examples link 2014-12-02 02:04:37 -08:00
Mark Otto
67c9d9e185 add examples description, remove browser bugs description 2014-12-01 16:51:48 -08:00
Mark Otto
8fdac3d3a2 move examples index again, clean up nav 2014-12-01 16:51:31 -08:00
Mark Otto
af30e237c7 rearrange examples 2014-12-01 16:12:15 -08:00
Mark Otto
75943868be update home and side nav to use new navbar structure 2014-12-01 15:41:11 -08:00
Mark Otto
639a211344 add new album example 2014-12-01 15:19:15 -08:00
Mark Otto
9180e15e33 Clean up navbar to remove .navbar-toggle, .navbar-collapse, and .navbar-header as they are no longer used; Add .navbar-toggler to .navbar-inverse 2014-12-01 15:03:09 -08:00
Mark Otto
19d15476d8 nav tweaks 2014-12-01 02:06:30 -08:00
Mark Otto
72d1761256 Merge branch 'master' into v4
Conflicts:
	docs/_includes/js/collapse.html
2014-12-01 01:41:10 -08:00
Mark Otto
a17f23c022 nuke the other incomplete example per @ianw 2014-12-01 01:39:31 -08:00