Mark Otto
863b429e9a
add 1.0.0 to 2.3.1
2015-06-16 14:22:15 -07:00
Mark Otto
46736b44f6
update docs assets
2015-06-16 13:13:14 -07:00
Julian Thilo
c85fdda6f8
Try updating docs
2015-06-16 18:50:35 +02:00
Chris Rebert
dc25a6cef8
Fix #16311
2015-04-22 23:44:50 -07:00
Chris Rebert
4c809bb9f9
regenerate browser-bugs/index.html
2015-04-12 13:33:22 -07:00
Chris Rebert
c00fc23515
v2.3.2 docs: Link to corresponding v3 docs pages (instead of v3 homepage) where possible
...
Closes #16277 .
2015-04-12 13:23:42 -07:00
Chris Rebert
e9c6ae1098
Apply #16208 to hosted docs
2015-04-07 18:41:52 -07:00
Chris Rebert
cc95cc75b8
regenerate docs for v3.3.4
2015-03-16 08:57:29 -07:00
Chris Rebert
cc07218b04
Regenerate part of getting-started/index.html
...
Fixes https://github.com/twbs/bootstrap-sass/issues/862
2015-03-15 05:35:18 -07:00
Chris Rebert
d940f7cd85
regenerate browser-bugs/index.html
2015-02-22 22:13:27 -08:00
Mark Otto
dc0e9a0379
change all the twitter handles
2015-02-05 19:40:29 -08:00
Mark Otto
f67ca4d406
customize typo
2015-01-19 09:22:00 -08:00
Mark Otto
0d8c85d8f9
docs for 3.3.2
2015-01-19 09:10:41 -08:00
Chris Rebert
8fbe58032f
regenerate Wall of Browser Bugs page
2015-01-10 18:25:18 -08:00
Chris Rebert
fd964d6b05
apply fixes from master branch to example templates
2014-12-22 13:03:54 -08:00
Chris Rebert
7473dc5ac7
apply example tweaks from master branch
2014-12-22 12:58:47 -08:00
Chris Rebert
63a5f9c112
apply skippy changes from master branch
2014-12-22 12:53:56 -08:00
Chris Rebert
24d2e39cf4
apply most minor changes from master branch
2014-12-22 12:52:56 -08:00
Chris Rebert
6d926d2eee
regenerate Migration page from master branch
2014-12-22 12:27:32 -08:00
Chris Rebert
bbbc8e862b
regenerate About page from master branch
2014-12-22 12:26:28 -08:00
Chris Rebert
59b5ca6909
Apply Getting Started content updates from master branch
2014-12-22 12:23:40 -08:00
Chris Rebert
418e7e34b7
Port #15126 over to hosted docs
...
Refs #15423
2014-12-22 12:21:02 -08:00
Chris Rebert
daeb2c32d0
regenerate browser-bugs/index.html
2014-12-19 17:34:43 -08:00
Chris Rebert
fcd75b7fb6
port #15395 over to hosted docs
2014-12-17 13:21:37 -08:00
Chris Rebert
850c4c0559
Adjust @brand-primary alert in Customizer
...
Refs #15320
2014-12-15 16:23:50 -08:00
Chris Rebert
64bb0a3308
Port #15309 over to hosted customizer
2014-12-05 13:33:13 -08:00
Heinrich Fenkart
c66e3029df
warn about change default value in customizer
2014-11-12 18:53:05 +01:00
Mark Otto
46edabe554
3.3.1
2014-11-12 09:15:07 -08:00
Heinrich Fenkart
79d0cdbef4
port #15031 over again
2014-11-07 09:31:34 +01:00
Chris Rebert
19ca6389e2
Port #15031 over to hosted docs
2014-11-05 14:57:14 -08:00
Chris Rebert
85dea538a5
Port #14958 over to hosted docs
2014-10-31 17:15:23 -07:00
Heinrich Fenkart
aa309a1e9e
apply #14954 to hosted docs
2014-10-31 11:07:19 +01:00
Chris Rebert
69e2fae33e
Revert "apply #14930 to hosted docs"
...
This reverts commit 11df32dd6b .
BootstrapCDN has now uploaded Bootstrap v3.3.0
2014-10-30 17:39:31 -07:00
Chris Rebert
d3085c9084
Port #14941 over to hosted docs
2014-10-30 11:39:04 -07:00
Chris Rebert
11df32dd6b
apply #14930 to hosted docs
2014-10-30 00:13:07 -07:00
Chris Rebert
d7313d0fe2
update Wall of Browser Bugs
2014-10-29 18:42:45 -07:00
Mark Otto
ffbf6a7087
bump tracking for v2.3.2 to universal code
2014-10-29 18:30:56 -07:00
Mark Otto
4a3131f6ba
fix broks links
2014-10-29 12:52:33 -07:00
Mark Otto
ebeb110b7c
bump to v3.3.0
2014-10-29 12:17:44 -07:00
Chris Rebert
7396fa597d
port over #13746 & 1f329f8f17
2014-10-20 19:08:10 -07:00
Chris Rebert
71c3a9e36b
Revert "Port #13996 over to hosted docs"
...
This reverts commit 3625fc01fa .
2014-10-07 15:45:47 -07:00
Chris Rebert
33a87e5b10
Port Wall of Browser Bugs updates over to hosted docs
2014-10-01 09:42:02 -07:00
Chris Rebert
f5b90440fa
Port JS Alert fixes over to hosted docs
2014-09-26 18:33:07 -07:00
Chris Rebert
55455720b2
Port #14654 over to hosted docs
2014-09-26 18:27:14 -07:00
Chris Rebert
31811a837c
Port #14034 over to hosted docs
2014-09-26 18:26:14 -07:00
Chris Rebert
9c1e09fa6f
Port #14133 over to hosted docs
2014-09-26 18:25:01 -07:00
Chris Rebert
7ac0c4a183
Port trivial fixes over to hosted docs
2014-09-26 18:23:57 -07:00
Chris Rebert
99c1c37cd9
Port #13988 over to hosted docs
2014-09-26 18:20:51 -07:00
Chris Rebert
1f8c19fe3c
Port part of f9349f36df over to hosted docs
2014-09-26 18:19:36 -07:00
Chris Rebert
c4eb216cf9
Port #14441 over to hosted docs
2014-09-26 18:17:37 -07:00
Chris Rebert
7263693ed1
Port #14674 over to hosted docs
2014-09-26 18:16:10 -07:00
Chris Rebert
df6b99a2c6
Port #14250 over to hosted docs
2014-09-26 18:14:29 -07:00
Chris Rebert
3625fc01fa
Port #13996 over to hosted docs
2014-09-26 17:57:34 -07:00
Chris Rebert
5b4bf03a0c
Port 89d437deda over to hosted docs
2014-09-26 17:55:40 -07:00
Chris Rebert
08aa7aaa51
Port #14598 over to hosted docs
2014-09-26 17:53:35 -07:00
Chris Rebert
ebedbf4c2e
Port #14516 over to hosted docs
2014-09-26 17:50:51 -07:00
Chris Rebert
f72a9082a0
Port #14482 over to hosted docs
2014-09-26 17:49:42 -07:00
Chris Rebert
4be838001b
Port 7441d3f4c5 over to hosted docs
2014-09-26 17:47:24 -07:00
Chris Rebert
8d88db8270
Port #14543 over to hosted docs
2014-09-26 17:07:19 -07:00
Chris Rebert
ad2064c9ad
Port #14666 over to hosted docs
2014-09-26 17:04:24 -07:00
Chris Rebert
bc20e24acf
Port #14677 over to hosted docs
2014-09-26 17:02:26 -07:00
Chris Rebert
06322239af
regenerate browser-bugs/index.html based on master branch
2014-09-22 10:24:07 -07:00
Chris Rebert
0ea578d5ea
Port #14565 over to hosted docs
2014-09-08 11:10:35 -07:00
Chris Rebert
b5224b188f
fix #14522
2014-09-03 10:48:53 -07:00
Chris Rebert
4ab418ab11
Merge pull request #14477 from twbs/docs-porting
...
Port over most of the v3.2.1 docs fixes to the current hosted docs
2014-08-28 12:08:38 -07:00
Chris Rebert
8312d7fd78
port over most of the v3.2.1 docs fixes
2014-08-27 20:51:32 -07:00
Chris Rebert
c373a610bf
Fix #14411 in hosted docs by porting over 71c2c372f6
2014-08-17 16:03:09 -07:00
Chris Rebert
6d3086b772
regenerate with fixes applied
2014-06-30 21:11:21 -07:00
Julian Thilo
709ae8ef61
Port additional changes to popover docs
...
https://github.com/twbs/bootstrap/commit/43b7a942bc4eb2307353dcf32e7c245664546afc
So all the popover demos work great.
/fyi @mdo
2014-06-26 23:27:46 +02:00
Mark Otto
13e81219a8
port over #13946
2014-06-26 12:57:57 -07:00
Mark Otto
0ad6be2472
port changes from #13947
2014-06-26 12:46:37 -07:00
Mark Otto
b7dd628dd5
port in #13942
2014-06-26 11:51:56 -07:00
Mark Otto
e4c276bcd1
bring back full js
2014-06-26 09:48:57 -07:00
Mark Otto
a161967645
bring back full css files
2014-06-26 09:48:42 -07:00
Mark Otto
2c3d8ce134
merge in v3.2.0 changes; nuke a dupe _gh_pages dir
2014-06-26 09:46:59 -07:00
Chris Rebert
ed14e5132b
Merge pull request #13472 from twbs/adios-232-customizer
...
take down the v2.3.2 Customizer; closes #13456
2014-04-30 20:02:18 -07:00
Chris Rebert
14dce26bac
take down the v2.3.2 Customizer; closes #13456
2014-04-30 19:53:21 -07:00
Mark Otto
f09ce07e3b
restore carbon
2014-04-08 21:38:42 -07:00
Mark Otto
cbf40924fb
small update
2014-04-01 02:11:47 -07:00
Chris Rebert
a892ab697f
manually hack in a0ac99efbf
...
Tired of seeing issues about it.
2014-03-12 10:12:55 -07:00
Mark Otto
404997e01c
homepage update for old docs
2014-03-11 11:17:07 -07:00
Chris Rebert
d861e0c781
change translation docs in light of #11342 & its many dupes
2014-02-25 13:40:13 -08:00
Mark Otto
0458ae1cb3
spacing
2014-02-13 09:39:00 -08:00
Mark Otto
c17e4c7f94
lame-copy-paste files because Pages doesn't support custom source yet
2014-02-13 09:36:49 -08:00
Chris Rebert
8c5c80058d
fix #12540
2014-02-03 03:01:17 -08:00
Chris Rebert
76a8c76987
update docs about destination of remote modal content; fixes #12494
2014-02-02 22:11:55 -08:00
Mark Otto
a5b066859c
Merge branch 'gh-pages' of github.com:twbs/bootstrap into gh-pages
2014-01-31 10:42:48 -08:00
Mark Otto
33899c8768
readd some files for the hotlinkers out there
2014-01-31 10:42:36 -08:00
XhmikosR
b09eba80d3
Downgrade holder.js to v2.2.0.
...
Fixes #12440 .
2014-01-31 08:22:12 -08:00
Chris Rebert
648984f1cc
fix "pading-right" [sic] typo in dashboard.css; fixes #12455
2014-01-31 08:21:57 -08:00
Chris Rebert
eeeaa0b894
use correct+newer name for retina mixin in docs; fixes #12450
2014-01-30 14:48:32 -08:00
Chris Rebert
164367fe03
rm duplicate warning callouts in Input Groups docs
2014-01-30 12:26:24 -08:00
Chris Rebert
c30ac30751
Merge branch 'docs-hotfixes' into gh-pages
2014-01-30 11:31:50 -08:00
Chris Rebert
7c6e4a231c
rm outdated note about lack of .col-{xs,sm}-offset-0; fixes #12439
2014-01-30 10:49:43 -08:00
Chris Rebert
9f26194489
note specific versions of IE where progress bar animation supported; fixes #12437
2014-01-30 10:42:44 -08:00
Mark Otto
09673814c8
turn the docs upside down for the deploy because we're waiting on some new jekyll hotness
2014-01-30 09:30:24 -08:00
Mark Otto
eaa2b8338a
sass port number
2014-01-30 08:59:23 -08:00
Mark Otto
015e063b72
Merge branch 'master' into gh-pages
2014-01-30 08:55:26 -08:00
Mark Otto
1409cde7e8
Bump versions, run grunt
2014-01-30 08:30:37 -08:00
Mark Otto
9a6b7ab375
grunt
2014-01-30 08:14:18 -08:00
Julian Thilo
c2784ddd75
Merge pull request #12432 from ChrisRiddell/signin-email-fix
...
Wrong input css for signin example
2014-01-30 04:54:19 -08:00
Chris Riddell
d002f0459d
its an email input
2014-01-30 23:14:05 +10:30
Mark Otto
d4b1bfd667
grunt
2014-01-29 22:44:06 -08:00
Mark Otto
d2f1887bb5
Merge branch 'master' into pr/12388
...
Conflicts:
dist/css/bootstrap.min.css
2014-01-29 22:18:29 -08:00
Mark Otto
9195d8e8eb
Follow up to #11655 : don't reset opacity on disabled buttons
2014-01-29 21:57:44 -08:00
Mark Otto
7ba2eede4e
fix css url
2014-01-29 21:44:36 -08:00
Mark Otto
80ef14a11a
Merge pull request #12423 from ZDroid/name
...
Rename pack.min.css to docs.min.css to match with docs.min.js
2014-01-29 21:44:01 -08:00
Mark Otto
d631e0b92d
Fix #12422 : Reset height on multiple select in input size mixin
2014-01-29 21:34:10 -08:00
Mark Otto
545c957f17
Fixes #12424 : Account for Normalize change on figure element so that we don't potentially screw folks over
2014-01-29 21:23:23 -08:00
Zlatan Vasović
00f062fc7e
Rename pack.min.css to docs.min.css to match with docs.min.js
2014-01-29 20:50:10 +01:00
Chris Rebert
9ec5905c07
Merge pull request #12415 from XhmikosR/master
...
Gruntfile.js: remove unused code.
2014-01-28 17:35:09 -08:00
Chris Rebert
37926839ff
Merge pull request #12417 from ZDroid/cmt
...
Remove redundant jshint comment
2014-01-28 15:54:23 -08:00
Zlatan Vasović
f8bb6811bd
Remove redundant jshint comment
2014-01-28 22:47:23 +01:00
XhmikosR
615f1ad4aa
Gruntfile.js: remove unused code.
2014-01-28 21:07:56 +02:00
Mark Otto
01dabd3391
Merge pull request #12406 from twbs/normalize_v3
...
Upgrade to Normalize v3
2014-01-28 10:57:31 -08:00
Mark Otto
a9a4d81730
grunt
2014-01-28 10:08:40 -08:00
Mark Otto
493d143cbd
v3 instead of rc1
2014-01-28 10:07:33 -08:00
Julian Thilo
3a62811bbd
Update javascript.html
2014-01-28 00:01:10 +01:00
Julian Thilo
0a5cb2f908
Fix typo
2014-01-27 23:07:14 +01:00
Mark Otto
b7ac009a52
Remove #8350 's reset for number inputs since Normalize fixes those upstream
2014-01-27 12:25:39 -08:00
Mark Otto
400720d00b
Remove optgroup resets from #7611 since Normalize fixes those upstream
2014-01-27 12:24:35 -08:00
Mark Otto
6a0a139cda
Upgrade to Normalize v3-rc1 in prep for v3 final
2014-01-27 12:08:55 -08:00
Mark Otto
45ea456468
Merge branch 'master' of github.com:twbs/bootstrap
2014-01-27 09:42:33 -08:00
Mark Otto
e08e871f01
document id requirement in carousels per #12393
2014-01-27 09:24:51 -08:00
Julian Thilo
72a31db210
Merge pull request #12403 from Quy/master
...
Change positioning reference from left to right in affix's example.
2014-01-27 09:22:17 -08:00
Quy Ton
5c1852fb74
Change positioning reference from left to right in affix's example.
2014-01-27 09:17:57 -08:00
Chris Rebert
50ad304bb5
Merge pull request #12315 from twbs/use-shrinkwrap
...
Do npm caching based on npm-shrinkwrap.canonical.json
2014-01-26 20:46:14 -08:00
Mark Otto
16fd8cd01e
Merge pull request #12398 from twbs/deprecate-box-shadow-mixin
...
mark .box-shadow() mixin as deprecated
2014-01-26 19:15:31 -08:00
Chris Rebert
1a36e4fa1e
docs & comments: v3.1 => v3.1.0
2014-01-26 17:48:15 -08:00
Chris Rebert
602e5f8f11
mark .box-shadow() mixin as deprecated; fixes #12396
2014-01-26 17:44:01 -08:00
Chris Rebert
5a3f1a90ba
fix #12261
2014-01-26 14:22:06 -08:00
Alan Hamlett
e38fd138ce
fixes #10495 by forcing .navbar-brand height to prevent it's inner content from increasing navbar height
2014-01-25 21:40:56 -08:00
Chris Rebert
3157a37775
Merge pull request #12387 from twbs/osx-chrome
...
re-enable OS X Chrome in Sauce tests
2014-01-25 18:33:23 -08:00
Chris Rebert
6717f642bb
re-enable OS X Chrome in Sauce tests
2014-01-25 17:55:52 -08:00
Chris Rebert
77362a3b45
Merge pull request #12386 from twbs/update-iphone
...
update to iOS v7 in Sauce test config
2014-01-25 17:11:49 -08:00
Chris Rebert
d56def706a
update to iOS v7 in Sauce test config
2014-01-25 17:02:02 -08:00
Chris Rebert
9ec1e8694b
README: use Bootstrap v3-specific StackOverflow tag
2014-01-25 16:38:47 -08:00
Chris Rebert
87e5b16b17
disable IE11 in BrowserStack config due to frequent timeouts
2014-01-25 16:35:13 -08:00
Chris Rebert
86a5846ada
Merge pull request #12378 from andrewdisley/patch-1
...
Fix #10348 : Customizer dependencies
2014-01-25 16:30:02 -08:00
Chris Rebert
15921e5109
Merge pull request #12385 from hnrch02/update-load-grunt-tasks
...
Update load-grunt-tasks to v0.3.0
2014-01-25 16:27:05 -08:00
Heinrich Fenkart
72568ce588
Update load-grunt-tasks to v0.3.0
2014-01-25 21:03:44 +01:00
Chris Rebert
12a4263471
Merge pull request #12266 from twbs/linux
...
enable Linux Chrome & Linux Firefox in Sauce tests
2014-01-25 12:00:10 -08:00
Mark Otto
45b964c246
Merge pull request #12380 from twbs/translation-german
...
Add German translation
2014-01-25 11:10:20 -08:00
Julian Thilo
0cbfdd19bd
Add link to German translation and reorder links
2014-01-25 16:08:15 +01:00
Andrew Disley
a1b0bb7a10
Fix #10348 : Customizer dependencies
2014-01-25 12:35:46 +00:00
Mark Otto
6d090e243d
Merge pull request #12366 from Quy/master
...
Change a word.
2014-01-24 22:36:05 -08:00
Julian Thilo
af1ba5cf74
Clarify nesting in grid example
2014-01-25 01:58:54 +01:00
Quy Ton
4b5991586d
Change a word.
2014-01-24 11:24:50 -08:00
Chris Rebert
643e814e7b
Merge pull request #12365 from Quy/master
...
Remove Twitter from tweet button
2014-01-24 10:43:06 -08:00
Quy Ton
da86f6fbbb
Remove Twitter from tweet button
2014-01-24 10:37:12 -08:00
Mark Otto
4b2fe3f96f
Merge branch 'master' of github.com:twbs/bootstrap
2014-01-24 11:56:04 -06:00
Mark Otto
64e8132426
Fix #12359 : Reset min-width on fieldsets so that they don't break responsive tables and behave more like standard block level elements
2014-01-24 11:55:59 -06:00
Chris Rebert
f1c1469b83
Merge pull request #12357 from twbs/border-box-note
...
add note in Less source about global `box-sizing: border-box;`
2014-01-23 20:57:45 -08:00
Mark Otto
829eefd6f7
Merge pull request #12356 from twbs/wcag-contributing
...
add WCAG color guideline to CONTRIBUTING.md
2014-01-23 20:55:39 -08:00
Mark Otto
5e612b463d
roll back to github zip
2014-01-23 22:55:06 -06:00
Mark Otto
bd6751e932
Merge pull request #12355 from twbs/aria-contributing
...
add WAI-ARIA guideline to CONTRIBUTING.md
2014-01-23 20:53:33 -08:00
Mark Otto
44fc629d44
Fix #12353 : Scope table border reset in panels to first-child rows
2014-01-23 22:52:26 -06:00
Chris Rebert
b30cff4888
Add ref in Less to docs regarding box-sizing conflicts
...
Refs #12351
2014-01-23 20:51:23 -08:00
Chris Rebert
b9d1ae092f
add ID to "Box sizing" section of Getting Started docs
2014-01-23 17:01:43 -08:00
Chris Rebert
31e8a48783
"bottom increment" => "decrement" in explanatory comment
2014-01-23 15:07:04 -08:00
Chris Rebert
aa8b1543be
add WCAG color guideline to CONTRIBUTING.md
2014-01-23 14:01:59 -08:00
Chris Rebert
2f26eaea5b
add WAI-ARIA guideline to CONTRIBUTING.md
2014-01-23 12:50:57 -08:00
Chris Rebert
7d015817ed
fix typo and use the v3-specific StackOverflow tag
2014-01-23 11:18:56 -08:00
Mark Otto
9699e0fa2d
Point config to temp download file
2014-01-23 13:08:23 -06:00
Mark Otto
0d51cde755
add temp zip file that works
2014-01-23 13:04:45 -06:00
Chris Rebert
7a6bc67826
Merge pull request #12347 from twbs/ie-11-browserstack
...
enable IE11 in BrowserStack tests
2014-01-22 21:34:42 -08:00
Mark Otto
f748390cf5
Follow-up to #12250 : remove remaining page margins for print
2014-01-22 21:51:23 -06:00
Mark Otto
08e83a62b7
Fix #11655 : Fix broken disabled states for iOS form controls and buttons
2014-01-22 21:43:08 -06:00
Mark Otto
833c208bf5
Merge branch 'master' of github.com:twbs/bootstrap
2014-01-22 21:20:06 -06:00
Mark Otto
1e1af8687d
Merge pull request #12250 from twbs/rm-print-margins
...
remove default left-right print margins per upstream h5bp change
2014-01-22 19:18:24 -08:00
Mark Otto
b945491426
Merge branch 'master' of github.com:twbs/bootstrap
2014-01-22 21:15:25 -06:00
Mark Otto
7b24a3b99c
Fixes #12344 : Update docs to show workaround for using button element with justified button groups
2014-01-22 21:15:17 -06:00
Mark Otto
11a22fb615
Merge pull request #12345 from twbs/printer-wackiness-note
...
add note about printer viewport weirdness
2014-01-22 17:52:00 -08:00
Chris Rebert
6d08763136
add docs note to address #12078
2014-01-22 17:28:00 -08:00
Chris Rebert
9798b0bf0b
enable IE11 in BrowserStack tests
2014-01-22 14:57:32 -08:00
Julian Thilo
494014babe
No more lists.
2014-01-22 19:04:19 +01:00
Julian Thilo
57597c4761
Merge pull request #12340 from browserstack/update_bs_runner
...
Update browserstack-runner package
2014-01-22 08:46:41 -08:00
Julian Thilo
2022e15aa8
Gone, gone.
2014-01-22 17:00:09 +01:00
Rahul Nawani
6c7db9d56e
update browserstack runner package
2014-01-22 21:15:55 +05:30
Chris Rebert
81b234e74a
Merge pull request #12334 from Quy/master
...
Reorder lead/nav of About docs page
2014-01-21 22:18:44 -08:00
Quy Ton
c08aef1655
Reorder lead info of About docs page
2014-01-21 22:12:44 -08:00
Quy Ton
e5c7c2acc1
Reorder nav of About docs page
2014-01-21 22:02:54 -08:00
Mark Otto
06dcf91364
Merge pull request #12326 from twbs/navbar-var
...
add @navbar-collapse-max-height Less variable
2014-01-21 20:50:26 -08:00
Mark Otto
109ba82eed
Merge pull request #12327 from twbs/about-ordering
...
reorder sections of About docs page
2014-01-21 20:15:21 -08:00
Chris Rebert
1942f36455
remove default left-right print margins per upstream h5bp change
...
Refs:
https://github.com/h5bp/html5-boilerplate/commit/57be193031b95b003b96efe9eba7a4db7f58f4e1
https://github.com/h5bp/html5-boilerplate/issues/1477
2014-01-21 16:29:49 -08:00
Chris Rebert
9e862cdf70
enable Linux Chrome & Linux Firefox in Sauce tests
2014-01-21 16:28:38 -08:00
Chris Rebert
068d7a11f9
reorder sections of About docs page
...
most folks are probably more interested in History and Team than Branding
2014-01-21 10:28:54 -08:00
Chris Rebert
67271a18ac
add @navbar-collapse-max-height Less variable
2014-01-21 10:23:57 -08:00
Julian Thilo
7938134fd1
Merge pull request #12321 from coliff/patch-3
...
Update index.html
2014-01-21 03:15:49 -08:00
Christian
ae579e950b
Update index.html
...
This is very minor, but to help encourage best practises it'd be best to have the input type 'email' for this email input example instead of 'text'
2014-01-21 18:36:48 +09:00
Chris Rebert
c658e4e926
fix typo in README
2014-01-21 00:55:56 -08:00
Mark Otto
cd78b43185
Merge pull request #12308 from twbs/fix-12298
...
Fix #12298
2014-01-20 20:15:37 -08:00
Mark Otto
e4f33a91d9
Merge branch 'master' of github.com:twbs/bootstrap
2014-01-20 22:12:02 -06:00
Mark Otto
317aa8092d
spacing
2014-01-20 22:11:51 -06:00
Chris Rebert
ebc4f998dc
Merge pull request #12318 from twbs/fscking-customizer
...
Template the customizer's nav sidebar too
2014-01-20 18:09:59 -08:00
Chris Rebert
3de48d29f5
fix #12280 by templating the customizer's nav sidebar too
...
The customizer is such a PITA.
2014-01-20 18:06:16 -08:00
Chris Rebert
5d35c4909c
Merge pull request #12282 from XhmikosR/grunt-contrib-uglify
...
Update grunt-contrib-uglify dependency.
2014-01-20 17:28:42 -08:00
Chris Rebert
8a1f4426a2
Merge pull request #12317 from twbs/grunt-task-license
...
clarify Grunt task licensing
2014-01-20 16:58:11 -08:00
Chris Rebert
6b8d4e9c76
clarify Grunt task licensing
2014-01-20 16:56:24 -08:00
Chris Rebert
5cc3c62e30
slap a lang attr on <html> in the Getting Started basic template
...
for consistency with docs/examples/starter-template/index.html
2014-01-20 16:53:31 -08:00
Chris Rebert
50000b5930
nitpick phrasing
2014-01-20 15:05:25 -08:00
Chris Rebert
f4a916d351
upgrade #callout-navbar-overflow from info to warning
2014-01-20 15:02:48 -08:00
Julian Thilo
4ec861316f
fix markup typo, duh
2014-01-21 00:00:52 +01:00
Julian Thilo
4552bcf66f
fix #12311
2014-01-20 23:51:13 +01:00
Julian Thilo
4a36ecaac6
fix #12314
2014-01-20 23:36:52 +01:00
Chris Rebert
14baf4ef27
Merge pull request #12303 from twbs/doc-s3
...
document S3 cache more fully
2014-01-20 13:56:58 -08:00
Chris Rebert
ece15cb010
Merge pull request #12307 from twbs/bye-site-baseurl
...
docs: use relative URLs instead of site.baseurl
2014-01-20 13:55:07 -08:00
nkav
4380ca4348
Corrected tag for Alert JS animation example from <a> to <button>
...
Also removed href attribute and added type="button"
2014-01-20 13:46:41 -08:00
XhmikosR
9818ad532e
Update grunt-contrib-uglify dependency.
2014-01-20 09:37:02 +02:00
Chris Rebert
79487ba499
fix #12298
2014-01-19 23:07:32 -08:00
Chris Rebert
f59573db0d
docs: use relative URLs instead of site.baseurl
2014-01-19 22:50:09 -08:00
Chris Rebert
4120aadd68
Merge pull request #12306 from twbs/raw-files.min.js
...
rename raw-files.js to raw-files.min.js
2014-01-19 22:36:08 -08:00
Chris Rebert
336f5f1dce
rename raw-files.js to raw-files.min.js
...
it's not /technically/ minified, but close enough
it's autogenerated, not terribly human-readable, and not meant to be directly modified
2014-01-19 22:29:51 -08:00
Chris Rebert
06a7bdd0b0
grunt build-raw-files dist
2014-01-19 22:27:01 -08:00
Chris Rebert
adda5d55c6
Merge pull request #12304 from Quy/master
...
Replace page.base_url with relative url
2014-01-19 22:21:29 -08:00
Quy Ton
0d153fa643
Replace page.base_url with relative url
2014-01-19 21:03:17 -08:00
Chris Rebert
6f1236f81a
document S3 cache more fully; fixes #12289
2014-01-19 18:48:35 -08:00
Chris Rebert
0349fe0f0b
Merge pull request #12295 from ZDroid/types
...
Improve grunt config and vars
2014-01-19 15:43:52 -08:00
Chris Rebert
937e067a27
grunt build-customizer-vars-form
2014-01-19 15:28:30 -08:00
Chris Rebert
04cfca25af
s3_cache.py: fix name in USAGE message
2014-01-19 15:12:09 -08:00
Zlatan Vasović
956064ec56
Improve grunt config and vars
2014-01-19 22:41:01 +01:00
Julian Thilo
a77fba3c37
Merge pull request #12302 from Quy/master
...
More "LESS" to "Less" changes
2014-01-19 13:35:06 -08:00
Quy Ton
3e9ba3f671
More "LESS" to "Less" changes
2014-01-19 13:27:51 -08:00
Mark Otto
e71a85a525
remove confusing comment
2014-01-19 10:23:00 -08:00
Julian Thilo
2a75e559f6
Merge pull request #12297 from Quy/master
...
Additional changes to #12275 and #12292
2014-01-19 08:15:10 -08:00
Quy Ton
f2d37ccc23
Additional changes to #12275 and #12292
2014-01-19 07:41:14 -08:00
Julian Thilo
0dc26b2e07
Make head elements order uniform across templates and examples
2014-01-19 15:59:21 +01:00
Julian Thilo
4f1852d5c2
Merge pull request #12292 from ZDroid/meta
...
Improve <meta> tags
2014-01-19 06:54:34 -08:00
Zlatan Vasović
cf8f1ec0cd
Improve <meta> tags
2014-01-19 13:27:17 +01:00
Mark Otto
9c97c5a729
expo callout copy
2014-01-19 09:17:00 +02:00
Mark Otto
7e145a13c8
Merge pull request #12288 from twbs/x-ua-compat
...
add X-UA-Compatible <meta> to basic template
2014-01-18 20:45:45 -08:00
Chris Rebert
60298dd623
add X-UA-Compatible <meta> to basic template
2014-01-18 18:39:46 -08:00
Chris Rebert
b67cba2b4d
make WP8 device-width hack code fully consistent between docs HTML & docs JS
2014-01-18 18:35:47 -08:00
Chris Rebert
20772462df
grammar: fix plural possessive
2014-01-18 17:17:53 -08:00
Chris Rebert
0be0090983
fix anomalous indentation
2014-01-18 17:13:16 -08:00
Julian Thilo
3a1aa33860
Dustin' the docs: Typos, Grammar, etc. in css.html
2014-01-19 01:47:12 +01:00
westurner
a73dacf4a0
Added WAI-ARIA roles to examples/theme/index.html (document, main)
...
https://en.wikipedia.org/wiki/WAI-ARIA
http://www.w3.org/TR/wai-aria/roles
2014-01-18 16:32:14 -08:00
Mark Otto
2179f9d68a
Merge pull request #12287 from Quy/master
...
Add table's .info variant to migration guide
2014-01-18 16:21:39 -08:00
Quy Ton
9e8afcc661
Add table's .info variant to migration guide
2014-01-18 16:08:39 -08:00
Mark Otto
e5d6ab9b31
link to docs license
2014-01-18 14:50:45 -08:00
Mark Otto
b790ea9011
Merge pull request #12219 from ZDroid/rn
...
Rename docs/LICENSE-DOCS to docs/LICENSE
2014-01-18 14:49:00 -08:00
Mark Otto
032869a439
Merge pull request #12248 from twbs/bg-variant
...
refactoring: add & use .bg-variant() mixin
2014-01-18 14:47:29 -08:00
Julian Thilo
10a158ff93
Fix typos, sentences in getting-started.html
2014-01-18 23:46:32 +01:00
Mark Otto
2115ac525b
Run grunt dist after adding 'a' requirement to the text emphasis classes
2014-01-18 14:40:48 -08:00
Mark Otto
3b6ab5075e
Merge branch 'master' into bg-variant
...
Conflicts:
less/mixins.less
2014-01-18 14:40:17 -08:00
Mark Otto
572e6a959a
Merge pull request #12286 from watilde/fixes-panel
...
Fixes #12263 : Remove border radius when it's not both ends in panel
2014-01-18 14:29:11 -08:00
Mark Otto
b32d92ef71
Merge pull request #12249 from twbs/modal-md
...
add & use @modal-md Less var for uniformity
2014-01-18 14:28:45 -08:00
Mark Otto
9c9a2f3e08
Merge pull request #12247 from twbs/text-emphasis-variant
...
refactoring: add & use .text-emphasis-variant() mixin
2014-01-18 14:28:33 -08:00
Mark Otto
cfe38a4241
Merge branch 'master' into modal-md
2014-01-18 14:12:04 -08:00
Mark Otto
cd1bea0616
Merge branch 'master' into bg-variant
2014-01-18 14:11:55 -08:00
Mark Otto
689e75e4b1
Merge branch 'master' into text-emphasis-variant
2014-01-18 14:11:36 -08:00
Mark Otto
b1721f42cc
Merge branch 'master' of github.com:twbs/bootstrap
2014-01-18 14:09:17 -08:00
Mark Otto
c322612218
move migration docs to new separate page, leave callout on getting started page; fixes #12244
2014-01-18 14:09:09 -08:00
Julian Thilo
67594cb544
Fix holder.js links in examples
...
Replaces links to holder.js with links to the new docs.min.js.
The uncompressed holder.js file is now in docs/assets/js/vendor,
which is excluded from Jekyll builds. In turn, Holder is now
included in docs.min.js, which is smaller than holder.js,
so this should make everybody happy. :)
2014-01-18 22:58:05 +01:00
Daijiro Wachi
6856c9f7f6
remove border radius when it's not both ends in panel
2014-01-19 06:43:57 +09:00
Mark Otto
a521e982d5
Merge pull request #12281 from XhmikosR/vendor
...
Move docs third-party libraries to a separate folder.
2014-01-18 11:42:34 -08:00
Mark Otto
7b42103df6
kill bottom margin on last docs section
2014-01-18 11:33:50 -08:00
Julian Thilo
a56cf753ce
Make spelling of Less uniform throughout the docs
2014-01-18 18:40:47 +01:00
Julian Thilo
092b1a47ef
Fix typo in index.html
2014-01-18 18:15:37 +01:00
XhmikosR
4bca3c79b3
Move docs third-party libraries to a separate folder.
2014-01-18 08:15:21 +02:00
Mark Otto
dcdf716eef
copy
2014-01-17 19:04:14 -08:00
Chris Rebert
172de467eb
present browser compatibility info in a table
2014-01-17 17:12:52 -08:00
Chris Rebert
d8c87ddc28
fix #12277
...
Thanks to @Quy for pointing these out.
2014-01-17 14:28:01 -08:00
Tobias Lindig
084f0fb113
add namespace .bs also to the event dismiss.modal
2014-01-17 12:16:53 -08:00
Chris Rebert
d6e8006ea6
Merge pull request #12276 from twbs/grunt-contrib-qunit
...
bump grunt-contrib-qunit to v0.4.0
2014-01-17 12:06:12 -08:00
Chris Rebert
58c4a8c0f1
bump grunt-contrib-qunit to v0.4.0
2014-01-17 11:56:53 -08:00
Chris Rebert
ffdc18cbbf
fix #12274
2014-01-17 11:52:35 -08:00
Chris Rebert
c5bed1a850
Merge pull request #12275 from ZDroid/ncss
...
Replace Normalize with Normalize.css
2014-01-17 11:43:18 -08:00
Zlatan Vasović
93ab926dc7
Replace Normalize with Normalize.css
2014-01-17 20:22:32 +01:00
Julian Thilo
af5cebf76b
Merge pull request #12271 from tlindig/modal_remove_needless_space
...
remove needless space character
2014-01-17 06:29:12 -08:00
Tobias Lindig
7fab3c30f2
remove needless space character
2014-01-17 13:34:03 +01:00
Chris Rebert
6af0013ac5
Revert "Add tooltip viewport option, respect bounds of the viewport"
...
This reverts commit edb221a20c .
Reverting due to broken JS unit tests.
Conflicts:
docs/javascript.html
2014-01-16 20:32:59 -08:00
Chris Rebert
faa783e989
Merge pull request #12267 from twbs/ie-10
...
enable IE10 for Sauce tests
2014-01-16 20:07:43 -08:00
Mark Otto
03f4534307
Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benogle-bo-tooltip-viewport
...
Conflicts:
docs/javascript.html
2014-01-16 20:01:28 -08:00
Mark Otto
8eef0a47ee
Merge branch 'master' of github.com:twbs/bootstrap
2014-01-16 20:00:36 -08:00
Mark Otto
380019ccb2
Split box-sizing reset for faster rendering
2014-01-16 20:00:28 -08:00
Chris Rebert
ee396aeb8e
enable IE10 for Sauce tests
2014-01-16 19:53:02 -08:00
Chris Rebert
bd8ef99028
temporarily disable OS X Chrome Sauce test since it's being flaky
...
e.g.:
Tested http://127.0.0.1:3000/js/tests/index.html
Environment: OS X 10.9::chrome
>> Timeout, waited for more than 300000 milliseconds
2014-01-16 19:52:24 -08:00
Chris Rebert
600f62dc78
Merge pull request #12265 from twbs/ie-11
...
enable IE11 in Sauce tests
2014-01-16 17:00:46 -08:00
Chris Rebert
ecf8148c3f
Merge pull request #12264 from twbs/mavericks-safari-7
...
upgrade to Safari 7 in Sauce tests
2014-01-16 16:10:50 -08:00
Chris Rebert
4a50ac0bdd
enable IE11 in Sauce tests
2014-01-16 15:35:08 -08:00
Chris Rebert
60fb8b76f9
Merge pull request #12262 from twbs/osx-firefox
...
re-enable OS X Firefox in Sauce tests
2014-01-16 15:25:50 -08:00
Mark Otto
d07e8fece4
grunt
2014-01-16 15:03:34 -08:00
Chris Rebert
ded7008e40
upgrade to Safari 7 in Sauce tests
2014-01-16 14:51:41 -08:00
Chris Rebert
1ca0f8dbc0
re-enable OS X Firefox in Sauce tests
2014-01-16 14:47:11 -08:00
fat
4bd6a52562
add missing paren
2014-01-16 14:28:21 -08:00
fat
82ff4e2e40
tooltip subpixel test fixes
2014-01-16 14:25:28 -08:00
fat
3b2418e688
remove flaky pos bottom test which is effect by unit scroll pos
2014-01-16 13:44:08 -08:00
fat
2f76821a4d
new qunit
2014-01-16 13:33:09 -08:00
Chris Rebert
bc074d5488
Merge pull request #12260 from patricker/patch-1
...
Update javascript.html to fix Tabs example
2014-01-16 10:55:22 -08:00
patricker
47f786e6ea
Update javascript.html
...
Fixed issue in Tabs example where the div had been marked as 'active' but the li had not been. The correct tab of data would be displayed on load, but no tabs would be highlighted. The tabs with fade example does not have this issue. jsFiddle: http://jsfiddle.net/uXV56/
2014-01-16 11:41:34 -07:00
Chris Rebert
190ae7bb31
Merge pull request #12258 from ibash/master
...
Fixing js error in IE9 where no transition is supported
2014-01-16 10:18:52 -08:00
Islam Sharabash
ad64b0acc8
Fixing js error in IE9 where no transition is supported
2014-01-16 10:11:59 -08:00
Chris Rebert
81610c6048
Merge pull request #12252 from browserstack/browserstack-runner
...
Browserstack runner tunnel timeout
2014-01-15 23:14:13 -08:00
Rahul Nawani
2bdf99fcc1
add debug for browserstack-runner
2014-01-16 11:56:08 +05:30
Rahul Nawani
a8e14bf1f8
update browserstack-runner package
2014-01-16 11:55:44 +05:30
Mark Otto
96a9e1bae0
Merge pull request #12245 from twbs/footer-links
...
add Issues & Releases links back to footer
2014-01-15 20:14:37 -08:00
Chris Rebert
b2e88d1359
add & use @modal-md Less var for uniformity
2014-01-15 18:53:22 -08:00
Chris Rebert
b121207e10
refactoring: add & use .bg-variant() mixin
2014-01-15 18:21:56 -08:00
Chris Rebert
b886fd2f01
refactoring: add & use .text-emphasis-variant() mixin
2014-01-15 18:07:22 -08:00
Chris Rebert
47ff60426d
add Issues & Releases links back to footer
2014-01-15 17:29:54 -08:00
Chris Rebert
0ef8d1bad4
reassert #12231 & #12232 (merge went badly?)
2014-01-15 17:24:57 -08:00
Mark Otto
78e81a1de9
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
docs/assets/css/pack.min.css
2014-01-15 16:25:29 -08:00
Mark Otto
7e7264e224
fix ad placement
2014-01-15 16:25:04 -08:00
Julian Thilo
95f24dca9a
Fix customizer's toggle buttons' margin
2014-01-16 01:19:00 +01:00
Julian Thilo
5ac8dca8ad
Adapt about.html lead to latest changes
2014-01-16 01:08:00 +01:00
Julian Thilo
fa052c9659
Fix footer links
2014-01-16 00:58:13 +01:00
Chris Rebert
47bbc30b2c
increase Sauce concurrency
...
Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-32309827
Thanks @admc & @saucelabs !
2014-01-15 15:55:47 -08:00
Mark Otto
fcb78bcef7
Merge pull request #12243 from twbs/cleanup-about
...
move Community & Translations docs sections from About to Getting Started
2014-01-15 15:54:35 -08:00
Chris Rebert
53bcb829bb
move Community & Translations docs sections from About to Getting Started
2014-01-15 15:34:10 -08:00
Mark Otto
9bd5979013
Merge pull request #12242 from twbs/sass-contributing
...
add link to Sass CONTRIBUTING file in the About page
2014-01-15 15:27:07 -08:00
Julian Thilo
4c9433d13d
Adhere to MailChimp's brand guidelines ;)
2014-01-16 00:22:05 +01:00
Julian Thilo
bb964b131c
Remove popovers from components.html lead
...
because they're only really featured on javascript.html
Replacement: input groups
2014-01-16 00:17:04 +01:00
Chris Rebert
a624981ef3
add link to Sass CONTRIBUTING file in the About page
2014-01-15 15:04:38 -08:00
Chris Rebert
9039a5e90b
remove inaccurate comment
2014-01-15 15:04:08 -08:00
Mark Otto
0335b8df52
Merge branch 'master' of github.com:twbs/bootstrap
2014-01-15 15:01:50 -08:00
Mark Otto
6986bdb2a7
Fix page headers
2014-01-15 15:01:41 -08:00
Chris Rebert
91c6419d09
Getting Started: fix ID of heading so matches TOC
2014-01-15 14:26:29 -08:00
Chris Rebert
8dc1d00dd4
add a couple commas
2014-01-15 13:44:23 -08:00
Chris Rebert
208df78971
Merge pull request #12241 from twbs/jekyll-encoding
...
Set Jekyll encoding and tweak Windows notes
2014-01-15 13:43:12 -08:00
Mark Otto
14975e4ee9
indentation and page header changes
2014-01-15 13:24:34 -08:00
Julian Thilo
00239f6034
Set Jekyll encoding and tweak Windows notes
2014-01-15 22:18:35 +01:00
Mark Otto
a633fc042d
Merge branch 'master' into docs_derp
...
Conflicts:
docs/components.html
docs/css.html
2014-01-15 13:08:35 -08:00
Mark Otto
1facbf6e7a
Merge pull request #12232 from twbs/mixing-docs
...
clarify docs regarding non-mixable components
2014-01-14 21:47:24 -08:00
Mark Otto
96031c101d
Merge pull request #12231 from twbs/callouts
...
callout severity tweaks
2014-01-14 21:46:46 -08:00
Mark Otto
b93ce03f19
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
docs/assets/js/customize.min.js
2014-01-14 21:45:10 -08:00
Mark Otto
413c8a6da5
Fixes #12210 : badges in xs buttons
2014-01-14 21:44:38 -08:00
Chris Rebert
9ebd8d39a9
clarify docs regarding non-mixable components
2014-01-14 21:26:19 -08:00
Chris Rebert
488443c9ad
downgrade .img-responsive cross-reference callout from warning to info
2014-01-14 21:03:49 -08:00
Chris Rebert
76e226b136
upgrade form-group + input-group callout from info to warning
2014-01-14 21:02:56 -08:00
Chris Rebert
811639c452
downgrade <label>-related callouts from danger to warning
2014-01-14 21:02:06 -08:00
Chris Rebert
2ba15c3750
upgrade tooltip/popover-in-groups callout from info to warning
2014-01-14 21:01:09 -08:00
Chris Rebert
5ead87d519
revert unnecessary customizations of Blob.js & FileSaver.js
...
Per https://github.com/eligrey/Blob.js/pull/20
& https://github.com/eligrey/FileSaver.js/pull/63
The library author has deemed the existing /*! @source URL */ comments to be
sufficient attribution, and these already survive minification.
Refs ea591748ed
2014-01-14 20:46:25 -08:00
Chris Rebert
e2a18430f9
Merge pull request #12213 from twbs/browserstack
...
tests: run BrowserStack in parallel with Sauce Labs
2014-01-14 20:44:47 -08:00
Chris Rebert
c1a81f7bde
Merge pull request #12229 from twbs/richer-results
...
more detailed QUnit test results in Sauce
2014-01-14 20:21:54 -08:00
Chris Rebert
b260d93c58
more detailed QUnit test results in Sauce
2014-01-14 20:21:15 -08:00
Ben Ogle
edb221a20c
Add tooltip viewport option, respect bounds of the viewport
2014-01-14 17:42:29 -08:00
Mark Otto
cae63200d8
Merge branch 'master' into docs_derp
...
Conflicts:
docs/_includes/old-bs-docs.html
2014-01-14 15:53:06 -08:00
Mark Otto
edd0b97be5
Don't copy-pasta all the Sass docs because fuck keeping that up to date. Instead, point to https://github.com/twbs/bootstrap-sass/blob/master/README.md .
2014-01-14 15:52:40 -08:00
Chris Rebert
8fb75ee9e7
add missing semicolon
2014-01-14 14:25:25 -08:00
Chris Rebert
3a97697456
tests: run BrowserStack in parallel with Sauce Labs
...
Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-31922999
and internal twbs team discussion.
Effectively reverts the deletions from #11701 .
2014-01-14 14:13:52 -08:00
Chris Rebert
2a6b6f8537
Merge pull request #12224 from twbs/raw-files-banner
...
add copyright notice to raw-files.js
2014-01-14 13:28:50 -08:00
Chris Rebert
46b0874ef5
add copyright notice to raw-files.js
2014-01-14 13:27:50 -08:00
Julian Thilo
027af6deb4
Merge pull request #12220 from ZDroid/link
...
Link the blog post instead of main blog page
2014-01-14 06:03:35 -08:00
Zlatan Vasović
c11f78d7eb
Link the blog post instead of main blog page
2014-01-14 14:40:27 +01:00
Chris Rebert
d1fd917b7a
Merge pull request #12218 from ZDroid/docs.js
...
Rename uglify.js to uglify.min.js for consistency
2014-01-14 04:49:58 -08:00
Zlatan Vasović
4f58356e91
Rename docs/LICENSE-DOCS to docs/LICENSE
...
It sounded weird.
2014-01-14 13:47:18 +01:00
Zlatan Vasović
c335104957
Rename uglify.js to uglify.min.js for consistency
2014-01-14 13:41:21 +01:00
Mark Otto
c4b41ceae3
header masthead changes
2014-01-13 22:59:09 -08:00
Mark Otto
b776749507
make page headers like masthead
2014-01-13 22:54:22 -08:00
Mark Otto
eca81939cc
Merge branch 'master' into docs_derp
...
Conflicts:
docs/assets/css/pack.min.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
2014-01-13 22:43:18 -08:00
Mark Otto
8c0cb806c6
Merge pull request #12215 from twbs/attribution-comments
...
sort out attribution banners of docs assets
2014-01-13 22:38:47 -08:00
Chris Rebert
ea591748ed
sort out attribution banners of docs assets; fixes #11976
2014-01-13 21:58:27 -08:00
Chris Rebert
aff64cffce
avoid redundant banner in minified docs CSS
2014-01-13 21:31:40 -08:00
Chris Rebert
2d038186e3
add a title/description to customizer.js's attribution comment
2014-01-13 21:08:04 -08:00
Chris Rebert
df70e8d845
Merge pull request #12214 from twbs/slightly-newer-qunit
...
upgrade to QUnit v1.0.0
2014-01-13 19:28:23 -08:00
Chris Rebert
dde38280f7
upgrade to QUnit v1.0.0
2014-01-13 19:21:07 -08:00
Chris Rebert
bfe74f7b2f
Revert accidental overzealousness from 16eccc43d9
...
Let's not confuse the archaeologists & historians.
2014-01-13 19:09:51 -08:00
Chris Rebert
b9216a292c
update to Holder.js 5b79144fa
2014-01-13 17:50:17 -08:00
Chris Rebert
685fe722c2
preserve third-party attribution comments when minifying docs JS
2014-01-13 17:00:26 -08:00
Chris Rebert
d62d7b0733
document subheading syntax
2014-01-13 02:37:55 -08:00
Mark Otto
b17dca240e
Merge branch 'master' into docs_derp
...
Conflicts:
docs/assets/js/docs.min.js
2014-01-12 16:10:57 -08:00
Chris Rebert
80bed836e0
grunt dist build-customizer
2014-01-12 14:53:21 -08:00
XhmikosR
f972331a10
update to FileSaver.js version 2013-12-27 / 0055d054ac
...
Refs #12196
2014-01-12 14:47:54 -08:00
Chris Rebert
4b5e73b842
add Blob.js separate from filesaver.js
...
Blob.js version 2013-12-27 / 0055d054acbca43eff44fc25c891055440685d9c
Refs #12196
2014-01-12 14:41:30 -08:00
XhmikosR
ef22ab5aed
update less.js to v1.6.1 & use accurate filename; refs #12196
2014-01-12 14:32:58 -08:00
XhmikosR
77ff3871fd
update holder.js to v2.3; refs #12196
2014-01-12 14:23:41 -08:00
Mark Otto
4b1ff7fa49
Formatting and docs changes
2014-01-12 00:04:24 -08:00
Mark Otto
36aa3afb4f
Improve spacing and alignment of sections and their headings
2014-01-11 23:15:37 -08:00
Mark Otto
613a95d838
brand guidelines cleanup
2014-01-11 19:42:10 -08:00
Mark Otto
79c18da452
homepage improvements
2014-01-11 19:35:40 -08:00
Mark Otto
bacfd65cb2
Merge branch 'master' into docs_derp
...
Conflicts:
docs/getting-started.html
2014-01-11 19:13:10 -08:00
Chris Rebert
80c9c14ab9
rm lingering reference to Recess in the docs
...
Refs c0200426ee
2014-01-11 17:15:08 -08:00
Mark Otto
e2908975ad
Merge branch 'master' of github.com:twbs/bootstrap
2014-01-11 14:49:03 -08:00
Mark Otto
1127cd6287
grunt dist
2014-01-11 14:48:47 -08:00
Mark Otto
e68d3b961e
Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets
...
Conflicts:
package.json
2014-01-11 14:48:04 -08:00
Mark Otto
8e41961f9e
Merge pull request #12193 from ZDroid/migration
...
Update docs per `.container-fluid` addition
2014-01-11 13:08:24 -08:00
Zlatan Vasović
62fe50df73
Update docs per .container-fluid addition
...
- Remove `.container-fluid` from "removed classes".
- Container isn't fluid by default (`.container`) and `.row` isn't percentage-based, so update docs.
2014-01-11 22:04:33 +01:00
Mark Otto
7a2c352b50
Don't test Linux browsers since we don't support them officially and they're failing our tests
2014-01-10 19:04:11 -08:00
Mark Otto
8a04ed44a1
Merge branch 'master' of github.com:twbs/bootstrap
2014-01-10 18:57:01 -08:00
Mark Otto
3a8e99e91e
Fixes #12171 : Ensure panel groups have a bottom margin since we nuke it on child panels
2014-01-10 18:56:44 -08:00
Chris Rebert
b192d29981
refer to correct component
2014-01-10 18:56:39 -08:00
Mark Otto
17f2ef46aa
docs mention for #12188
2014-01-10 18:47:51 -08:00
Chris Rebert
e8cabf332a
use height adjectives for greater clarity
2014-01-10 15:33:04 -08:00
Chris Rebert
46f5bbcf33
document #11675
2014-01-10 14:41:23 -08:00
Chris Rebert
c6a5e6accb
rm outdated <select> references from comments in forms.less
2014-01-10 14:34:25 -08:00
Mark Otto
831bbb8b45
Clarify that the focus docs styles are not in the repo, per https://github.com/twbs/bootstrap-sass/issues/497
2014-01-09 21:21:51 -08:00
Mark Otto
ea20f44815
Merge branch 'master' into docs_derp
...
Conflicts:
docs/assets/css/docs.css
2014-01-09 20:33:55 -08:00
Mark Otto
7f153974e1
Fixes #11990 and #12159 : Make range inputs block level and 100% wide by default
2014-01-09 18:07:14 -08:00
Mark Otto
99b66c1f2c
grunt dist
2014-01-09 18:06:46 -08:00
Mark Otto
04161a8c75
more derp
2014-01-09 18:05:04 -08:00
Mark Otto
1c66664bed
Merge pull request #12175 from waynn/patch-3
...
use periods for consistency in each line
2014-01-09 14:28:27 -08:00
Chris Rebert
82eccef7e3
mixins.less: fix typo in comment
2014-01-09 13:45:10 -08:00
Waynn Lue
cba9d81340
use periods for consistency in each line
2014-01-09 12:22:31 -08:00
Chris Rebert
6645e5daad
Merge pull request #12174 from ZDroid/absolute-urls
...
Use absolute instead of relative URLs
2014-01-09 11:54:56 -08:00
Zlatan Vasović
8c85e1b5a3
Use absolute instead of relative URLs
2014-01-09 20:33:13 +01:00
Chris Rebert
fc62379e61
grunt dist
2014-01-09 11:11:13 -08:00
Chris Rebert
1276503754
Merge pull request #12164 from thomaswelton/issue-12162
...
Fix value of svg font ID & removed hard coding
2014-01-09 11:07:42 -08:00
Chris Rebert
1fc68c3560
Merge pull request #12163 from ZDroid/wrong-paths
...
Update paths in bower.json
2014-01-09 09:59:30 -08:00
Chris Rebert
4896141121
Merge pull request #12160 from waynn/patch-2
...
missing a period after "Twitter, Inc"
2014-01-09 09:56:07 -08:00
Zlatan Vasović
431c544fbc
Update paths in bower.json
...
- Replace `*.html`, `docs/assets` and `examples` with `docs` (new directory)
- Instead of `_*`, it's just `_config.yml`, without regex (speeds up bower download a few milliseconds)
2014-01-09 11:20:23 +01:00
thomaswelton
04ba67d6f1
Add new varaible @icon-font-svg-id and set it to be the correct SVG font ID, used new variable in glyphicons.less
2014-01-09 10:16:27 +00:00
Waynn Lue
f116106bf6
missing a period after "Twitter, Inc"
2014-01-09 00:11:01 -08:00
Chris Rebert
7ba6daabfe
bump grunt-contrib-jade to v0.9.1
2014-01-08 21:15:37 -08:00
Chris Rebert
29547a2102
JSHint is on crack?
...
Linting docs/grunt/bs-raw-files-generator.js ...ERROR
[L3:C5] W079: Redefinition of 'btoa'.
var btoa = require('btoa')
2014-01-08 18:45:40 -08:00
Chris Rebert
8a10bd5231
grunt build-customizer
2014-01-08 18:39:45 -08:00
Chris Rebert
72ff8ff9fb
grunt dist
2014-01-08 18:39:08 -08:00
Chris Rebert
9443044606
Merge pull request #11158 from twbs/templated-customizer
...
Autogenerate the customizer's variables form
2014-01-08 18:36:32 -08:00
Chris Rebert
db829f8620
add support for '//===' for <h3>s in bs-lessdoc
2014-01-08 12:41:51 -08:00
Chris Rebert
39861714a8
Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095
...
also updates variables file organization (courtesy @mdo)
2014-01-08 12:41:51 -08:00
Chris Rebert
c9ba678b9f
JSCS can be dumb sometimes
2014-01-08 12:37:10 -08:00
Chris Rebert
1736bcb05c
Merge pull request #12150 from twbs/extract-from-gruntfile
...
cleanup Gruntfile by extracting executable code
2014-01-08 11:01:03 -08:00
Julian Thilo
24c16d9904
Merge pull request #12155 from Dudytz/master
...
updated path docs-assets to docs/assets
2014-01-08 08:20:18 -08:00
Eduardo
9f0afd57f0
updated path docs-assets to docs/assets
2014-01-08 16:43:56 +01:00
XhmikosR
d06d61dc12
Use single quotes in the jqueryCheck too.
2014-01-08 13:41:17 +02:00
XhmikosR
d7bf9372ec
Remove extra newline from banner.
2014-01-08 13:41:17 +02:00
XhmikosR
016d573a80
Use the docs banner for all the docs generated files.
2014-01-08 13:41:17 +02:00
XhmikosR
9b71314fd8
Turn advanced optimizations off until it's fixed in clean-css.
2014-01-08 13:41:17 +02:00
XhmikosR
f00bbdd994
Minify docs CSS too.
2014-01-08 13:41:17 +02:00
XhmikosR
ebf7807985
docs-assets: concatenate and minify all javascript files.
2014-01-08 13:41:16 +02:00
Mark Otto
692eb554aa
Merge pull request #12151 from wangsai/no-preboot
...
no preboot
2014-01-08 00:52:51 -08:00
wangsai
7e16425acb
no preboot
2014-01-08 16:22:50 +08:00
Chris Rebert
d7a128c636
extract glyphicons.yml generator out of Gruntfile into separate module
2014-01-07 22:34:09 -08:00
Chris Rebert
d1c29af591
extract raw-files.js generator out of Gruntfile into separate module
2014-01-07 22:16:52 -08:00
Chris Rebert
b67fc6906a
Merge pull request #12149 from twbs/bump-grunt-contrib-less
...
bump grunt-contrib-less to v0.9.0
2014-01-07 20:05:09 -08:00
Chris Rebert
9ae5d321b5
bump grunt-contrib-less to v0.9.0
2014-01-07 19:50:58 -08:00
Chris Rebert
a712abd06e
enable CSSLint in test suite; fixes #12094
2014-01-07 19:34:49 -08:00
Chris Rebert
c891be5e5f
adjust filename to indicate that customize JS is minified
2014-01-07 19:10:31 -08:00
Chris Rebert
ef7bf0abf8
grunt dist build-customizer
2014-01-07 19:05:29 -08:00
Chris Rebert
c635d8f547
have customizer output Bootstrap Theme too; fixes #12003
2014-01-07 18:57:15 -08:00
Chris Rebert
07309edce5
make customizer compilation code more generic
2014-01-07 18:55:13 -08:00
Chris Rebert
bf5017c01c
fix #12143
2014-01-07 17:08:40 -08:00
Chris Rebert
9eab6ffd1c
Merge pull request #12147 from ZDroid/double
...
Drop redundant 'the'
2014-01-07 14:02:45 -08:00
Zlatan Vasović
ec594887fe
Drop redundant 'the'
2014-01-07 22:40:23 +01:00
Julian Thilo
8fd177bfa7
Fix #12073 : Consistent order of variations
...
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
2014-01-07 22:24:45 +01:00
Chris Rebert
5f328dce88
Merge pull request #12057 from ZDroid/nl
...
'use strict' on new line
2014-01-07 00:31:27 -08:00
Chris Rebert
5e39e6c9d0
Merge pull request #12135 from leoj3n/patch-2
...
Improve wording in CONTRIBUTING.md
2014-01-07 00:27:54 -08:00
Joel Kuzmarski
3661c4b8ff
Improve wording in CONTRIBUTING.md
...
Parts of the "Pull requests" section are strangely worded.
This commit fixes that.
2014-01-07 02:11:07 -06:00
Chris Rebert
0a09dd46cb
Merge pull request #12133 from leoj3n/patch-1
...
Fix bad anchor link in CONTRIBUTING.md
2014-01-06 23:55:17 -08:00
Joel Kuzmarski
483974695c
Fix bad anchor link in CONTRIBUTING.md
...
Hey look, I'm contributing to CONTRIBUTING.md!
This anchor must have been overlooked while updating the docs in a previous commit. Expected behavior: scroll the document to a linked section. Experienced behavior: nada.
This proposed file change renames the anchor text from `coding conventions` to `coding guidelines` and changes the anchor link from `#code-conventions` to `#code-guidelines`.
2014-01-07 01:45:33 -06:00
Julian Thilo
158a2394a2
Merge branch 'master' of https://github.com/twbs/bootstrap
2014-01-07 01:30:16 +01:00
Julian Thilo
8d903fbd02
duh, missed one more file
...
X-Ref: https://github.com/twbs/bootstrap/commit/7fcfe61f4da41356b2ae974ad20536db0d74e83f
2014-01-07 01:27:49 +01:00
Julian Thilo
c42b6a3f8b
missed a file
...
X-Ref: https://github.com/twbs/bootstrap/commit/7fcfe61f4da41356b2ae974ad20536db0d74e83f
2014-01-07 01:22:13 +01:00
Julian Thilo
7fcfe61f4d
Update copyright notices in all places
...
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
2014-01-07 01:05:24 +01:00
Mark Otto
f389111e68
justify text
2014-01-06 09:26:08 -08:00
Mark Otto
99338caed0
Merge pull request #12125 from juniorconte/input-block-level
...
notes from .input-block-level
2014-01-06 09:14:44 -08:00
juniorconte
7722ab5566
notes from .input-block-level
2014-01-06 11:41:15 -02:00
Chris Rebert
aed56fc0a6
New Year
2014-01-05 23:45:15 -08:00
Chris Rebert
bbe5041cbf
Merge pull request #12116 from twbs/pacify-csslint
...
make CSSLint happier
2014-01-05 23:44:17 -08:00
Mark Otto
a5e29a8f34
link
2014-01-05 23:43:13 -08:00
Mark Otto
745bec59cf
Move homepage examples to data file
2014-01-05 23:37:14 -08:00
Mark Otto
9421f0af82
Merge branch 'master' into docs_derp
...
Conflicts:
docs/_layouts/default.html
docs/_layouts/home.html
2014-01-05 23:23:55 -08:00
Mark Otto
5b7f508c60
Merge pull request #12107 from twbs/same-footer-links
...
harmonize footer links on homepage & docs pages
2014-01-05 23:21:11 -08:00
Mark Otto
3e54be9ae6
Merge branch 'master' into docs_derp
...
Conflicts:
docs/components.html
2014-01-05 23:19:34 -08:00
Chris Rebert
422bdc50f9
Merge pull request #12118 from wangsai/fix-out-container
...
fix the paragraph outside of '.bs-docs-section'
2014-01-05 22:54:01 -08:00
wangsai
ed8ef84597
fix the paragraph outside of '.bs-docs-section'
2014-01-06 14:39:09 +08:00
Chris Rebert
9fa2c95d78
make CSSLint happier; refs #12094
2014-01-05 21:29:26 -08:00
Mark Otto
0593a20638
grammarghhhhhhhhhhhh
2014-01-05 20:54:31 -08:00
Mark Otto
12dacee313
copy
2014-01-05 20:53:40 -08:00
Chris Rebert
938bc12c58
add /docs/assets JS to JSCS Grunt task config
2014-01-05 20:52:37 -08:00
Mark Otto
34566f4934
Merge pull request #12115 from Quy/master
...
Delete reference to a non-existent class
2014-01-05 20:16:17 -08:00
Quy Ton
c613143638
Delete reference to a non-existent class
2014-01-05 20:08:37 -08:00
Chris Rebert
7653b845f8
Merge pull request #12082 from kevinsawicki/use-dollar-instead-of-jquery
...
Use $ instead of jQuery
2014-01-05 18:06:55 -08:00
Mark Otto
78e6036c68
Merge branch 'master' into docs_derp
2014-01-05 17:50:07 -08:00
Mark Otto
ed5c7baaf1
Merge branch 'master' into docs_derp
2014-01-05 17:49:40 -08:00
Mark Otto
990303ab54
Merge pull request #12110 from twbs/one-control-per-input-group
...
document single .form-control per .input-group limitation
2014-01-05 15:57:33 -08:00
Chris Rebert
6684005f63
document single .form-control per .input-group limitation; fixes #12109
2014-01-05 14:44:48 -08:00
Chris Rebert
5fc434c5f1
harmonize footer links on homepage & docs pages
2014-01-05 13:45:56 -08:00
Mark Otto
1d0bf580c9
Use mix of medium and small grid clases on dashboard example
2014-01-05 13:26:15 -08:00
Mark Otto
9af8692307
Merge pull request #12105 from twbs/navbar-containers
...
add .container(-fluid) to remaining navbar examples
2014-01-05 13:19:49 -08:00
Chris Rebert
ae255447f2
add .container(-fluid) to remaining navbar examples for consistency/accuracy
...
follow-up to 93a4d6cc5e
2014-01-05 12:55:03 -08:00
Chris Rebert
41257fe794
Merge pull request #12104 from ghoullier/master
...
Replace getElementsByTag with querySelector in IE10 Mobile viewport JS snippet
2014-01-05 11:47:00 -08:00
Gregory HOULLIER
a53cf55be2
Replace getElementsByTag by querySelector for IE10 Mobile plateform.
2014-01-05 20:15:48 +01:00
Chris Rebert
711d0b8337
Merge pull request #12099 from Quy/master
...
Fix typos
2014-01-05 08:52:16 -08:00
Quy Ton
3e92ab0149
Fix typos
2014-01-05 08:38:32 -08:00
Chris Rebert
c7eac32d3e
Merge pull request #12098 from ZDroid/reorg
...
Group repo vars together in Jekyll config
2014-01-05 08:05:40 -08:00
Chris Rebert
055705741e
Merge pull request #12097 from ZDroid/deprecated
...
Replace @screen-sm with @screen-sm-min
2014-01-05 08:01:55 -08:00
Zlatan Vasović
f63cd94e43
Reorganize vars
2014-01-05 11:51:49 +01:00
Zlatan Vasović
78eb8cc0f4
Replace @screen-sm with @screen-sm-min
2014-01-05 11:38:26 +01:00
Chris Rebert
b9d779a73c
Merge pull request #12095 from Quy/master
...
Fix typo
2014-01-04 21:43:25 -08:00
Quy Ton
82ed81fddf
Fix typo
2014-01-04 21:35:06 -08:00
Mark Otto
72d4fafd66
Merge pull request #12092 from Quy/master
...
Use relative URLs and fix anchor links
2014-01-04 19:31:52 -08:00
Chris Rebert
7ca113b487
Merge pull request #12090 from nschonni/patch-2
...
Quote Node 0.10 so correct version is printed
2014-01-04 12:20:38 -08:00
Quy Ton
a617c805f2
Fix anchor links
2014-01-04 09:28:56 -08:00
Quy Ton
11f56bbb7b
Use relative URLs
2014-01-04 09:10:02 -08:00
Nick Schonning
8662323cd5
Quote Node 0.10 so correct version is printed
2014-01-04 10:46:05 -05:00
Chris Rebert
84c33a822d
Replace lingering page.url instance with site.baseurl
...
Refs #12083 & #12037
2014-01-03 16:19:20 -08:00
Kevin Sawicki
5141e4da10
Use $ instead of jQuery
2014-01-03 14:39:18 -08:00
Mark Otto
0b75e2d738
Merge branch 'master' into docs_derp
2014-01-03 13:18:12 -08:00
Chris Rebert
007d61cfad
flip order so sentence reads better
2014-01-03 12:29:45 -08:00
Chris Rebert
56b5f5b353
de-emphasize /docs/assets and docs HTML now that they're outside of the root dir
2014-01-03 12:21:38 -08:00
Chris Rebert
096a72d897
Merge pull request #12081 from Quy/master
...
Update source code download structure
2014-01-03 12:14:20 -08:00
Quy Ton
63df2ced6e
Update source code download structure
2014-01-03 11:42:27 -08:00
Julian Thilo
71688061b4
Merge pull request #12080 from Quy/master
...
Refer to popovers instead of tooltips.
2014-01-03 11:04:14 -08:00
Quy Ton
a53779d020
Refer to popovers instead of tooltips.
2014-01-03 10:55:06 -08:00
Mark Otto
9f44f17057
updates to homepage
2014-01-02 10:54:10 -08:00
Mark Otto
60e6e7d4fb
Merge pull request #12063 from ZDroid/tc
...
Drop trailling comma
2014-01-02 10:52:43 -08:00
Zlatan Vasović
0cc4fe6ee3
Drop trailling comma
...
No need for it.
2014-01-02 15:46:13 +01:00
Mark Otto
70459c1454
Merge branch 'master' into docs_derp
...
Conflicts:
docs/_includes/footer.html
docs/assets/css/docs.css
2014-01-01 12:27:09 -08:00
Mark Otto
c583b79655
Merge pull request #12055 from wangsai/fix-assets-links-of-examples
...
fix assets links in all examples
2014-01-01 12:02:28 -08:00
Julian Thilo
8113717363
Merge pull request #12056 from ZDroid/ny
...
New Year
2014-01-01 09:45:50 -08:00
Zlatan Vasović
0f060e7bc4
'use strict' on new line
2014-01-01 15:42:41 +01:00
Zlatan Vasović
1c83d68ca4
New Year
2014-01-01 15:37:08 +01:00
wangsai
e4508bb37c
fix assets links in all examples
2014-01-01 22:29:13 +08:00
Mark Otto
50cf0b1a9d
Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030 : navbar toggle focus state
2013-12-31 18:23:10 -08:00
Mark Otto
83d26de6d5
Fix broken JS
2013-12-31 17:47:16 -08:00
Mark Otto
bab240252a
Merge branch 'master' into docs_derp
2013-12-31 13:57:43 -08:00
Mark Otto
e3aa358696
derp
2013-12-31 13:57:35 -08:00
Mark Otto
905adb5b83
fix homepage images
2013-12-31 13:56:20 -08:00
Mark Otto
b253cb2c1e
Merge branch 'master' into docs_derp
...
Conflicts:
_config.yml
docs/_includes/footer.html
docs/_includes/nav-main.html
docs/_includes/old-bs-docs.html
docs/_layouts/default.html
docs/_layouts/home.html
docs/getting-started.html
docs/index.html
2013-12-31 13:53:33 -08:00
Mark Otto
8812856de1
Merge pull request #12037 from twbs/docs_dir
...
Bring back the `/docs` directory
2013-12-31 13:43:32 -08:00
Mark Otto
05cc208333
Merge branch 'master' into docs_dir
2013-12-31 13:43:11 -08:00
Mark Otto
ac3f48bb19
Fixes #12046 : move .csscomb.json and .csslintrc to less/ folder
2013-12-31 13:16:28 -08:00
Mark Otto
295736aff2
Merge pull request #12049 from ZDroid/update-de
...
Update dependencies (again)
2013-12-31 12:57:55 -08:00
Mark Otto
78e1af58d6
typo
2013-12-31 11:57:44 -08:00
Mark Otto
b43371cd0a
@nschonni's feedback <3
2013-12-31 11:38:32 -08:00
Mark Otto
1e4540f11b
@cvrebert's feedback
2013-12-31 10:51:39 -08:00
Mark Otto
0df96d8c32
Merge branch 'master' into docs_dir
2013-12-31 10:38:31 -08:00
Zlatan Vasović
17fb7aee2d
Update dependencies (again)
2013-12-31 19:20:57 +01:00
Chris Rebert
a1b5458073
Merge pull request #12043 from supergibbs/fixed_typo_in_customize.html
...
Fixed typo
2013-12-29 23:26:57 -08:00
Supergibbs
df16f9f123
Fixed typo
2013-12-29 23:16:41 -08:00
Chris Rebert
6ecdb31009
Sauce now supports latest Firefox on OS X Mavericks
2013-12-29 21:15:29 -08:00
Chris Rebert
0fe777b271
default to latest Firefox version on OS X
2013-12-29 21:13:56 -08:00
Chris Rebert
0e412dc1a3
fix capitalization of iOS
2013-12-29 20:45:36 -08:00
Chris Rebert
7f20eff44d
Merge pull request #12041 from twbs/mv-sauce-into-infra
...
mv sauce_browsers.yml out of the project root
2013-12-29 20:29:44 -08:00
Chris Rebert
990c2392e5
mv sauce_browsers.yml out of the project root
2013-12-29 20:25:40 -08:00
fat
d18ba50837
add note about ios dropdown compat
2013-12-29 19:40:31 -08:00
fat
1fea9656b6
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-29 19:25:24 -08:00
Chris Rebert
3d3e2f2553
Merge pull request #12036 from ZDroid/grunt-fs-minify
...
Merge two fs variable declarations into one
2013-12-29 19:23:57 -08:00
fat
2a0b99104c
Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee-dropdown-aria-roles
...
Conflicts:
js/dropdown.js
2013-12-29 19:23:15 -08:00
fat
8a62f21113
fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active')
2013-12-29 19:01:32 -08:00
fat
76f0d0ff32
fixes #11373 - adds related target to dropdown events
2013-12-29 18:57:22 -08:00
fat
162d9e1776
Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top
...
Conflicts:
dist/js/bootstrap.min.js
2013-12-29 18:04:43 -08:00
fat
9d73d9c38c
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-29 17:54:40 -08:00
fat
ce4a2e4352
fixes #11288 - Vertical scroll position of modal saves between openings
2013-12-29 17:53:59 -08:00
Mark Otto
70b8b330f0
no more page.base_url
2013-12-28 23:08:46 -08:00
Mark Otto
f10cf21a8f
Streamline copy process by not bringing over full files into docs/dist/, only take minified ones
2013-12-28 23:05:02 -08:00
Mark Otto
a9c829bc0c
Rearrange repository contents because muahahahahahaha
2013-12-28 22:47:03 -08:00
Jacob
ea40e7999d
Merge pull request #11203 from jasny/patch-1
...
Scrollspy acting up when targets are hidden
2013-12-28 22:06:26 -08:00
fat
5bf13914e4
fixes #10658 jQuery Popover content loses bound events on second setContent call.
2013-12-28 20:59:45 -08:00
Mark Otto
6405442e66
drop the title
2013-12-28 18:47:32 -08:00
Mark Otto
068010409b
Merge pull request #12035 from tomByrer/master
...
fixed .clearfix example, + doc link
2013-12-28 18:46:36 -08:00
Zlatan Vasović
0016b508cb
Merge two fs variable declarations into one
...
One is enough.
2013-12-28 23:33:32 +01:00
tomByrer
120dce43e8
fixed .clearfix example, + doc link
2013-12-28 12:01:32 -07:00
Mark Otto
9e1153d049
spacing
2013-12-27 16:44:00 -08:00
Mark Otto
adab81ddcd
Merge branch 'master' into docs_derp
2013-12-27 16:41:33 -08:00
Mark Otto
a2aaf80c7e
grunt on last merge
2013-12-27 16:41:25 -08:00
Mark Otto
84326a3e59
big brand update
2013-12-27 14:04:44 -08:00
Mark Otto
140d24c8fb
Merge pull request #12028 from moshevds/deprecated-screen-md
...
Small fix: I noticed the use of a deprecated variable.
2013-12-27 12:40:02 -08:00
Môshe van der Sterre
dd9c5fdb08
Small fix: I noticed the use of a deprecated variable. This seems to be the only occurrence.
2013-12-27 21:27:51 +01:00
Mark Otto
87288da72c
more nav changes
2013-12-26 22:03:37 -08:00
Mark Otto
a73767e518
the final frontier
2013-12-26 21:49:40 -08:00
Mark Otto
5b02dbd97a
Merge branch 'master' into docs_derp
...
Conflicts:
_config.yml
2013-12-26 21:40:15 -08:00
fat
201088cb5f
update accordion-group to panel
2013-12-26 20:33:44 -08:00
fat
c595db19ff
fixes #10911 - add loading event for use with remote option :|
2013-12-26 20:26:27 -08:00
fat
499cca2115
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-26 19:40:41 -08:00
fat
d21369c1ed
fixes #10890
2013-12-26 19:40:18 -08:00
Mark Otto
d43eb0a513
less fun to address #12008
2013-12-26 19:37:19 -08:00
Mark Otto
ca7498faa0
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-26 19:08:34 -08:00
Mark Otto
567dc12e86
Fixes #12012 : Use correct banner in docs js
2013-12-26 19:08:19 -08:00
fat
cd0ad94aae
rebuild
2013-12-26 18:30:16 -08:00
fat
3c73904e17
update tool/pop destroy placement
2013-12-26 18:27:43 -08:00
Jacob
6baf266cda
Merge pull request #10761 from jochenberger/dont-create-tooltip-for-destroy
...
don't create new Tooltip/Popover objects just to destroy them immediately
2013-12-26 18:25:29 -08:00
fat
39091b0748
nope
2013-12-26 18:18:53 -08:00
Jacob
bf3c525d05
Merge pull request #11496 from satazor/patch-1
...
Clear timeout on destroy.
2013-12-26 18:18:09 -08:00
fat
34fb5767cb
fixes #10798
2013-12-26 17:53:31 -08:00
Jacob
37bfd8fa60
Merge pull request #10801 from Travesty3/master
...
Add 'collapse' class back after expanding
2013-12-26 17:50:41 -08:00
Jacob
bea46fca70
Merge pull request #10834 from Prinzhorn/master
...
Only preventDefault on click on [data-toggle="modal"] when the element is a link
2013-12-26 17:46:59 -08:00
Chris Rebert
0bcc5a2814
add Python indentation style to editorconfig; refs #12023
2013-12-26 13:44:27 -08:00
Chris Rebert
be6ad3fda0
Merge pull request #12009 from ZDroid/no-utf8-py
...
Replace UTF-8 characters in s3_cache.py with ASCII characters
2013-12-26 13:28:22 -08:00
Chris Rebert
e0268c32cb
Merge pull request #12022 from ZDroid/update-deps
...
Update dependencies
2013-12-26 13:16:13 -08:00
Zlatan Vasović
2426a2aeef
Update dependencies
...
Updates grunt-html-validation and grunt-jekyll dependencies.
2013-12-26 21:55:55 +01:00
Mark Otto
d8e4c1578d
Merge pull request #12010 from ZDroid/wrong-indent
...
Fix wrong indent in .jscs.json
2013-12-26 12:54:23 -08:00
Chris Rebert
e4b036d278
Merge pull request #12021 from XhmikosR/master
...
Add docs-assets/css/docs.css to csslint too.
2013-12-26 12:32:34 -08:00
Julian Thilo
1e938f1781
Merge pull request #12019 from XhmikosR/badge
...
Change david-dm theme to make README badges uniform
2013-12-26 10:58:23 -08:00
Chris Rebert
1e6ae57575
Merge pull request #12020 from XhmikosR/package
...
Update dependencies.
2013-12-26 10:52:38 -08:00
XhmikosR
b590b268ad
Update dependencies.
2013-12-26 19:54:04 +02:00
XhmikosR
5cb8510a81
README.md: switch to the shields.io dependency badges theme.
2013-12-26 19:52:39 +02:00
XhmikosR
5eab9cbe82
Add docs-assets/css/docs.css to csslint too.
2013-12-26 19:49:33 +02:00
fat
fc7049b18f
fixes #10675
2013-12-25 20:33:05 -08:00
fat
3161acd710
build js
2013-12-25 20:04:49 -08:00
fat
c25fa0661a
Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into lukaszfiszer-tooltip-events-fix
...
Conflicts:
js/tooltip.js
2013-12-25 20:03:28 -08:00
Zlatan Vasović
1e05029d1a
Fix wrong indent in .jscs.json
2013-12-25 20:22:52 +01:00
Zlatan Vasović
d381771f6a
Replace UTF-8 characters in s3_cache.py with ASCII characters
2013-12-25 20:19:59 +01:00
Mark Otto
3fdde76b74
don't be repetitive on homepage
2013-12-25 14:32:00 +02:00
Mark Otto
e29a3b65cd
Merge branch 'master' of github.com:twbs/bootstrap
2014-01-22 15:37:11 -06:00
Mark Otto
d1f69d4a7e
scope styles to masthead, not homepage
2014-01-22 15:37:05 -06:00
fat
dffd4ffad2
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-24 17:00:55 -08:00
fat
394e0fa611
fixes #11788 - focusin focusout instead of focus/blur
2013-12-24 17:00:34 -08:00
Jacob
0fab6e7ea7
Merge pull request #11722 from DocX/patch-1
...
Use document scroll height instead of offset height
2013-12-24 16:43:24 -08:00
fat
d9266aee96
add docs for affix events
2013-12-24 16:37:53 -08:00
fat
c77740bd3a
fixes #11720 - Add events trigger to affix
2013-12-24 16:29:51 -08:00
fat
073f8c049d
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-24 13:43:47 -08:00
fat
f689a26a1c
note for #10486 add note about data-toggle dropdown dependency
2013-12-24 13:43:09 -08:00
Jacob
139b395dfb
Merge pull request #10359 from ixti/patch-1
...
Pass $element to offset top/bottom calc funcs
2013-12-24 13:21:19 -08:00
fat
a93a753c7d
fixes #10134 – dont use jquery offset directly because it uses sub pixel rendering
2013-12-24 13:07:42 -08:00
fat
fe7fffe034
Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset
...
Conflicts:
js/tests/unit/carousel.js
2013-12-24 12:50:55 -08:00
fat
0a75e4c09b
fixes #10283
2013-12-24 12:40:24 -08:00
fat
558b6a478d
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
2013-12-24 12:35:24 -08:00
fat
50bd4edb8c
fixes #10236
...
if affixed top add scrollTop to it position.top
calculate and cache pinnedoffset independent of scrolling for initial load
2013-12-24 12:32:06 -08:00
Mark Otto
1da3a8c6b1
Merge pull request #12001 from soundarapandian/fix_typo_contributing
...
Use correct directory name for bootstrap contribution
2013-12-24 12:24:07 -08:00
Mark Otto
04ec4354ed
don't roll back that comment
2013-12-24 12:18:53 -08:00
Mark Otto
5c2dfbf33b
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
docs-assets/js/raw-files.js
2013-12-24 12:17:48 -08:00
Mark Otto
679c786237
roll back version numbers to avoid broken links in docs and readme ( fixes #12000 )
2013-12-24 12:16:17 -08:00
Gleb Mazovetskiy
25390716ea
Reflect sass readme change in css.html
2013-12-24 17:20:52 +01:00
soundarapandian
8b564f9e32
Use correct directory name for bootstrap contribution
2013-12-24 16:05:19 +05:30
Jacob
237b85a7c1
Merge pull request #11933 from twbs/fat-10105
...
change where modal loads content -– fixes #10105 , #9318 , #9459
2013-12-23 23:31:11 -08:00
fat
fe839e6e78
change where modal loads content -– fixes #10105 , #9318 , #9459
2013-12-23 23:30:06 -08:00
Mark Otto
52a964d19b
Merge pull request #11999 from XhmikosR/respond.js
...
Update Respond.js
2013-12-23 23:26:05 -08:00
XhmikosR
3d65fc2b65
Update Respond.js to v1.4.2.
2013-12-24 09:22:53 +02:00
fat
1fc08c1973
fixes #10568 - kill hoverstate info once command has been executed
2013-12-23 22:57:39 -08:00
fat
a87b150bc7
fixes #10205 Scrollspy Doesn't Support Chinese ID Targets http://mathiasbynens.be/notes/html5-id-class
2013-12-23 22:08:43 -08:00
Mark Otto
71e9db4183
add callout about justified button group borders to address #11964
2013-12-23 20:28:21 -08:00
Mark Otto
340e2f5534
Merge pull request #11970 from supergibbs/Better_10492_fix
...
Fixes #10492 better
2013-12-23 18:53:30 -08:00
Supergibbs
f3ce6a9696
Fixes #10492 better:
...
- Made more generic. Applies to "> .table" and "> .table-responsive > .table" to support td/tr background colors too and not just .table-striped
- Supports tfoot
2013-12-23 16:07:55 -08:00
Mark Otto
0bd5bca695
Fixes #11975 : Change from png to .ico for favicon
2013-12-23 15:16:25 -08:00
Mark Otto
37bc0c230d
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-23 13:26:01 -08:00
Mark Otto
4376ce8466
Upgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spaces
2013-12-23 13:25:51 -08:00
Mark Otto
00850e247c
Merge pull request #11989 from ZDroid/banner
...
Improve banner
2013-12-23 12:42:41 -08:00
Zlatan Vasović
608926e808
Improve banner
2013-12-23 18:02:42 +01:00
Mark Otto
f32796559a
Merge pull request #11978 from XhmikosR/clean-up-_gh-pages
...
Jekyll: exclude more files/folders.
2013-12-22 23:15:35 -08:00
Mark Otto
96b5ae8b6a
grunt
2013-12-22 22:32:35 -08:00
Mark Otto
6fda30e1c4
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-22 22:31:28 -08:00
Mark Otto
9fc0e20381
Fixes #10492 and some of #11970 : round the proper corner on table cells in panels
2013-12-22 22:31:13 -08:00
Mark Otto
45a8a9508e
Merge pull request #11974 from XhmikosR/meta
...
Normalize meta
2013-12-22 22:20:23 -08:00
Mark Otto
90ba7fa836
Merge pull request #11972 from XhmikosR/comma
...
Get rid of JSHint's `laxcomma` option now that the comma is used on the ...
2013-12-22 22:08:33 -08:00
Mark Otto
b505c8557d
fixes #11961 : dropdown alignment docs improvements
2013-12-22 22:07:01 -08:00
Mark Otto
6cde19fc33
Merge pull request #11963 from twbs/sass_docs
...
Add docs for Sass port
2013-12-22 21:47:11 -08:00
Mark Otto
fd15b00861
space
2013-12-22 21:42:08 -08:00
Mark Otto
8bc6aeb60a
add what's included
2013-12-22 21:27:12 -08:00
Mark Otto
906b0c595b
Merge branch 'master' into sass_docs
2013-12-22 21:23:24 -08:00
Mark Otto
cb7cdd0c05
Revert to CSScomb 1.1.0 because 1.2.0 and 1.2.1 fuck up our compiled CSS
2013-12-22 21:18:45 -08:00
Mark Otto
ec13eb8d38
Remove timestamp on generated Glyhpicons
2013-12-22 21:05:08 -08:00
Mark Otto
7ccb0333e4
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-22 21:01:00 -08:00
Mark Otto
51628d2050
grunt
2013-12-22 21:00:53 -08:00
Mark Otto
146800ef43
Merge pull request #11979 from ZDroid/fix-old-links
...
Fix old links
2013-12-22 17:30:35 -08:00
Chris Rebert
fa2380758e
Merge pull request #11982 from ZDroid/update-deps
...
Update dependencies
2013-12-22 12:23:52 -08:00
Zlatan Vasović
88c3619d2c
Update dependencies
2013-12-22 19:01:00 +01:00
Zlatan Vasović
28adcbe439
Fix old links
...
Replace recess with less.
2013-12-22 16:26:05 +01:00
XhmikosR
ea5a4ec31e
Jekyll: exclude more files/folders.
...
We still can't exclude `./fonts/" and "./js/" due to https://github.com/jekyll/jekyll/issues/906
2013-12-22 11:45:18 +02:00
XhmikosR
a05a11e5dc
Get rid of JSHint's laxcomma option now that the comma is used on the right side.
2013-12-22 09:02:08 +02:00
XhmikosR
b27fecb7a3
bower.json: sort by name.
2013-12-22 08:59:36 +02:00
XhmikosR
29aaf66a8a
Normalize package.json.
2013-12-22 08:59:36 +02:00
XhmikosR
6e3ac8f2a4
js/.jscs.json: sort by name.
2013-12-22 08:59:36 +02:00
Mark Otto
12980e7ea4
link homepage sass and less
2013-12-21 13:42:10 -08:00
Mark Otto
176e35d33d
rework downloads to simplify and add sass
2013-12-21 13:40:42 -08:00
Mark Otto
16ff01f629
remove dat
2013-12-21 11:17:39 -08:00
Mark Otto
02c40ab991
Merge branch 'master' into docs_derp
...
Conflicts:
_layouts/default.html
components.html
2013-12-21 11:17:29 -08:00
Mark Otto
c66924cc1b
add section for contents
2013-12-21 10:36:20 -08:00
Mark Otto
2f56922937
config url
2013-12-21 10:09:39 -08:00
Mark Otto
bb644eede6
Team members on About page
2013-12-21 10:08:04 -08:00
Mark Otto
86e6c869a3
remove some unintional code
2013-12-21 09:59:24 -08:00
Mark Otto
0c49f846e3
Merge branch 'master' into sass_docs
2013-12-21 09:45:47 -08:00
Mark Otto
5f9695ae7c
readme typo from #11965
2013-12-21 09:36:51 -08:00
Mark Otto
b734a2a435
Merge pull request #11965 from tomByrer/md-tweaks
...
condenced README CONTRIB changes
2013-12-21 09:36:18 -08:00
tomByrer
c84688fc4f
https://github.com/twbs/bootstrap/pull/11950#issuecomment-31033824
2013-12-21 09:39:34 -07:00
Mark Otto
033476ccc7
more Less
2013-12-20 21:19:45 -08:00
Mark Otto
66c280c855
Sass docs; LESS to Less because fuck caps
2013-12-20 21:02:25 -08:00
Mark Otto
810c7ec4f8
Merge pull request #11956 from tlindig/tl_pagination_customizing
...
add new variables for "pagination" to improve support of customizing
2013-12-20 12:29:49 -08:00
Mark Otto
e1bd300f2f
Merge pull request #11960 from ZDroid/no-leading-commas-json
...
Drop remaining leading commas
2013-12-20 11:18:04 -08:00
Zlatan Vasović
b604c2fbac
Drop remaining leading commas
2013-12-20 20:09:51 +01:00
Mark Otto
f1d4a3bb5c
Merge pull request #11959 from ZDroid/update-grunt-csscomb
...
Update grunt-csscomb dependency
2013-12-20 11:08:39 -08:00
Zlatan Vasović
e95c396f44
Update grunt-csscomb dependency
...
Per David DM.
2013-12-20 19:59:18 +01:00
Tobias Lindig
7f599cedf3
add new variables for "pagination" to improve support of customizing
2013-12-20 17:06:53 +01:00
Mark Otto
2854c5c3fb
Fixes #11952 : Refactor blockquote styles
...
* Deprecate .pull-right class for .blockquote-reverse
* Move font-size change to the parent, blockquote, instead of setting on the p element to allow more flexible content
2013-12-19 19:40:08 -08:00
Mark Otto
81b1e6801f
correct jsbin link
2013-12-19 19:28:22 -08:00
Chris Rebert
2c5e5b23e1
Merge pull request #11951 from bnewcomb/master
...
Fix sentence grammar
2013-12-19 19:10:16 -08:00
Ben Newcomb
2e0337a61b
Minor grammar change
...
'as well' was used twice in sentence
2013-12-19 18:57:43 -08:00
Mark Otto
523eca14e8
Merge pull request #11930 from ssorallen/master
...
Write Glyphicons to _data, generate Glyphicons markup
2013-12-19 15:03:43 -08:00
Mark Otto
4a01acaf67
Merge pull request #11941 from ZDroid/left-plus
...
No leading pluses
2013-12-19 14:06:01 -08:00
Mark Otto
caadd72084
Merge pull request #11939 from ZDroid/weird-indents
...
2 instead of 4 spaces in .csscomb.json
2013-12-19 14:05:19 -08:00
Chris Rebert
2898e73ec4
"Thosing" [sic] => "Those"
2013-12-19 11:39:57 -08:00
Julian Thilo
fc03fac9e4
Fix sentence in css.html
2013-12-19 20:12:31 +01:00
Julian Thilo
b298d2f481
Merge pull request #11945 from robertgentel/patch-1
...
Update css.html
2013-12-19 10:56:36 -08:00
robertgentel
ded1e72202
Update css.html
...
Documentation (missing word)
2013-12-19 11:06:45 -06:00
Zlatan Vasović
1bf5abab31
No leading pluses
2013-12-19 15:32:37 +01:00
Zlatan Vasović
9201ccd08b
2 instead of 4 spaces in .csscomb.json
2013-12-19 13:11:05 +01:00
Chris Rebert
fb8310fbc6
Merge pull request #11936 from KostyaTretyak/patch-1
...
Deleted curly brackets (in css.html)
2013-12-19 01:23:10 -08:00
kostyatretyak
09c7870971
Deleted curly brackets (in css.html)
2013-12-19 11:07:56 +02:00
Chris Rebert
85ba12932f
Merge pull request #11935 from tlindig/tl_fix_typo_modal-open
...
Docu: typo fix: replaced 'model-open' with 'modal-open'
2013-12-19 00:30:04 -08:00
Tobias Lindig
50f1bc47ec
typo fix: replaced 'model-open' with 'modal-open'
2013-12-19 09:09:04 +01:00
Chris Rebert
091146ee73
Merge pull request #11934 from twbs/auto-latest-browsers
...
omit versions in Sauce browser config; no explicit version implies latest
2013-12-18 23:39:03 -08:00
Chris Rebert
fbb0e8b146
omit versions in Sauce browser config; no explicit version implies latest version
2013-12-18 23:29:52 -08:00
Mark Otto
edbd1a81e0
Merge pull request #11932 from dzwillia/th-td-position-static
...
Added position: static to table th and td when using grid classes for sizing
2013-12-18 21:41:19 -08:00
fat
22f9767714
check that href id's are followed by valid char – fixes #10044
2013-12-18 21:14:01 -08:00
dzwillia
d9586e2863
Added position: static to table th and td.
2013-12-19 00:10:58 -05:00
Ross Allen
b048ea545f
Write Glyphicons to _data, generate Glyphicons markup
...
This generates a glyphicons.yml file from the glyphicons.less source,
and then components.html uses that data to generate the Glyphicons docs
by iterating through the data. The _data directory was introduced in
Jekyll 1.3.0, and GitHub Pages is already on [version 1.4.2][1].
Fixes #11862 .
[1] https://github.com/github/pages-gem/blob/master/github-pages.gemspec#L16
2013-12-18 20:15:51 -08:00
Mark Otto
87727370e0
Merge pull request #11929 from twbs/maintainers
...
mention core team maintenance & community contributors
2013-12-18 19:04:18 -08:00
Chris Rebert
07da1d731a
mention core team maintenance & community contributors
2013-12-18 18:54:07 -08:00
Mark Otto
4eaa297e68
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-18 17:34:40 -08:00
Mark Otto
b59b37bc2c
Fixes #11918 : Fork the @h5bp contributing guidelines and combine with our coding guidelines
2013-12-18 17:34:30 -08:00
Mark Otto
b8810fb75d
Fixes
2013-12-18 17:32:52 -08:00
Mark Otto
171c4b7fc4
fixes #11447 : add docs warning about loading once for remote modal option
2013-12-18 16:56:41 -08:00
Chris Rebert
08854cf8a6
using templating doesn't seem to work there; hardcode license URL instead
...
Tested the customizer, the generated zip had:
css/bootstrap.css:line 6: * Licensed under MIT (<%= _.pluck(pkg.licenses, "url").join(", ") %>)
Revised customizer generates:
css/bootstrap.css:line 4: * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE )
2013-12-18 16:25:23 -08:00
Mark Otto
07705673b6
Merge branch 'master' into docs_derp
...
Conflicts:
_layouts/default.html
2013-12-18 16:19:46 -08:00
Chris Rebert
fe7c7ccf29
rebuild minified customizer JS so it reflects the licensing change
2013-12-18 15:50:59 -08:00
Mark Otto
3315d4d9f4
license in customizer
2013-12-18 15:35:24 -08:00
Chris Rebert
df3716647d
update licensing header in JS files & run grunt
2013-12-18 15:29:19 -08:00
Mark Otto
766bf50b88
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-18 15:26:17 -08:00
Mark Otto
ccc894361f
update license faqs for apache
2013-12-18 15:26:07 -08:00
Chris Rebert
5428523a37
cleanup licensing section more
2013-12-18 15:16:29 -08:00
Mark Otto
922cd046ef
grunt after that carousel merge
2013-12-18 15:13:50 -08:00
Mark Otto
1bb0001189
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-18 15:12:51 -08:00
Mark Otto
27697ef7e3
another apache mention
2013-12-18 15:12:30 -08:00
Mark Otto
629a4743f0
remove license readme mention
2013-12-18 15:08:38 -08:00
Mark Otto
40651cf1ea
more license mentions
2013-12-18 15:08:16 -08:00
Mark Otto
b9ca65ebe7
Merge pull request #11416 from danielboendergaard/carousel-duration
...
Carousel: Use the transition duration from CSS
2013-12-18 15:01:47 -08:00
Mark Otto
e8e60ae4bc
version bump
2013-12-18 14:56:08 -08:00
Mark Otto
cb40a2ee8c
Punt Apache license information and stick with MIT
2013-12-18 14:54:24 -08:00
Mark Otto
f29132350c
grunt
2013-12-18 14:52:50 -08:00
Mark Otto
af2c6de6d5
Merge pull request #11928 from twbs/we_have_to_go_back_kate
...
Follow up to reverted commits
2013-12-18 14:49:05 -08:00
Mark Otto
56c36346c1
drop the the, it's cleaner
2013-12-18 14:38:10 -08:00
Mark Otto
79e97fef40
derp
2013-12-18 14:37:30 -08:00
Mark Otto
324f6ca562
buttons should be more mixin friendly
2013-12-18 14:29:33 -08:00
Mark Otto
ab740f0f0f
navbars need to use prefixed nav class or they won't work as expected
2013-12-18 14:28:03 -08:00
Mark Otto
3416e87a97
restore inline block on breadcrumbs and ensure proper code formatting for readibility
2013-12-18 14:27:21 -08:00
Mark Otto
961687e4db
run grunt dist
2013-12-18 14:26:37 -08:00
Mark Otto
0a955844ab
rewrite readme to restore lost information, only with a bit more formatting consistency
2013-12-18 14:24:59 -08:00
Mark Otto
8598c700f5
Merge pull request #11927 from twbs/revert_commits
...
Revert commits
2013-12-18 14:21:35 -08:00
Julian Thilo
2b312bf3c1
Revert commits
...
Bootstrap is being relicensed from Apache 2.0 to MIT so that more of our community can use the free and open source software we lovely create together. As commits are copyright their original authors, the commits of any individual not agreeing to relicense their contributions are being removed to be later rewritten by the @twbs/team.
This undoes the changes introduced by the following commits:
https://github.com/twbs/bootstrap/commit/7ea34ae0ef79c793e9a9d393b4eef825b71e84b5 , https://github.com/twbs/bootstrap/commit/7376eef378fe7d5e69b8b8cce93c7c64b751d55a , https://github.com/twbs/bootstrap/commit/303ba1326bbe367598ab4cc063b4607507208e56 , https://github.com/twbs/bootstrap/commit/7d1c8c2a0ce16331583a965821690f7715e62908 , https://github.com/twbs/bootstrap/commit/11319f6da9f9a19ec40743cdfe868ac732698149 , https://github.com/twbs/bootstrap/commit/110fc8860117d8675345806219ba313b18086db2 , https://github.com/twbs/bootstrap/commit/ced08f69359f3a70771804a98fa3c499f388cc74
2013-12-18 22:58:13 +01:00
Mark Otto
bc265ac647
callout colors
2013-12-18 13:52:39 -08:00
Mark Otto
1d0aa6e45c
more docs
2013-12-18 13:40:29 -08:00
Mark Otto
d87e70fd49
footer alignment
2013-12-18 13:13:27 -08:00
Mark Otto
5bba874467
Merge branch 'master' into docs_derp
2013-12-18 13:06:47 -08:00
Mark Otto
3f577ab86c
Merge pull request #11881 from ZDroid/patch-1
...
Require comma on left side
2013-12-18 13:01:43 -08:00
Mark Otto
ee709db679
Merge pull request #11804 from twbs/css-source-maps
...
enable CSS source maps in grunt-contrib-less
2013-12-18 12:57:38 -08:00
Chris Rebert
c4b0684e65
fix typo
2013-12-18 11:45:30 -08:00
Mark Otto
6315043b1c
Merge branch 'master' into docs_derp
2013-12-18 11:41:48 -08:00
Mark Otto
c262e5b47c
add source maps
2013-12-18 10:23:46 -08:00
Mark Otto
1bc8607bdf
Merge branch 'master' into css-source-maps
...
Conflicts:
Gruntfile.js
2013-12-18 10:22:18 -08:00
Mark Otto
d15218a09c
Fixes #11899 : Ensure proper margins and .small/small usage for heading tags (e.g., .h1-.h6)
2013-12-18 09:49:05 -08:00
Mark Otto
0d0b5c7ddb
add inline note about navbar sizing
2013-12-18 09:48:04 -08:00
Mark Otto
c1f68dd4d4
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-18 09:42:45 -08:00
Mark Otto
8142493b42
fixes #11925 : cover template for firefox
2013-12-18 09:42:37 -08:00
Mark Otto
b93d6dfbdf
tweaks
2013-12-18 09:42:13 -08:00
Chris Rebert
671fb7020b
Merge pull request #11923 from wangsai/fix-id
...
fix href of "Browser and device support"
2013-12-18 01:05:48 -08:00
wangsai
98ef4284f0
fix href of "Browser and device support"
2013-12-18 16:57:55 +08:00
Mark Otto
91fdd89100
Merge pull request #11910 from InWayOpenSource/btn-group-inside-input-group-btn
...
Fix handling of .btn-group placed inside .input-group-btn
2013-12-17 22:49:55 -08:00
Chris Rebert
36e3311b3e
Merge pull request #11916 from ZDroid/fix-iversions
...
Downgrade Safari and OS X
2013-12-17 11:46:54 -08:00
Zlatan Vasović
575f29cee1
Downgrade Safari and OS X
2013-12-17 20:39:32 +01:00
Chris Rebert
dcfe710fa4
enable failHard grunt-html-validation option; fixes #11876
2013-12-17 01:35:16 -08:00
Chris Rebert
af1afb10bd
upgrade to grunt-html-validation v0.1.11
2013-12-17 01:29:19 -08:00
Sebastian Podjasek
ae640d4f1c
Fix handling of btn-group placed inside input-group-btn (used for mixing dropdowns with normal buttons)
2013-12-16 22:56:28 +01:00
Zlatan Vasović
ba3639b202
Require comma on left side
2013-12-16 18:06:31 +01:00
Chris Rebert
94635eb972
Merge pull request #11893 from twbs/separate-browsers-file
...
move Sauce test browsers list out of Gruntfile into separate file
2013-12-16 00:43:21 -08:00
Chris Rebert
0f72123c43
move Sauce test browsers list out of Gruntfile into separate file
2013-12-16 00:42:45 -08:00
Mark Otto
b6b2c90a7d
Merge branch 'master' into docs_derp
2013-12-16 00:39:50 -08:00
Chris Rebert
2ae39d7166
Merge pull request #11891 from twbs/cache-jekyll-bundle
...
use S3-cached Jekyll install to further speed up the Travis build
2013-12-16 00:02:42 -08:00
Chris Rebert
498f00a244
use S3-cached Jekyll install
2013-12-15 23:52:44 -08:00
Mark Otto
ec261a83a5
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-15 22:10:05 -08:00
Mark Otto
ca14b9652c
inform the people that fixed positioning ain't all it's cracked up to be /cc #11888
2013-12-15 22:09:45 -08:00
Mark Otto
05b0a74d9a
Merge pull request #11887 from twbs/minor-panels-refactor
...
minor refactoring of 4ee93c9f85
2013-12-15 22:04:57 -08:00
Chris Rebert
6bb73df50e
Merge pull request #11890 from twbs/generic-caching
...
make S3 caching significantly more generic
2013-12-15 21:26:52 -08:00
Chris Rebert
95c72b573e
make S3 caching significantly more generic
2013-12-15 21:12:33 -08:00
Chris Rebert
637b20f6d5
minor refactoring of 4ee93c9f85
2013-12-15 20:56:23 -08:00
Chris Rebert
75db355073
Merge pull request #11886 from twbs/html-validator-config
...
explicitly set more HTML5 validator options
2013-12-15 19:45:34 -08:00
Chris Rebert
43c3d785ef
explicitly set more HTML5 validator options
2013-12-15 19:42:47 -08:00
Chris Rebert
94bdea0054
use unique IDs for input feedback examples so HTML validates
2013-12-15 19:15:26 -08:00
Chris Rebert
f8cee54f4b
use unique IDs for modal labels in doc examples so HTML validates
2013-12-15 19:07:26 -08:00
Chris Rebert
4db1d69e98
simplify JS snippet slightly
2013-12-15 19:00:37 -08:00
Chris Rebert
a2f7c3015e
fix typo in docs
2013-12-15 18:45:56 -08:00
Chris Rebert
023731b4c7
fix var name in example to follow JS conventions
2013-12-15 18:19:10 -08:00
Chris Rebert
be508e043c
copyediting
2013-12-15 18:13:50 -08:00
Mark Otto
4ee93c9f85
Fixes #10492 again, this time for last row's corners on striped tables
2013-12-15 17:22:55 -08:00
Mark Otto
2979e4bcea
Add new form feedback states, clean up existing form styles
...
New stuff:
* Adds `.has-feedback` and `.form-control-feedback` to show icon-based
form feedback to users. Fixes #11836 .
* Removes the `width: 1em` on `.glyphicon` because it makes it
impractical to resize the width of all icons, even if they’re not
“empty” (e.g., a simple `.glyphicon { width: 30px; }` wouldn’t work,
nor would a class preceeded by a parent class.
Clean up:
* Sets `width: auto;` on all `.form-control`s within inline forms.
* Removes all the inline `select` menu `width` styles because all
inputs are now `auto`.
* Update form states docs to separate out sections better.
2013-12-15 17:15:09 -08:00
Mark Otto
d9345ff7d5
Fixes #11266 : Apply a pixel-based line-height to date inputs for iOS 7
2013-12-15 15:27:46 -08:00
Mark Otto
4f22670c6e
formatting and comment
2013-12-15 15:24:52 -08:00
Mark Otto
d1f15baa71
Merge branch 'master' into pr/11817
...
Conflicts:
dist/css/bootstrap.min.css
less/input-groups.less
2013-12-15 15:07:38 -08:00
Mark Otto
b04a1de9b0
Fixes #11402 : Updated fix for select.form-control width in inline-forms
2013-12-15 14:52:49 -08:00
Mark Otto
24eee65c25
grunt
2013-12-15 14:32:14 -08:00
Mark Otto
6bc7126643
Merge pull request #11494 from blowsie/patch-2
...
Fixed single dropdown-toggle in btn-group-veritcal not being rounded
2013-12-15 14:28:49 -08:00
Mark Otto
393d523cdb
Fixes #11660 : Depcreate small and .small in blockquote in favor of footer
2013-12-15 14:23:55 -08:00
Mark Otto
9023c087db
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-15 14:14:32 -08:00
Mark Otto
f5c13a3e1b
revert an earlier change to move the component-animations.less file because it fubared modal backdrop .fade usage
2013-12-15 14:14:09 -08:00
Mark Otto
f6fe62cdf7
run grunt on modal scrolling change
2013-12-15 14:13:25 -08:00
Mark Otto
122245fe87
Merge branch 'master' into pr/11676
...
Conflicts:
less/modals.less
2013-12-15 14:10:48 -08:00
Mark Otto
55f6beb427
Merge branch 'master' into pr/11776
...
Conflicts:
package.json
2013-12-15 14:09:50 -08:00
Mark Otto
e7a56df5a2
Merge pull request #11732 from dak/include-dev-fonts-in-bower
...
Don't exclude fonts from bower installs
2013-12-15 14:07:17 -08:00
Mark Otto
56eecf97ac
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-15 13:53:41 -08:00
Mark Otto
ee80b5e1d4
typo
2013-12-15 13:52:56 -08:00
Mark Otto
f126411735
Merge pull request #11840 from ZDroid/pagination-boom
...
Improve pager customization
2013-12-15 13:46:11 -08:00
Mark Otto
93a4d6cc5e
Fixes #11783 : Document requirement of .container(-fluid) in navbars
2013-12-15 13:44:26 -08:00
Mark Otto
540677c42a
Fixes #11795 : Update the contributing guidelines to include some more CSS guidelines
2013-12-15 13:39:45 -08:00
Mark Otto
a13d459491
Clarify number of columns in nested grid
2013-12-15 13:08:17 -08:00
Mark Otto
d57e81d06d
Fixes #11799 : Mention support of number of add-ons in docs
2013-12-15 12:41:47 -08:00
Mark Otto
c7c9929c12
Fixes #11770 : Move component-animations.less to the utility section of import list to match Customizer
2013-12-15 12:31:40 -08:00
Mark Otto
a925a0b985
Browser/device support docs update
...
* Fixes #11055 : add mention of select menu styling on Android stock
browsers with included optional fix
* Update IDs and docs nav to include bookmark links to each section
* Add callout to navbar docs about fixed position, inputs, and virtual
keyboard
2013-12-15 12:27:46 -08:00
Mark Otto
cb3d9dfe83
Fixes #11833 : add warning to docs for popover multiple line positioning; update it's docs with example markup, too
2013-12-15 11:44:16 -08:00
Mark Otto
1264cb7140
update tooltip docs
2013-12-15 11:41:46 -08:00
Mark Otto
61ec569211
Fixes #11805 with docs mention of navbar
2013-12-15 11:36:16 -08:00
Mark Otto
f60b8169c6
finalize blog template
2013-12-15 11:33:06 -08:00
Mark Otto
a7029edc61
Restyle the blockquote to not thin text or change line-height
2013-12-15 11:29:58 -08:00
Mark Otto
fd62247bf8
Merge branch 'master' into cover_template
2013-12-15 11:16:57 -08:00
Mark Otto
2b86e05a61
Change variable
2013-12-15 11:09:03 -08:00
Mark Otto
bc261ecc52
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-15 11:02:45 -08:00
Mark Otto
a319ec5b7d
Fixes #11829 : Adds .make-xs-column mixins
2013-12-15 11:02:32 -08:00
Mark Otto
2ea370f93b
Merge pull request #11861 from freeman/master
...
Issue #11852 : create a new variable for the list group active item link...
2013-12-15 10:59:23 -08:00
Mark Otto
9a8e619543
Fixes #11871 : commas last
2013-12-15 10:57:11 -08:00
Mark Otto
ad782ff89a
comments and spacing
2013-12-15 10:53:53 -08:00
Mark Otto
8c13565e3c
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-15 10:39:12 -08:00
Mark Otto
82c52a7e9d
Fixes #11801 : use correct variables for grid containers
2013-12-15 10:38:54 -08:00
Mark Otto
ca7fd08646
Merge pull request #11879 from ZDroid/wrong-variable
...
Fix wrong variable name
2013-12-15 10:28:32 -08:00
Zlatan Vasović
ae170a5930
Fix wrong variable name
2013-12-15 11:47:23 +01:00
Mark Otto
168469f545
Fixes #11588 : Scope font-size to only p elements in a .jumbotron and remove the supersized line-height from the base class
2013-12-14 21:50:47 -08:00
Mark Otto
647e9eb0f1
Fixes #11555 : Add @tooltip-opacity variable
2013-12-14 21:43:08 -08:00
Mark Otto
072ccd4dda
Fixes #11572 : Add contextual background-color classes to match text classes; move both sets of classes to Helper Classes section of the CSS docs
2013-12-14 21:40:16 -08:00
Mark Otto
67b536ea51
change class name
2013-12-14 21:25:57 -08:00
Mark Otto
bcc2c8b09e
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-14 20:04:52 -08:00
Mark Otto
432b9f9cde
Fixes #11561 : Add float: left; to .form-control within input groups to prevent IE9 from screwing up placeholder text and select menu arrows
2013-12-14 20:04:12 -08:00
Chris Rebert
c243e2417e
Merge pull request #11864 from twbs/parallelize-build
...
parallelize Travis using build matrix & test subsuites
2013-12-14 19:40:28 -08:00
Mark Otto
4da03c83c5
correct bookmark prefix
2013-12-14 19:31:20 -08:00
Mark Otto
88a8669656
document #11326
2013-12-14 19:31:03 -08:00
Chris Rebert
39a2dab722
parallelize Travis using build matrix & test subsuites
2013-12-14 19:11:04 -08:00
Mark Otto
e98c2dc3ad
Merge pull request #11326 from ZDroid/animations
...
Add `.animation-*()` mixins
2013-12-14 18:58:41 -08:00
Mark Otto
35dd6b9fd7
Merge pull request #10704 from XhmikosR/various
...
rm unused vars
2013-12-14 18:55:25 -08:00
Mark Otto
46c3d27468
Merge branch 'master' into pr/11435
...
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
2013-12-14 16:56:56 -08:00
Mark Otto
4c64c1eecd
Merge branch 'master' into pr/11302
...
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
2013-12-14 16:46:40 -08:00
Mark Otto
d79431ca02
Document new modal sizes
2013-12-14 16:29:55 -08:00
Mark Otto
323a40cc53
Merge branch 'master' into pr/11162
...
Conflicts:
less/modals.less
2013-12-14 16:29:47 -08:00
Mark Otto
83c60ef3ee
Merge branch 'master' into pr/11107
...
Conflicts:
docs-assets/js/raw-files.js
2013-12-14 16:20:19 -08:00
Mark Otto
4afcebe0e7
Merge pull request #11286 from BBosman/well-border
...
Add well-border variable
2013-12-14 16:17:41 -08:00
Mark Otto
544b8ecab7
Fixes #10921 : Add support for input groups within button toolbars
...
* Floats any `.input-group` within a toolbar
* Simplifies the CSS to remove sibling selectors and instead use a
negative amrgin on the parent with only `margin-left`
See it in action: http://jsbin.com/aGEcUqAT/1/ .
2013-12-14 16:03:21 -08:00
Mark Otto
fd4130534f
mention lack of support for split button dropdowns in vertical button groups
2013-12-14 15:56:01 -08:00
Mark Otto
a54dbfdf2a
Merge branch 'master' into pr/10951
...
Conflicts:
dist/css/bootstrap.min.css
less/modals.less
2013-12-14 15:38:21 -08:00
Mark Otto
f1869771bc
Fixes #10505 : Document more of LESS vars and mixins
2013-12-14 14:18:43 -08:00
Mark Otto
85316c8a0c
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-14 13:23:25 -08:00
Mark Otto
11c6ab767c
Fixes #10370 : Improved and deprecated dropdown menu alignment options
...
* Removes an old pair of selectors that didn’t properly target the
right-aligned navbar alignment of dropdown menus.
* Deprecates the `.pull-right` alignment in favor of a more specific
and unique class name.
* Adds `.dropdown-menu-right` as the new alignment class. This is then
mixin-ed into the `.navbar-right.navbar-nav` dropdown menus for
auto-alignment.
* To override that auto-alignment, use `.dropdown-menu-left` as needed.
2013-12-14 13:22:56 -08:00
Chris Rebert
9e50078321
Merge pull request #11878 from ZDroid/patch-1
...
Add `try` and `catch` to keywords
2013-12-14 13:13:24 -08:00
Zlatan Vasović
7f6cf5e50c
Add try and catch to keywords
2013-12-14 21:57:59 +01:00
Mark Otto
914f5e6a1d
Fixes #11867 : Add @panel-body-padding variable
2013-12-14 11:44:54 -08:00
Mark Otto
ecc6f4e6bc
Merge branch 'master' into pr/11868
...
Conflicts:
dist/css/bootstrap.min.css
2013-12-14 11:36:54 -08:00
Mark Otto
22820d7151
Fixes #10495 : Float Glyphicon and set margins in .navbar-brand to ensure there is no added height because wtf even is CSS
2013-12-13 23:06:04 -08:00
Chris Rebert
ce07ff84cd
Merge pull request #11869 from twbs/cache-node_modules
...
use S3-based node_modules caching
2013-12-13 17:35:39 -08:00
Chris Rebert
6b6b059ac3
time all the things
2013-12-13 17:22:46 -08:00
Chris Rebert
42697a4ecb
use S3-based node_modules caching
2013-12-13 17:20:32 -08:00
Chris Rebert
de6b9e9df1
Merge pull request #11874 from ZDroid/hotfix
...
';' isn't needed
2013-12-13 14:31:15 -08:00
Zlatan Vasović
e3d799fca3
';' isn't needed
2013-12-13 23:15:02 +01:00
Tobias Lindig
37b2c8a812
add dist files.
2013-12-13 12:27:56 +01:00
Tobias Lindig
b7bf212995
use @zindex-modal for .modal and @zindex-modal-background for .modal-backdrop.
...
removed z-index for .modal-dialog, it was not necessary because the parent element (.modal) already has a z-index.
2013-12-13 12:24:20 +01:00
Mark Otto
5f9ecc7351
-ms-transform is for IE9 only, IE10+ don't require it
2013-12-12 23:01:11 -08:00
Mark Otto
0e6d34f24f
Merge pull request #11819 from janpanschab/ms-transform-origin
...
Transform-origin mixin for IE
2013-12-12 22:59:08 -08:00
Chris Rebert
2d693def43
Merge pull request #11863 from twbs/update-osx
...
Sauce tests: update to later browsers supported by OS X 10.9
2013-12-12 22:16:31 -08:00
Chris Rebert
56d89ed7ae
Sauce tests: update to later browsers supported by OS X 10.9
2013-12-12 21:58:44 -08:00
Mark Otto
0cb570724d
quotes
2013-12-12 18:10:58 -08:00
Mark Otto
d2d2f77ffe
text update
2013-12-12 15:21:49 -08:00
Mark Otto
885d14b042
move icons to partial
2013-12-12 15:21:34 -08:00
Mark Otto
d704bf0a52
just column width, not max
2013-12-12 14:59:25 -08:00
Mark Otto
0b4efcda90
more docs homepage cleanup
2013-12-12 14:57:43 -08:00
mrasscha
ce39cbe6fa
Issue #11852 : create a new variable for the list group active item link text.
2013-12-12 20:48:08 +01:00
Mark Otto
f8a78d7de7
homepage images
2013-12-12 10:28:43 -08:00
Mark Otto
da24a3e118
typo
2013-12-12 10:28:37 -08:00
Chris Rebert
730ccd2a20
Merge pull request #11859 from dzwillia/add_dropdown_caret_color
...
Add @dropdown-caret-color variable back to variables.less
2013-12-12 10:02:53 -08:00
dzwillia
4b47c60835
Added @dropdown-caret-color variable back to variables.less (deprecated)
2013-12-12 12:53:59 -05:00
Mark Otto
4fc2907723
Merge branch 'master' into docs_derp
...
Conflicts:
docs-assets/css/docs.css
docs-assets/js/application.js
2013-12-11 22:39:03 -08:00
Mark Otto
0e8baab34a
more homepage and sidenav overhaul
2013-12-11 22:37:59 -08:00
Mark Otto
fbf31f965e
Add new template, Cover
2013-12-11 16:45:41 -08:00
Mark Otto
9966d035cd
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-11 10:52:55 -08:00
Mark Otto
a3a2525124
Fixes #11837 : grid containers are fixed width now, no longer max-width
2013-12-11 10:52:47 -08:00
Mark Otto
bdd0890c0f
Merge pull request #11841 from ZDroid/breadcrumbs
...
Use variables for breadcrumb padding
2013-12-11 10:48:51 -08:00
Mark Otto
5ec2b4b255
Merge pull request #11839 from XhmikosR/readme
...
Clarify Windows workarounds.
2013-12-11 10:47:54 -08:00
Zlatan Vasović
2547f1e20f
Use variables for breadcrumb padding
2013-12-11 14:36:26 +01:00
Zlatan Vasović
27859f6b8f
Improve pager customization
2013-12-11 14:25:21 +01:00
Chris Rebert
f3077ee424
Merge pull request #11838 from XhmikosR/customizer
...
customizer.js: Remove a workaround for older less.js.
2013-12-11 03:53:44 -08:00
XhmikosR
caa3d53dcb
customizer.js: remove a workaround for older less.js.
2013-12-11 13:27:23 +02:00
XhmikosR
6355832e90
Clarify Windows workarounds.
2013-12-11 12:57:18 +02:00
Mark Otto
2bc08190ec
Combine updates to Windows Jekyll stuff
2013-12-10 19:43:52 -08:00
Mark Otto
f32ef36daf
Merge pull request #11830 from XhmikosR/jekyll-windows
...
Update Jekyll on Windows info
2013-12-10 19:40:51 -08:00
Mark Otto
352b6883e9
Merge pull request #11832 from twbs/run_jekyll_on_windows
...
Help Windows users install Jekyll
2013-12-10 19:40:31 -08:00
Julian Thilo
1d56211653
Help Windows users install Jekyll
2013-12-11 00:13:02 +01:00
XhmikosR
b9f12a5637
README.md: mention an alternative workaround for the jekyll issue on Windows.
2013-12-11 00:06:25 +02:00
XhmikosR
fc3e7433c2
Update README.md.
...
Mention that Python needs to be in PATH for Pygments to work and thus jekyll not fail.
2013-12-11 00:06:25 +02:00
Scott Plumlee
bbe551044c
Allow listbox AIRA role on dropdown component.
2013-12-10 14:17:32 -05:00
Mark Otto
1bce8c9301
Merge pull request #11818 from XhmikosR/less.js
...
Update less.js to v1.5.1.
2013-12-10 10:03:33 -08:00
Mark Otto
52c87b30a9
Merge pull request #11812 from tlindig/load_grunt_tasks
...
Build process: use module "load-grunt-tasks" to load grunt tasks
2013-12-10 10:02:01 -08:00
Jan Panschab
3e0366a3df
transform origin mixin for explorer
2013-12-10 17:15:41 +01:00
XhmikosR
11180e0fa7
Update less.js to v1.5.1.
...
This fixes an error with `&:extend(.clearfix all)` when using the customizer.
2013-12-10 18:09:14 +02:00
Tobias Lindig
3b5e0c9a3c
hide space characters in input-group-btn to fix segmented buttons double border
2013-12-10 16:47:12 +01:00
Tobias Lindig
3583aa2774
correct indentation
2013-12-10 14:47:50 +01:00
Tobias Lindig
9f12f840b9
Buildprocess: use module "load-grunt-tasks" to load grunt tasks directly from the package.json
2013-12-10 10:28:44 +01:00
XhmikosR
5749039f8d
Remove unused variables.
2013-12-10 10:11:10 +02:00
Mark Otto
a6b5c7db12
Merge pull request #11809 from twbs/enable-LESS-strictMath
...
enable strictMath in grunt-contrib-less config
2013-12-09 18:16:18 -08:00
Chris Rebert
95992ef7e9
enable strictMath in grunt-contrib-less config
2013-12-09 16:27:42 -08:00
Chris Rebert
28d8be1634
Merge pull request #11808 from twbs/strict-math-fixes
...
more LESS strictMath fixes
2013-12-09 16:20:26 -08:00
Chris Rebert
ab29b1a335
misc strictMath compliance fixes
2013-12-09 16:14:44 -08:00
Chris Rebert
9664f8da58
add parens around arithmetic in recursive mixin calls to comply with LESS strictMath
...
<3 @seven-phases-max for helping to confirm & debug this
X-Ref: https://github.com/less/less.js/issues/1725
2013-12-09 16:02:24 -08:00
Chris Rebert
88d8cd90e2
Merge pull request #11807 from twbs/stricter-math
...
improve compliance with LESS's strictMath
2013-12-09 15:37:56 -08:00
Chris Rebert
10e74a94e6
improve compliance with LESS's strictMath
2013-12-09 15:35:13 -08:00
Chris Rebert
9e38e25534
enable CSS source maps in grunt-contrib-less
2013-12-09 14:29:19 -08:00
Mark Otto
25ec09f06a
Merge pull request #11790 from twbs/drop_recess_for_less
...
Drop grunt-recess for grunt-contrib-less
2013-12-09 11:30:10 -08:00
Mark Otto
d466d527a4
Undo merge of #11778 and use cleancss min option
2013-12-09 00:12:11 -08:00
Mark Otto
b9b17bc72b
grunt
2013-12-09 00:09:52 -08:00
Mark Otto
de218bbba8
Merge branch 'pr/11779' into drop_recess_for_less
...
Conflicts:
Gruntfile.js
package.json
2013-12-08 23:56:22 -08:00
Mark Otto
7d4171ccd1
Merge pull request #11792 from twbs/list-group-nest
...
more nesting in .list-group-item-variant mixin
2013-12-08 23:55:03 -08:00
Mark Otto
ea61a19a04
Merge branch 'pr/11778' into drop_recess_for_less
...
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.min.css
2013-12-08 23:48:07 -08:00
Chris Rebert
9ceff60057
more nesting in .list-group-item-variant mixin
2013-12-08 23:34:24 -08:00
Mark Otto
0016c17f93
Switch to &:extend(.clearfix all) for clearfix mixin
...
Original discussion:
https://github.com/less/less.js/issues/1437#issuecomment-21383639 .
Since we’re switching to `grunt-contrib-less`, we can take advantage of
newer LESS features than what RECESS supported. Included in that is the
ability to `:extend`, and not only that, but `:extend(.mixin-name
all)`. By doing so, we remove duplicate CSS for all our elements that
were being clearfix-ed.
Fixes #8947 , #8968 , #8991 , #9257 , #9268 , #9291 , #9430 , #9604 , #9686 ,
#9929 , #10731 , #10793 , #11305 , #11498 , #11533 , #11570 , #11604 , #11652 .
(dem issues, tho)
2013-12-08 23:18:28 -08:00
Mark Otto
2a4621b71f
Merge branch 'master' into drop_recess_for_less
...
Conflicts:
dist/css/bootstrap.min.css
2013-12-08 23:00:01 -08:00
Mark Otto
e4c1ef7c6d
more closely align property order with recess
2013-12-08 22:55:09 -08:00
Mark Otto
0991c7c341
specify block indent as numeral to prevent fubared media query output
2013-12-08 22:33:24 -08:00
Mark Otto
e90ce1c0d5
single array == no rogue spaces
2013-12-08 22:32:07 -08:00
Mark Otto
4540f9e2d2
derp, don't sort min /cc @cvrebert
2013-12-08 22:16:43 -08:00
Mark Otto
aae9c2d136
merge, compile
2013-12-08 22:11:46 -08:00
Chris Rebert
dbe95f027d
fixups to csscomb grunt task
2013-12-08 20:46:12 -08:00
Mark Otto
6df909ad9b
Fixes #11786 : Nest media queries within print utilities for mixin-friendliness
2013-12-08 19:19:06 -08:00
Mark Otto
6b55e93570
adding json
2013-12-08 19:17:43 -08:00
Mark Otto
f1cb57c8c2
restore original options value
2013-12-08 19:12:37 -08:00
Mark Otto
c0200426ee
Drop grunt-recess for grunt-contrib-less & co
2013-12-08 19:09:27 -08:00
Mark Otto
768f8b00f3
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-08 17:50:26 -08:00
Chris Rebert
ae0d48057e
fix #11787 : document stateful button JS
2013-12-08 17:42:59 -08:00
Mark Otto
cdb7d9839e
grunt
2013-12-08 17:21:37 -08:00
Mark Otto
b98d6ed12b
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-08 17:19:45 -08:00
Mark Otto
e1247e3edc
Match customizer banner to Gruntfile banner
2013-12-08 17:17:51 -08:00
Mark Otto
997a1f4ed2
fix dependency mapping of buttons and button-groups in customizer
2013-12-08 17:17:04 -08:00
Chris Rebert
1f35b6ec5c
fix <button>s with .btn but missing accompanying .btn-*
2013-12-08 17:15:26 -08:00
Julian Thilo
bab736c7d7
Fix typo in new author meta tag
2013-12-08 22:39:29 +01:00
Mark Otto
5eeaf114cc
Merge pull request #11780 from ZDroid/grunt-dev
...
Don't ignore Gruntfile, it's required for compile
2013-12-08 10:47:24 -08:00
Zlatan Vasović
a5d9b358ab
Don't ignore Gruntfile, it's required for compile
2013-12-08 13:36:52 +01:00
XhmikosR
cbfbf1b2dd
Add csslint support.
2013-12-08 13:23:25 +02:00
XhmikosR
fdc5d1dc34
Minify css with clean-css.
2013-12-08 13:05:10 +02:00
Zlatan Vasović
77bc82d486
Add .animation-*() mixins
2013-12-08 11:54:04 +01:00
Mark Otto
b5613c9af5
Merge pull request #10709 from XhmikosR/quotes
...
Quotes
2013-12-08 02:52:15 -08:00
XhmikosR
eca8ff3803
Use single quotes consistently.
2013-12-08 12:44:14 +02:00
Zlatan Vasović
0c457d48f8
Drop redundant module import
2013-12-08 11:24:47 +01:00
Mark Otto
ed63dfd8d3
Merge pull request #11739 from XhmikosR/lint-assets
...
Lint docs-assets/js/application.js and docs-assets/js/customizer.js.
2013-12-08 02:16:16 -08:00
Mark Otto
e349fb2114
fix validation failure
2013-12-08 02:14:43 -08:00
Mark Otto
1f9bfa89dc
Fixes #11741 : Don't set headings font-family again, just use inherit
2013-12-08 02:14:24 -08:00
Mark Otto
c37b710e85
Merge branch 'master' into pr/11744
...
Conflicts:
dist/css/bootstrap.min.css
2013-12-08 02:00:37 -08:00
Mark Otto
b5008ebf9c
add vertical-align back to where it's necessary since we reset from block to inline-block on several inputs
2013-12-08 01:59:44 -08:00
Mark Otto
e43e87b2f3
Merge pull request #11748 from bganicky/patch-1
...
Updated .scale() mixin so that it accepts optional vertical scale factor...
2013-12-08 01:49:38 -08:00
Mark Otto
12500047f9
Merge branch 'master' into pr/11750
...
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
2013-12-08 01:45:42 -08:00
Mark Otto
475bbd4d38
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-08 00:17:17 -08:00
Mark Otto
d70f4e895c
image compression
2013-12-07 23:49:03 -08:00
Mark Otto
adf8209b9c
Merge pull request #11772 from KostyaTretyak/correction
...
Fixed some errors in the docs javascript.html
2013-12-07 23:29:36 -08:00
Mark Otto
90cbfc76e4
Add new template, Cover
2013-12-07 23:23:41 -08:00
kostyatretyak
34070af4a3
Merge branch 'master' of https://github.com/twbs/bootstrap into correction
2013-12-08 09:13:22 +02:00
kostyatretyak
6145cc026d
Fixed some errors in the docs javascript.html
2013-12-08 09:11:43 +02:00
Mark Otto
6273604601
Add .container-fluid variation for full-width containers and layouts
...
/cc #10711 #9862
2013-12-07 20:52:51 -08:00
Mark Otto
73bc7d9f12
Add new template, Dashboard
2013-12-07 20:51:25 -08:00
Mark Otto
5fdd917918
improve icon display on narrow devices
2013-12-07 16:28:29 -08:00
Mark Otto
5e6f9b9a37
prevent horizontal scroll on components
2013-12-07 16:22:43 -08:00
Mark Otto
74408de619
Shorter download text because narrow viewports
2013-12-07 16:22:00 -08:00
Mark Otto
0bf5202b92
Fixes #11729 : Show code snippets on mobile views
2013-12-07 16:21:46 -08:00
Mark Otto
9edec7ed21
Fixes #11756 : Mention document mode checking ability in IE comaptibility modes
2013-12-07 15:57:17 -08:00
Mark Otto
a9b86cbfde
Merge branch 'pr/11138'
...
Conflicts:
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
2013-12-07 14:10:41 -08:00
Mark Otto
07de53c644
Contextual list group cleanup
...
* Adds nav link to sidebar for contextual classes
* Refactors to use prefixed classes, like .list-group-item-info, instead of chained classes
* Adds default and linked variations to example in docs
2013-12-07 14:09:03 -08:00
Mark Otto
a1f737b436
grunt dist after adding .text-justify
2013-12-07 12:19:17 -08:00
Mark Otto
bfd8f8c83a
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-07 12:18:52 -08:00
Mark Otto
b1215d1b2e
Fixes #11193 : Add kbd element styles to indicate user input via keyboard
2013-12-07 12:18:13 -08:00
Mark Otto
a691d54436
Merge pull request #11675 from GraceNut/feature/text-justify
...
Added text-justify class to type.less
2013-12-07 11:58:31 -08:00
Mark Otto
fe58357df1
Fixes #10884 : Adds .info variant to contextual table classes
2013-12-07 11:56:35 -08:00
Mark Otto
c07632e4e8
Reorder button and table variants for consistent order
2013-12-07 11:47:37 -08:00
Mark Otto
107b334d34
Fixes #11766 : Use color var for background on badges in buttons to restore proper background to default button badge
2013-12-07 11:45:11 -08:00
Mark Otto
2b4fa90902
grunt dist
2013-12-07 11:44:32 -08:00
Mark Otto
cc1f95652b
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-07 11:41:02 -08:00
Mark Otto
775c29fef6
Fixes #11764 : Add meta data to docs for description, keywords, and authors
2013-12-07 11:40:08 -08:00
Mark Otto
94a5413ec7
Merge pull request #11757 from ZDroid/darken-toggle
...
Darken navbar toggle icon bar to meet WCAG
2013-12-07 11:34:03 -08:00
Mark Otto
4032dd0f26
grunt
2013-12-07 11:32:39 -08:00
Mark Otto
73da46c8bb
Fixes #11760 : Remove mailing list links from readme and about pages
...
Links are dead now since Google blacklisted the group for massive spam,
which they could be of no help in resolving. We’ll have a new official
forum for discussions soon folks <3.
2013-12-07 11:22:38 -08:00
Mark Otto
4b84acb9a4
Merge pull request #11765 from ZDroid/docs-min-js
...
Load minified Bootstrap JS code
2013-12-07 11:09:43 -08:00
Zlatan Vasović
8087f95ca4
Load minified Bootstrap JS code
2013-12-07 10:27:28 +01:00
Mark Otto
b441632db1
Merge pull request #11761 from twbs/jscs
...
add JavaScript Code Style checker integration
2013-12-06 19:33:53 -08:00
XhmikosR
2fc2fe75bd
Lint docs-assets/js/application.js and docs-assets/js/customizer.js.
2013-12-07 05:05:13 +02:00
XhmikosR
f4087df47e
Remove incompatible properties.
2013-12-07 04:52:20 +02:00
Chris Rebert
c1dae1e13c
integrate JSCS
2013-12-06 17:26:07 -08:00
Chris Rebert
351f86e1db
fix some JS to pass jscs
2013-12-06 17:23:45 -08:00
Chris Rebert
4be126e014
Merge pull request #11745 from XhmikosR/function-spaces
...
Be consistent with function () spaces
2013-12-06 16:43:09 -08:00
Chris Rebert
650279f703
Merge pull request #11758 from ZDroid/rm-brstck-bower
...
Drop browserstack.json from bower.json ignore
2013-12-06 13:45:58 -08:00
Zlatan Vasović
c78f3b2712
Drop browserstack.json from bower.json ignore
2013-12-06 22:45:17 +01:00
Zlatan Vasović
78b43d4c99
Darken icon bar to meet WCAG
2013-12-06 22:34:29 +01:00
Mark Otto
01a1c41d49
Merge pull request #11755 from twbs/track-customize-js
...
track customize.js so that customizer works on GitHub Pages site
2013-12-06 13:21:00 -08:00
Chris Rebert
c545312bd6
need customize.js to be tracked for it to work on GitHub Pages
...
follow-up to #11738
2013-12-06 11:35:58 -08:00
Chris Rebert
2e9cde6fd9
grunt
2013-12-06 11:33:18 -08:00
Mark Otto
dc34c8a206
Merge pull request #11738 from XhmikosR/min-assets
...
Minify docs-assets too.
2013-12-06 11:27:19 -08:00
Chris Rebert
e90e602b53
Merge pull request #11742 from vincentchan/master
...
Added link to Bootstrap in French (in about.html)
2013-12-06 09:44:15 -08:00
Chris Rebert
5e8db4ad11
Merge pull request #11740 from XhmikosR/trailing-spaces
...
Remove trailing spaces
2013-12-06 09:42:39 -08:00
Luke Noel-Storr
b92bee99ef
reverted changes in commit 96109d3 which seemed to break conditional classes in striped tables (ignoring the comment above that the previous rules were needed for just this purpose)
...
fixes issue twbs/bootstrap#11728
2013-12-06 14:11:58 +00:00
Bohdan Ganicky
9ce7e5620c
Updated .scale() mixin so that it accepts optional vertical scale factor parameter.
2013-12-06 14:09:55 +01:00
XhmikosR
5e2ef69e1c
Use a space before functions' bracket consistently.
2013-12-06 12:43:48 +02:00
XhmikosR
4aad52797c
Use a space after function consistently.
2013-12-06 12:43:48 +02:00
Vincent Chan
b9ae594ca4
Adding Bootstrap in French
2013-12-06 18:33:20 +08:00
XhmikosR
68a6e57b15
bower.json: remove trailing spaces.
2013-12-06 11:32:57 +02:00
XhmikosR
3de4f23ea2
Minify docs-assets too.
2013-12-06 11:25:29 +02:00
Chris Rebert
7b06538c91
Merge pull request #11723 from stof/patch-1
...
Added the removal of tab-content and tab-pane in the migration guide
2013-12-05 16:53:15 -08:00
Chris Rebert
3b75d64767
Merge pull request #11733 from KostyaTretyak/edit
...
Fixed some errors in the documentation
2013-12-05 16:50:03 -08:00
kostyatretyak
dde53a56e0
This is error?
2013-12-06 02:28:42 +02:00
Derek Kent
b8b250a5d2
Don't exclude fonts from bower installs
...
Excluding fonts/ from bower installs causes glyphicons to be
unavailable to projects using development Bootstrap LESS files.
2013-12-05 19:05:32 -05:00
kostyatretyak
4ec13704d2
Fixed another small error
2013-12-06 02:03:35 +02:00
kostyatretyak
3ae7e0afe9
Merge branch 'master' of https://github.com/twbs/bootstrap into edit
2013-12-06 01:36:53 +02:00
Mark Otto
1bac76af28
Merge branch 'master' into gh-pages
2013-12-05 08:56:33 -08:00
Christophe Coevoet
813a4fafb6
Added the removal of tab-content and tab-pane in the migration guide
2013-12-05 17:45:22 +01:00
Mark Otto
6d03173a1a
Merge pull request #11718 from KostyaTretyak/once
...
Added link to Ukrainian translation website (in about.html)
2013-12-05 08:09:10 -08:00
Lukáš Doležal
6e9efb2024
Use document scroll height instead of offset height to support body with absolute height
2013-12-05 16:28:31 +01:00
kostyatretyak
c7e45fa4a7
Added links to Ukrainian translation website
2013-12-05 12:33:55 +02:00
Mark Otto
aac4f0189e
one last grunt
2013-12-04 22:54:03 -08:00
Mark Otto
0a5aa8e0a3
Merge pull request #11714 from ZDroid/redundant-comment
...
Remove redundant, duplicate comment
2013-12-04 22:52:12 -08:00
Zlatan Vasović
01afe84b31
Remove redundant, duplicate comment
2013-12-05 07:43:50 +01:00
Mark Otto
b18d3fb80f
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-04 22:34:25 -08:00
Mark Otto
45930acdf7
Fixes #11610 : Add @grid-float-breakpoint-max to better link navbar behavior across viewports and improve customization.
...
Also addresses #10371 , #10395 , and #10465 .
2013-12-04 22:32:56 -08:00
Mark Otto
42bee1ddd5
Merge pull request #11671 from XhmikosR/updates
...
Update 3rd party asset libraries
2013-12-04 21:58:00 -08:00
Mark Otto
cf81cb60ef
Merge branch 'master' into gradient-prefix-cleanup
...
Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
2013-12-04 21:23:09 -08:00
Mark Otto
8c5dc542a5
grunt
2013-12-04 21:22:24 -08:00
Mark Otto
a45d839874
Fixes #11712 : Better support for .table-responsive within .panel's
2013-12-04 21:13:33 -08:00
Mark Otto
66f9c7d6d5
Fixes #11436 : mention in docs that .container isn't nestable; update docs to mention width, not max-width
2013-12-04 21:10:13 -08:00
Mark Otto
dd28ecd0d5
Merge pull request #11710 from JoahG/bootstrap-thumb
...
Updates Jumbotron thumbnail
2013-12-04 20:45:57 -08:00
Chris Rebert
02df15db56
Merge pull request #11709 from mdxs/patch-1
...
Dropping unused variable in dropdown.js
2013-12-04 10:50:50 -08:00
Cyrus Stoller
4031f5ee82
Add a migration tip for .label-important to .label-danger
2013-12-04 10:42:58 -08:00
Joah Gerstenberg
89061b0517
Updates Bootstrap thumbnail
2013-12-04 06:26:12 -06:00
mdxs
f7d21d6919
Dropping unused variable in dropdown.js
...
Dropping an unused variable in the Dropdown function inside the `dropdown.js` code.
There are no new/changed unit tests, as there are no feature/bug changes requiring new test cases.
For the record: I agree to dual-license this contribution under the Apache 2 and MIT licenses.
2013-12-04 11:15:48 +01:00
Chris Rebert
7b945ad296
Merge pull request #11705 from cyrusstoller/migration-guide
...
Add a migration tip for .label to .label-default
2013-12-04 00:51:13 -08:00
Cyrus Stoller
149e7efb51
Add a migration tip for .label to .label-default
2013-12-04 00:41:05 -08:00
Mark Otto
a42e9163cb
Merge branch 'master' into responsive-visibility-table
...
Conflicts:
dist/css/bootstrap.min.css
2013-12-03 22:58:25 -08:00
Mark Otto
ed0d556847
Merge pull request #11697 from twbs/btn-xs-10979
...
fix .btn-group-xs portion of #10979
2013-12-03 22:55:11 -08:00
Chris Rebert
f8e0f16663
fix broken link in CONTRIBUTING.md
2013-12-03 22:08:26 -08:00
Chris Rebert
ed2360d05e
Merge pull request #11701 from twbs/sauce-labs
...
switch to Sauce Labs for our cross-browser JS unit testing needs
2013-12-03 21:58:43 -08:00
Chris Rebert
bd9332a58a
switch to Sauce Labs for our cross-browser JS unit testing needs
...
Fixes #11087
2013-12-03 21:57:22 -08:00
kostyatretyak
7472c01ce2
Corrected a small error in the documentation
2013-12-04 06:21:54 +02:00
Chris Rebert
1d20611d54
fix invalid HTML in components.html
...
type="button" doesn't make sense for an <a>
2013-12-03 20:10:55 -08:00
Chris Rebert
4a45650026
fix .btn-group-xs portion of #10979
2013-12-03 18:03:04 -08:00
awebdeveloper
3f1e4b92ee
-moz and old webkit syntax removed for gradients based on
...
http://caniuse.com/#search=grad
2013-12-03 14:13:55 -08:00
Chris Rebert
303f8a33c3
add <table> case to responsive-visibility mixin; see #10056
2013-12-03 13:57:28 -08:00
Chris Rebert
bac153127c
grunt
2013-12-03 13:54:56 -08:00
Chris Rebert
2d4ee18162
add comment regarding #11598
2013-12-03 13:31:47 -08:00
Chris Rebert
018a1d535b
Merge pull request #11691 from twbs/xs-grid-docs-fix
...
document that XS grid supports offsets and push/pull
2013-12-03 11:28:57 -08:00
Chris Rebert
7a9d9f7dc4
account for #11050 in the docs
2013-12-03 11:22:56 -08:00
Chris Rebert
199872418c
reference root issue in explanatory comment
2013-12-03 11:14:13 -08:00
Chris Rebert
f2dab82d30
add .gitattributes file to enforce Unix newlines within the repo
2013-12-03 11:06:31 -08:00
Tobias Lindig
5a826a65b2
Gruntfile.js: Set line feed char to '\n' to get same result on all platforms.
2013-12-03 10:49:37 -08:00
Chris Rebert
a7ceefc41b
Merge pull request #11690 from lipis/patch-2
...
Get rid of empty line before the last closing bracket
2013-12-03 10:44:15 -08:00
Lipis
92a624a31c
Get rid of empty line before the last closing bracket
2013-12-03 15:03:07 +01:00
Joah Gerstenberg
0fcaca86b5
Fixes #11669 - Adds smooth modal scrolling on iOS by default
2013-12-02 14:56:23 -06:00
Haley
3a65b2c11f
Added text-justify class to type.less
2013-12-02 13:29:54 -06:00
XhmikosR
b8928340f4
Update filesaver.js to the latest git.
2013-12-02 14:15:57 +02:00
XhmikosR
c56e63e967
Update jszip.js to the latest git.
2013-12-02 14:13:10 +02:00
XhmikosR
4392d43d7c
Update holder.js to v2.2.
2013-12-02 14:12:57 +02:00
Zlatan Vasović
2b56ff0461
Reduce size of the visibility styles
2013-12-02 07:50:17 +01:00
Mark Otto
cc6951fa15
Merge pull request #10662 from kevinlisota/thumbnail-images
...
add responsive CSS to hyperlinked images when thumbnail caption markup used
2013-12-01 21:18:41 -08:00
Mark Otto
b636756e53
Merge pull request #11667 from neilhem/master
...
replace double quotation marks with single in code examples
2013-12-01 20:48:43 -08:00
Rakhat Jabagin
ab73ff1828
replace double quotation marks with single in code examples
2013-12-02 10:39:53 +06:00
Mark Otto
4876cbeef8
Merge branch 'master' into pr/11412
...
Conflicts:
dist/js/bootstrap.min.js
2013-12-01 20:27:30 -08:00
Mark Otto
1444a3ca63
grunt dist
2013-12-01 20:27:14 -08:00
Mark Otto
37e46ec2b8
add comment
2013-12-01 20:27:09 -08:00
Mark Otto
561aff7942
Merge pull request #11499 from bassjobsen/patch-3
...
fix navbar dropdown window resize bug
2013-12-01 20:18:40 -08:00
Mark Otto
8a74264344
bump version numbers to 3.0.3
2013-12-01 19:31:52 -08:00
Mark Otto
118e901eb1
grunt
2013-12-01 19:30:10 -08:00
Mark Otto
5a0365524d
Rework navbar padding and margins for right aligned last-child elements
...
This slight reworking of the navbar spacing was brought about by a
problem noted in #11530 : use of `.navbar-form.navbar-right` leaves an
extra 15px of space on the right.
Here’s what’s new:
* Removed the `padding` on `.navbar-collapse` within static top, fixed
top, and fixed bottom navbars. Meaning, it’s still there for the
default navbar. This was the root cause of the extra 15px padding for
navbar forms.
* As part of this, I also replaced the existing negative margin
overrides for last-child elements with more contextual ones within
their sub-components.
Overall not too different, but should be more effective now and easier
to work with now.
For example of new changes, see http://jsbin.com/odeSiSo/1/ .
2013-12-01 19:27:33 -08:00
Mark Otto
25bc5322aa
grunt
2013-12-01 18:35:58 -08:00
Mark Otto
d417fcecea
Fixes #11357 : Vertically center sm and xs buttons in the navbar
2013-12-01 18:13:27 -08:00
Mark Otto
33160d5043
Fixes #9927 : Update non-responsive example to prevent .navbar-collapse border from increasing height and increase specificity of nav selectors to keep dropdowns looking the same
2013-12-01 18:06:57 -08:00
Mark Otto
948da5ce9a
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-01 17:25:37 -08:00
Mark Otto
dd05c0e0a7
fixes #11508 : mention in docs that inline forms only work at 768px and up
2013-12-01 13:51:17 -08:00
Mark Otto
17dee30892
Merge pull request #11662 from ZDroid/deprecation-fix
...
Use mixin instead of whole code
2013-12-01 11:16:17 -08:00
Mark Otto
556d6cef3e
Fixes #10941 : Fix Glyphicons path for those importing bootstrap.less from another directory
2013-12-01 00:20:47 -08:00
Zlatan Vasović
ed29a99df4
Use mixin instead of whole code
2013-12-01 09:18:27 +01:00
Mark Otto
8dfe93d0b9
Add docs example to go with #11536
2013-11-30 23:38:39 -08:00
Mark Otto
53047fa587
Merge branch 'master' into pr/11536
...
Conflicts:
dist/css/bootstrap.min.css
2013-11-30 23:35:56 -08:00
Mark Otto
57070dcf45
grunt
2013-11-30 23:35:08 -08:00
Mark Otto
48269dcd28
Fixes #11658 : Increase min-height of .radio and .checkbox for horizontal forms to ensure alignment of content below
2013-11-30 23:17:43 -08:00
Mark Otto
841da88f3f
Remove browser default top margin from dl elements
2013-11-30 23:08:41 -08:00
Mark Otto
cf40b5db60
Fixes #11623 : Reset position to static for grid columns within tables to unfuck borders in IE9/10 and Firefox
2013-11-30 23:04:55 -08:00
Mark Otto
c6244a94d0
Shorten sticky footer examples footer content to prevent wrapping
2013-11-30 22:41:43 -08:00
Mark Otto
22da6fcfb2
grunt
2013-11-30 21:17:53 -08:00
Mark Otto
a127f3921e
Fixes #10716 : Update what's included docs to add info on both download options
2013-11-30 21:05:39 -08:00
Mark Otto
ed98ac7560
Merge branch 'master' of github.com:twbs/bootstrap
2013-11-30 16:37:49 -08:00
Mark Otto
6bc09dd949
Fixes #11268 : Account for badges within buttons by matching background to text color and text color to background
2013-11-30 16:29:52 -08:00
Mark Otto
5283e518cc
Merge pull request #11217 from ZDroid/nest
...
Add quick fix to labels and badges in buttons
2013-11-30 16:26:38 -08:00
Mark Otto
359ac8f66a
grunt
2013-11-30 16:21:19 -08:00
Mark Otto
67d4e3323d
Fixes #11277 : Drop the abbr element from the .initialism selector
2013-11-30 16:18:07 -08:00
Mark Otto
9bbdb87150
Fixes #11420 : Update migration guide on split of .visible-/.hidden-desktop into .visible-/.hidden-md and .visible-/.hidden-lg
2013-11-30 16:16:24 -08:00
Mark Otto
6a2ca0ab3a
Fixes #11444 : Use @navbar-padding-vertical for nav links padding
2013-11-30 16:08:49 -08:00
Mark Otto
7aa6b4190b
Fixes #11402 : Set width: auto; to select.form-control within .form-inline
2013-11-30 15:57:25 -08:00
Mark Otto
d2f8b5327b
Fixes #11515 : Reorder the headings with body text and text emphasis classes
2013-11-30 14:58:35 -08:00
Mark Otto
21e2ae9489
Fixes #11544 : Add color: inherit; to .panel-title to ensure proper text color when customizing @headings-color
2013-11-30 14:53:54 -08:00
Mark Otto
82bbccde9b
Merge branch 'master' into pr/11648
...
Conflicts:
dist/css/bootstrap.min.css
less/grid.less
2013-11-30 13:09:55 -08:00
Mark Otto
5611320101
Merge branch 'master' of github.com:twbs/bootstrap
2013-11-30 12:52:45 -08:00
Mark Otto
853b69f2df
Fixes #11351 : Correct grid class reset on input groups by using attribute selector, not an old class from v3 betas
2013-11-30 12:52:08 -08:00
Mark Otto
84f536e02a
Merge pull request #11398 from thelukemcdonald/master
...
Don't print .clearfix() comment references
2013-11-30 12:47:07 -08:00
Mark Otto
a52e528d27
Fix up new margins on modals by not setting auto until screen-sm-min
2013-11-30 11:56:06 -08:00
Mark Otto
265118a6a0
Merge pull request #11657 from ZDroid/homepage
...
Use pkg.homepage
2013-11-30 11:46:22 -08:00
Zlatan Vasović
ab87085625
Use pkg.homepage
2013-11-30 16:11:41 +01:00
Mark Otto
0d81c4e339
Merge pull request #11124 from StevenBlack/issue.11098
...
Fixes issue #11098 -- Button documentation.
2013-11-30 00:58:39 -08:00
Mark Otto
080aa7f5c8
Merge branch 'master' into pr/11299
...
Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
2013-11-30 00:55:00 -08:00
Mark Otto
819e920d16
Merge branch 'master' of github.com:twbs/bootstrap
2013-11-30 00:43:27 -08:00
Mark Otto
a7a9dcaeb2
Alternate fix for #11303 : add link to site in banner and remove @mdo and @fat usernames from it
2013-11-30 00:42:36 -08:00
Mark Otto
95487f75d1
Merge pull request #11329 from ZDroid/patch-1
...
Add 'in' to complete thought
2013-11-30 00:40:32 -08:00
Mark Otto
143427b8ae
Merge pull request #11330 from maxwellium/patch-1
...
fixing offcanvas example for chrome
2013-11-30 00:39:00 -08:00
Mark Otto
a15a6dfa96
Merge pull request #11369 from ssorallen/speedier-js-loading
...
Speedier jQuery and Twitter widgets.js
2013-11-30 00:32:39 -08:00
Mark Otto
bb4a39d51c
Merge branch 'master' into pr/11388
...
Conflicts:
dist/css/bootstrap.min.css
2013-11-30 00:26:53 -08:00
Mark Otto
e6eb798178
Merge pull request #11434 from ZDroid/fix-11433
...
Fix #11433 : Better documentation for validation states
2013-11-30 00:23:16 -08:00
Mark Otto
938d40fc20
Merge pull request #11432 from masterbee/WCAG2-color-contrast
...
Corrected color contrast to WCAG 2.0 AA (Accessibility Tweak) - Forms and Alerts
2013-11-30 00:21:47 -08:00
Mark Otto
a06610a030
Merge pull request #11502 from 1000hz/patch-1
...
Add missing data namespace for dropdown
2013-11-29 23:55:43 -08:00
Mark Otto
5b137e5857
Merge pull request #11511 from ZDroid/fix-xs-comments
...
Fix comments for extra small grid
2013-11-29 23:46:35 -08:00
Mark Otto
f7b7cc3443
Merge pull request #11585 from thriqon/master
...
Issue #11550 : Easily copyable classes
2013-11-29 23:45:35 -08:00
Mark Otto
40f86af16a
Merge pull request #11617 from guybedford/master
...
include jspm package configuration
2013-11-29 23:43:01 -08:00
Mark Otto
8674228521
Merge branch 'pr/11493'
...
Conflicts:
dist/css/bootstrap.min.css
2013-11-29 23:30:26 -08:00
Mark Otto
9f0da54856
grunt to get dist files
2013-11-29 23:29:34 -08:00
Mark Otto
e4848286c8
Fix #10979 : Don't use .img-thumbnail as a mixin for .thumbnail to avoid dupe and unnecessary styles
2013-11-29 23:19:04 -08:00
Mark Otto
bf9f39270c
Fixes #11425 : Use margin instead of padding on .modal-dialog to enable click-thru to .modal-backdrop
2013-11-29 22:03:49 -08:00
Mark Otto
36b82c37ec
Implement #11174 to fix #10936 : increase height of large inputs to fix Firefox inconsistencies
2013-11-29 21:59:28 -08:00
Mark Otto
61c641ea05
fixes #10699 : use xs grid classes in regular thumbnail docs
2013-11-29 21:08:16 -08:00
Mark Otto
1e6c95cd5d
improve affix docs with step-by-step walk through of plugin behavior and required CSS
2013-11-29 20:39:00 -08:00
Mark Otto
7d456aef76
Update scrollspy docs to more clearly indicate usage
2013-11-29 20:25:07 -08:00
Mark Otto
a4c54b5e5d
Fixes #11390 : Add max-width to containers within jumbotrons to avoid horizontal scrollbar
2013-11-29 18:33:59 -08:00
Mark Otto
09cd5289ab
Fixes #11468 : Prevent default gradient on in Firefox for Android
2013-11-29 17:47:27 -08:00
Zlatan Vasović
702ad4c302
Remove redundant comments
2013-11-29 11:37:06 +01:00
Zlatan Vasović
08e41d769a
Add missing last column float
2013-11-29 08:37:54 +01:00
Mark Otto
b5f9cc2057
Merge branch 'master' into pr/11414
...
Conflicts:
dist/css/bootstrap.min.css
2013-11-28 15:55:17 -08:00
Mark Otto
0be94180b9
grunt
2013-11-28 15:45:45 -08:00
Mark Otto
d654f90502
Fixes #10147 : Remove outline from carousel controls on focus
2013-11-28 15:37:11 -08:00
Mark Otto
9d939080e6
Fixes #10483 and #10357 : Make .container mixin-friendly by moving the width declarations within one class
2013-11-28 14:22:31 -08:00
Mark Otto
c13524e7e0
Fixes #11553 : Prevent double border on tables in panels without thead content
2013-11-28 12:49:51 -08:00
Mark Otto
9f68a5b241
Fixes #11516 : Invert dropdown divider border in navbars
2013-11-28 12:39:39 -08:00
Mark Otto
9d485db721
run grunt after last merge
2013-11-28 12:34:42 -08:00
Mark Otto
ec9d4708d2
Merge pull request #11551 from masterbee/outlinetweak
...
removed color treatment of outline for easier integration
2013-11-28 12:31:18 -08:00
Mark Otto
b7b72cc877
Merge branch 'master' into pr/11614
...
Conflicts:
dist/css/bootstrap.min.css
2013-11-28 11:57:12 -08:00
Mark Otto
56f4cf0316
Fixes #11634 : Add warning to docs to not combine icon classes with other elements
2013-11-28 11:38:28 -08:00
Mark Otto
594d0c700d
grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing
2013-11-28 11:33:00 -08:00
Mark Otto
2abaed9876
Merge pull request #11642 from tlindig/caret_color_fix
...
removed all caret border color settings.
2013-11-28 10:45:11 -08:00
Tobias Lindig
3d5e598e5c
add builded files from dist/
2013-11-28 18:40:15 +01:00
Tobias Lindig
ea78248608
removed all caret border color settings.
2013-11-28 17:41:43 +01:00
Mark Otto
9829c86f7c
run grunt
2013-11-26 15:21:27 -08:00
Chris Rebert
27abfba89f
Merge pull request #11616 from ZDroid/remove-window
...
Remove redundant 'window.'
2013-11-26 09:20:56 -08:00
Guy Bedford
ac6cfbbaad
include jspm package configuration
2013-11-26 12:10:06 +02:00
Zlatan Vasović
630fd1cff6
Remove redundant 'window.'
2013-11-26 08:43:26 +01:00
Jesse Mandel
bff8ba2b79
Fix for Issue #11411
2013-11-25 15:19:11 -08:00
Chris Rebert
fa710fdb09
Merge pull request #11612 from JerryChr/master
...
Removed unnecessary semicolon
2013-11-25 11:54:46 -08:00
Jerri Christiansen
bd44a4b5f3
Removed unnecessary semicolon
2013-11-25 20:41:00 +01:00
Chris Rebert
cad664e863
Merge pull request #11598 from ZDroid/customizer-breaks
...
Fix #11594
2013-11-23 12:17:32 -08:00
Chris Rebert
ebc91077f7
Merge pull request #11599 from westonplatter/explicit_fonts
...
explicitly call out font files
2013-11-23 12:10:33 -08:00
Weston Platter
a42d7ff319
explicitly call out font files
...
Using wildcards to specify fonts causes errors for other
npm modules, EG, https://github.com/blittle/bower-installer/issues/33 .
Additionally, it’s better to lock down files included in a
library.
2013-11-23 12:23:18 -07:00
Zlatan Vasović
dbbd49b4f8
Fix #11594
2013-11-23 18:29:27 +01:00
Chris Rebert
de2ab6453a
Merge pull request #11597 from ZDroid/deps-grunt-recess-kickup
...
Kick up grunt-recess dependency
2013-11-23 09:16:32 -08:00
Zlatan Vasović
4160ff0e44
Kick up grunt-recess dependency
2013-11-23 17:41:31 +01:00
Mark Otto
98980b0fb2
Merge branch 'master' into docs_derp
2013-11-22 22:09:04 -05:00
Mark Otto
37f3944bd9
finish up moving content, tweaking styles
2013-11-22 18:45:38 -05:00
Chris Rebert
4c246c0117
Merge pull request #11534 from twbs/doc-async-modals
...
document that modal show()/hide() return before animation finishes
2013-11-21 15:40:12 -08:00
Jonas Weber
62299240d8
Issue #11550 : Easily copyable classes
...
Removed all the periods. Tested in Chrome and Firefox
(current versions). In Chrome you get a stray newline when
triple-clicking, in Firefox it is clean.
fixes #11550
2013-11-21 22:59:12 +01:00
Chris Rebert
ccd564650a
add more missing role="form"-s
2013-11-21 12:02:54 -08:00
Chris Rebert
b34292ce82
Merge pull request #11567 from neilhem/master
...
add role form for horizontal form example
2013-11-21 11:49:24 -08:00
Chris Rebert
7ab6c2743b
Merge pull request #11578 from barraponto/patch-1
...
Make it clear there's a nested media element in the first example
2013-11-21 11:05:45 -08:00
Capi Etheriel
d873af8662
Make it clear there's a nested media element in the first example
2013-11-21 15:13:05 -02:00
Rakhat Jabagin
bf62a6241a
add role form for horizontal form example
2013-11-21 12:04:48 +06:00
Mario Bonito
55af003669
removed color treatment of outline
2013-11-20 16:44:44 -05:00
Chris Rebert
6ed5a844a8
Merge pull request #11172 from yokomizor/git_ignore_bower_components
...
added bower_components to .gitignore
2013-11-19 14:15:09 -08:00
Zlatan Vasović
8f589c6cfd
Add 'in' to complete thought
...
Simple grammar fix.
2013-11-19 13:29:19 +01:00
aentan
ba4c5dae9b
add support for button dropdowns in justified button groups
2013-11-19 17:24:49 +08:00
Chris Rebert
afbdc21def
fixes part of #11117 : doc that modal show()/hide() return before animation finishes
2013-11-18 19:59:09 -08:00
Chris Rebert
2172e2ea8a
fix #11089 : document modal show+shown events' relatedTarget property
2013-11-18 19:29:08 -08:00
Chris Rebert
446f2325a6
add explanatory comment Re: #11526
2013-11-18 14:22:17 -08:00
Julian Thilo
84a3aa3e0c
Merge pull request #11514 from twbs/navbar-text-float-breakpoint
...
Fix #11513 : Don't always float navbar-text
2013-11-18 14:02:17 -08:00
Mark Otto
7c9b93254b
Merge pull request #11526 from erikflowers/firefox-placeholder-fix
...
Firefox placeholder text is faded out and not the full color.
2013-11-18 13:42:52 -08:00
Erik Flowers
50578dda60
- Firefox placeholder text is faded out and not the full color. Adding opacity:1 to it returns it to the proper color
...
- (this is a re-commit since I messed up my branch last time and failed the travis build)
2013-11-18 11:58:14 -07:00
Chris Rebert
ee1c53dca0
Merge pull request #11521 from valera-rozuvan/patch-1
...
Update dropdown.js
2013-11-18 01:57:56 -08:00
Valera Rozuvan
ad86d9a51b
Update dropdown.js
2013-11-18 11:55:33 +02:00
Julian Thilo
8aec527614
Run grunt dist
2013-11-17 23:45:42 +01:00
Julian Thilo
cdb243706e
Fix #11513 : Don't always float navbar-text
...
`navbar-text` should only float when the navbar is expanded on larger
screens, otherwise the element might be (hidden) behind `navbar-nav`.
Fixes #11513 .
X-Ref: #8820 #8815
2013-11-17 23:07:28 +01:00
Zlatan Vasović
283c86db38
There are xs-offsets, -pushes and -pulls!
2013-11-17 21:15:25 +01:00
Chris Rebert
6b547b357a
Merge pull request #11509 from ZDroid/fix-indents
...
Fix some weird indents
2013-11-17 02:02:00 -08:00
Zlatan Vasović
9a8a571ad1
Fix some weird indents
2013-11-17 10:24:31 +01:00
Mark Otto
03501f9c4a
Merge branch 'master' into docs_derp
2013-11-16 22:02:59 -08:00
Mark Otto
ae4d5f21a9
fixes #11449 : use menlo over monaco
2013-11-16 18:01:59 -08:00
Mark Otto
a2c6daafd0
fixes #10744 : back to solid borders on carets
2013-11-16 17:48:31 -08:00
Mark Otto
86678e6602
text size
2013-11-16 16:50:47 -08:00
Cina S.
56f6847ed6
Add missing data namespace for dropdown
2013-11-16 09:43:47 -06:00
Bass Jobsen
fbd3cf5f52
Update navbar.less
...
fix for issue #11243
2013-11-16 12:03:50 +01:00
André Cruz
926b940e86
Clear timeout on destroy.
...
Clears the internal timeout on destroy so that hanging timers are not fired.
2013-11-15 23:33:23 +00:00
Sam Blowes
f4eb3df50a
Fixed single btn in btn-group-veritcal not being rounded
2013-11-15 16:48:24 +00:00
Sam Blowes
1f340023e2
Fixed button group button not being 100% width
...
Example of issue here.
https://dl.dropboxusercontent.com/u/14037764/Development/stackoverflow/bootstrap/vertical-btn.PNG
2013-11-15 16:17:40 +00:00
fat
7545da2e3c
fixes #11477 and updates slid event in carousel with namespace
2013-11-14 23:58:29 -08:00
Chris Rebert
57b59fcfd0
Merge pull request #10353 from rwillrich/ignore-files
...
Bower: Ignore development and documentation files on bower.json. Fix #10313
2013-11-14 15:37:22 -08:00
Julian Thilo
27b62d39e2
Merge pull request #11476 from ZDroid/keyframes
...
Remove unusual keyframes prefixes
2013-11-14 01:14:06 -08:00
Zlatan Vasović
c2a6e950d7
Remove unusual keyframes prefixes
2013-11-13 22:32:46 +01:00
Chris Rebert
4cbc8d49b1
Justified Nav rendering bug fixed in Chrome as of v31.0.1650.48
2013-11-13 12:03:03 -08:00
Chris Rebert
c1c2a8e188
Merge pull request #11385 from twbs/justified-nav-example-warning
...
add warning about WebKit bug to the justified nav example itself
2013-11-11 14:44:40 -08:00
Chris Rebert
e7d6af003e
Merge pull request #11376 from twbs/double-click-radio-fix
...
Double-clicking on a .btn-ized radio button shouldn't de-select it
2013-11-10 17:33:12 -08:00
Chris Rebert
7a3f41b11b
<3 @asselin for figuring out this combo of 2 patches for #9920 ; re-grunt
2013-11-10 17:25:17 -08:00
Brian Leonard
5d6e9212a6
Don't deselect radio buttons in data-toggle; fixes #9920
...
Merges #10787
2013-11-10 17:23:11 -08:00
Nathan Muir
934d1bcae5
Add unit test for #9920
...
Merges #10385
2013-11-10 17:23:11 -08:00
Chris Rebert
a639c6e1cf
Merge pull request #11409 from twbs/add-release-checklist
...
add release checklist to CONTRIBUTING file
2013-11-10 17:17:15 -08:00
Chris Rebert
ce0d008bc3
add release checklist to CONTRIBUTING file; fixes #11290
2013-11-10 17:16:21 -08:00
Zlatan Vasović
aad447e290
Fix #11400 and #11431
2013-11-09 22:49:58 +01:00
Zlatan Vasović
4bd263c4c1
Better documentation for validation states
2013-11-09 22:14:21 +01:00
Mario Bonito
4386650e60
Corrected color contrast to WCAG 2.0 AA
2013-11-09 13:03:21 -05:00
Daniel Bøndergaard
268f20e84c
Carousel: Use the transition duration from CSS
...
This makes it possible to change the transition duration in CSS
2013-11-08 11:55:06 +01:00
Zlatan Vasović
0da3901ed5
Add missing .small styles and docs
2013-11-08 10:33:22 +01:00
Brian Surowiec
03c161f0c4
Fix glyphicon class name wrapping in IE
2013-11-08 02:03:37 -05:00
Chris Rebert
b252926e80
Merge pull request #11404 from twbs/add-warning-to-old-docs
...
Fix #11353 : Add v2 unsupported note
2013-11-07 11:36:23 -08:00
Julian Thilo
78b2623fbf
Fix #11353 : Add v2 unsupported note
...
Fix issue #11353 by adding a note to the v2.3.2 docs saying that we no
longer support this version of Bootstrap. Provides a link to the latest
docs, i.e. our homepage.
2013-11-07 19:14:18 +01:00
Luke McDonald
15fbc4bd06
Don't print .clearfix() comment references
2013-11-07 09:57:55 -06:00
Chris Ziogas
ed5dbf1b2b
Update affix properly on scrollspy speedy scroll to top of page #11310
...
Fix scrollspy.js so as affix is updated properly when user scrolls fast
to top of page.
A fix for issue #11310 .
2013-11-07 16:39:57 +02:00
Zlatan Vasović
96109d3138
Simplify table state styles
2013-11-07 09:53:33 +01:00
Chris Rebert
463343af63
more nesting in table.less
2013-11-06 18:38:27 -08:00
Chris Rebert
798e64cebf
use nesting to make .table-striped & .table-hover mixin-able again; fixes #11387
2013-11-06 18:33:07 -08:00
Chris Rebert
ceefbce100
add warning about WebKit bug to the justified nav example itself
2013-11-06 15:21:07 -08:00
Mark Otto
6df6723c15
Merge branch 'master' into docs_derp
...
Conflicts:
dist/css/bootstrap.min.css
2013-11-06 14:04:54 -08:00
Mark Otto
4c5a0d2927
Merge branch 'master' into gh-pages
2013-11-06 13:59:07 -08:00
Chris Rebert
3887f540b9
update remaining version numbers
2013-11-06 13:19:18 -08:00
Mark Otto
eaff6bc49a
grunt
2013-11-06 13:10:51 -08:00
Mark Otto
98acdaeb00
bump links to 3.0.2; change readme download to release URL format
2013-11-06 13:09:35 -08:00
Mark Otto
88a06640dd
Fixes #11295 : Restore offset, push, and pull zero classes (e.g., .col-md-offset-0)
2013-11-06 13:03:08 -08:00
Mark Otto
d1048a7837
run grunt after version bumps
2013-11-06 13:02:15 -08:00
Mark Otto
6a42305565
bump versions to v3.0.2
2013-11-06 12:57:28 -08:00
Mark Otto
b593df1830
docs derp
2013-11-06 11:00:39 -08:00
Chris Rebert
c84d96ac1f
fix #11378
2013-11-06 10:30:39 -08:00
Chris Rebert
375b9edb41
Merge pull request #11273 from benji07/patch-1
...
Add a branch alias
2013-11-05 23:36:48 -08:00
Benjamin Lévêque
7df3e142ac
Add a branch alias
...
Add a branch alias to be able to require 3.0.* version (use the branch master if minimum-stability is dev or use a tag if it's defined to stable)
2013-11-06 08:25:40 +01:00
Chris Rebert
89d489dfc7
re-grunt
2013-11-05 16:58:18 -08:00
Chris Rebert
f1b0cd491c
Merge pull request #10039 from daguej/js-refs
...
Don't explicitly reference global jQuery
2013-11-05 16:55:55 -08:00
Chris Rebert
d2e710a2df
fix 1 remaining instance of #11349
2013-11-05 16:37:54 -08:00
Chris Rebert
a063e1f736
Merge pull request #11349 from alefteris/examples-navbar-sr-only
...
Add toogle nav for screen readers in examples
2013-11-05 16:35:14 -08:00
Chris Rebert
b6a083e77f
Merge pull request #11327 from ZDroid/nestnail
...
Use nesting for thumbnail styles
2013-11-05 16:20:53 -08:00
Ross Allen
18318b81b0
Add async attribute to Twitter widget script
2013-11-05 07:39:50 -10:00
Ross Allen
68fc2f2515
Add protocol for jQuery to work when accessed as file
...
URLs without protocols get "file:" prepended when their document is
loaded as a file. Make sure the docs can always be opened by
specifying a protocol.
2013-11-05 07:23:58 -10:00
Ross Allen
4f5a865684
Load Twitter widget async, prevent SPOF
...
Twitter's widget library[1] provides an async snippet to inject the
script tag later. Since widgets.js came before the local JS, if
twitter.com took long to respond it would prevent subsequent
synchronous script tags.
[1] https://dev.twitter.com/docs/tfw-javascript
2013-11-04 22:17:05 -10:00
Ross Allen
38d6894910
Serve jQuery from cookie-free Google APIs
...
jQuery.com uses Google Analytics and so sets a cookie when you visit
the site. When you request jquery.js from its CDN, code.jquery.com,
you take a hit from sending your previous GA cookie in the request.
Google Hosted Libraries[1] and googleapis.com never set cookies.
[1] https://developers.google.com/speed/libraries/devguide
2013-11-04 22:11:57 -10:00
Chris Rebert
13b96677ba
Merge pull request #11335 from twbs/version-number-updater
...
add Grunt task to change version numbers
2013-11-04 11:24:32 -08:00
Chris Rebert
0bb122a377
add Grunt task to change version numbers; fixes #11332
2013-11-04 11:22:30 -08:00
Chris Rebert
aeee718247
update node.js to v0.10.x (current stable)
2013-11-04 10:41:10 -08:00
Chris Rebert
de271bf612
Merge pull request #11354 from Ore4444/patch-1
...
Fixed links
2013-11-04 08:54:37 -08:00
Ore Landau
eae1af1d27
Fixed links
...
Links to same-page anchors were treated as external links.
2013-11-04 12:33:43 +02:00
Thanos Lefteris
70db224073
Add toogle nav for screen readers in examples
2013-11-03 21:08:24 +02:00
Chris Rebert
df3b44f27a
Merge pull request #11345 from pborreli/patch-3
...
Removed duplicated class change from migration instructions
2013-11-02 20:11:08 -07:00
Pascal Borreli
05c826d67d
Removed duplicated class change from migration instructions
2013-11-03 03:08:11 +00:00
Chris Rebert
fcb906ce09
Merge pull request #11336 from twbs/fix-11317
...
don't use nonstandard window.location.origin in customizer JS
2013-11-02 15:06:16 -07:00
Julian Thilo
88b651012d
Fix #7398 in Basic template
...
See https://github.com/twbs/bootstrap/issues/7398#issuecomment-27617890 for details.
Thanks @martinburger
2013-11-02 13:34:31 +01:00
Julian Thilo
be60ee1377
Merge pull request #11338 from ZDroid/nestform
...
Use nesting for .placeholder()
2013-11-02 05:27:30 -07:00
Zlatan Vasović
f1bc840d43
Use nesting for .placeholder()
2013-11-02 09:35:51 +01:00
Chris Rebert
db314528eb
don't use nonstandard window.location.origin in customizer JS; fixes #11317
2013-11-01 18:56:27 -07:00
Chris Rebert
ea3c89189a
Merge pull request #11334 from glebm/patch-2
...
& > == >
2013-11-01 18:29:45 -07:00
Gleb Mazovetskiy
b75d5f5fc4
& > == >
2013-11-02 02:19:11 +01:00
Chris Rebert
4e0d022de5
update version numbers in JS file comment headers to v3.0.1 & regrunt
2013-11-01 17:15:34 -07:00
Julian Thilo
41fa8ead77
Merge pull request #11331 from xt0rted/patch-1
...
Update customizer.js
2013-11-01 16:38:08 -07:00
Brian Surowiec
8ff7b48b7b
Update customizer.js
2013-11-01 19:27:08 -04:00
maxwellium
56aa2af6e1
otherwise content scrolls on chrome
...
without change, body scrolls on chrome Version 30.0.1599.101 (OSX 10.9)
2013-11-01 22:51:11 +01:00
Zlatan Vasović
3dc0ed35d1
Use nesting for thumbnail styles
2013-11-01 22:09:01 +01:00
Julian Thilo
99ffa28278
Merge pull request #11324 from boki-/patch-1
...
Update README.md
2013-11-01 11:36:30 -07:00
Bogdan
bb54ce0db6
Update README.md
...
Row 13 link update to tag v3.0.1
2013-11-01 19:30:27 +01:00
Chris Rebert
19fdd707ef
Merge pull request #11315 from AJAlabs/master
...
Added navigation role to example navbars
2013-10-31 13:36:52 -07:00
AJ Acevedo
0d4b9ef72e
Added navigation role to example navbars
...
As per the docs:
http://getbootstrap.com/components/#navbar-default
modified: examples/carousel/index.html
modified: examples/jumbotron/index.html
modified: examples/navbar-fixed-top/index.html
modified: examples/navbar-static-top/index.html
modified: examples/navbar/index.html
modified: examples/non-responsive/index.html
modified: examples/starter-template/index.html
modified: examples/sticky-footer-navbar/index.html
modified: examples/theme/index.html
2013-10-31 16:09:41 -04:00
Kevin Locke
441f9d6717
Support .h1 in place of h1 inside .jumbotron
...
As in #7284 , it can often be useful to style text like a heading in
places where using the heading tag would be either semantically
incorrect, less accessible, or otherwise invalid.
Support this in .jumbotron as in the rest of the document by allowing
elements with class .h1 to stand in for the h1 element.
Signed-off-by: Kevin Locke <kevin@kevinlocke.name >
2013-10-31 10:48:55 -06:00
Mark Otto
7e5fd6d59c
Merge branch 'master' into gh-pages
2013-10-30 10:04:08 -07:00
Mark Otto
867e2bef8d
3.0.1
2013-10-30 10:03:56 -07:00
Mark Otto
f4854301d2
Merge branch 'master' into gh-pages
...
Conflicts:
_layouts/home.html
assets/css/docs.css
2013-10-30 09:00:29 -07:00
Mark Otto
147837efaa
more grunt
2013-10-30 08:00:32 -07:00
Mark Otto
9fbbce9b2d
Merge pull request #11274 from wangsai/fix-examples-urls
...
remove unused `{{ page.base_url }}` variables, and fix the urls
2013-10-30 07:32:06 -07:00
Mark Otto
697a37e73f
Merge pull request #11282 from ZDroid/combination
...
Combine multiple .thumbnail > img styles
2013-10-30 07:28:24 -07:00
Bas Bosman
b8f9f82d18
Add well-border variable
...
Add a variable to allow the well border color to be specified.
The reason I'd like to see this included is that my companies styleguide
requires an explicit border color on well-like constructs. This variable
allows me to easily override the default to use that color.
2013-10-30 14:10:16 +01:00
Zlatan Vasović
688ca328c9
Combine multiple .thumbnail > img styles
2013-10-30 10:00:28 +01:00
Chris Rebert
77bf572cba
Merge pull request #11278 from ZDroid/patch-1
...
Change tense to imperative
2013-10-29 12:41:42 -07:00
Zlatan Vasović
8a881c78a1
Change tense to imperative
...
Matches this comment with the commit messages and other comments.
2013-10-29 20:06:45 +01:00
Chris Rebert
a8e0679554
Merge pull request #11275 from jared-christensen/master
...
JS comments pointed to new documentation
2013-10-29 10:29:31 -07:00
Jared Christensen
583697fec3
JS comments pointed to new documentation
2013-10-29 12:10:47 -05:00
wangsai
ee96637284
remove unused {{ page.base_url }} variables, and fix the urls
2013-10-30 00:13:35 +08:00
Mark Otto
a23740ec03
run grunt
2013-10-28 21:55:08 -07:00
Mark Otto
e5c3f2d9d4
restore IDs
2013-10-28 21:50:05 -07:00
Mark Otto
5729f20054
Merge branch 'respondjs-import-note'
2013-10-28 21:49:00 -07:00
Mark Otto
96d7d4a489
edit
2013-10-28 21:48:57 -07:00
Mark Otto
c6e76d97ba
Fixes #10341 : don't change border color on contextual table classes
2013-10-28 21:19:48 -07:00
Mark Otto
4b8c662698
use regular text, not callouts
2013-10-28 21:19:09 -07:00
Mark Otto
67cab7fa05
Fixes #10516 : Use auto positioning for dropdowns in justified nav to fix Firefox rendering
2013-10-28 20:51:39 -07:00
Mark Otto
dcf51315a3
Merge pull request #11258 from ZDroid/smoothing
...
Add -moz-osx-font-smoothing
2013-10-28 20:36:40 -07:00
Chris Rebert
d1dd1fcdee
add warning about Respond.js not supporting @import; fixes #11143
2013-10-28 11:07:56 -07:00
Chris Rebert
0026e5655b
Merge pull request #11262 from vsn4ik/fonts_perms
...
Remove execute permissions on fonts files.
2013-10-28 09:16:53 -07:00
vsn4ik
f0c6ac0b70
Remove execute permissions on fonts files.
2013-10-28 17:52:04 +04:00
Zlatan Vasović
f9eec5b60a
Add -moz-osx-font-smoothing
2013-10-28 09:59:24 +01:00
Mark Otto
30127a4296
Merge pull request #11253 from ZDroid/ditch
...
Ditch amp
2013-10-27 20:50:23 -07:00
Zlatan Vasović
92f007157a
Ditch amp
2013-10-27 13:43:51 +01:00
Mark Otto
e9ca4fab13
Merge pull request #11248 from tagliala/chrome-osx-select-print
...
Chrome for OSX print issue with select tags
2013-10-27 00:45:37 -07:00
Geremia Taglialatela
58cb85be37
#fff of course
2013-10-26 21:52:38 +02:00
Geremia Taglialatela
b09417fd75
Fixes #11245
2013-10-26 21:32:29 +02:00
Mark Otto
0365796375
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-26 14:22:33 +01:00
Mark Otto
1ef6caf44f
Merge pull request #11200 from yokomizor/variable_way_to_set_caret_width_base
...
Variable way to set caret width
2013-10-26 06:15:33 -07:00
Mark Otto
4cfe307abe
Fixes #11206 : remove left padding on first inline list item
2013-10-26 14:13:34 +01:00
Mark Otto
0c714c32f9
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-26 14:12:07 +01:00
Mark Otto
64ffed87a4
Merge pull request #11244 from ZDroid/animation
...
Add .animation() mixin
2013-10-26 05:49:58 -07:00
Zlatan Vasović
aff291e1ca
Add .animation() mixin
2013-10-26 14:11:59 +02:00
Mark Otto
72cfe877d8
Remove multiple navbar z-index callout
...
* Since we removed the z-index of our default navbars in 76baacf2c9 , we no longer need this warning.
* A quick test of the new code showed no problems with dropdowns falling behind a sibling navbar, so folks should be good to go.
2013-10-26 12:43:50 +01:00
Mark Otto
4fac7b6d25
Merge pull request #11222 from ZDroid/patch-1
...
Add another newline to improve final code readability
2013-10-26 03:41:00 -07:00
Zlatan Vasović
20cba845c2
Add another newline to improve final code readability
...
This divides banner from code.
2013-10-26 10:57:09 +02:00
Mark Otto
f47510b172
Merge pull request #11224 from twbs/10506-doc
...
Document that uncollapsing the mobile navbar requires JS
2013-10-26 01:17:53 -07:00
Chris Rebert
abc50a7e9d
Merge pull request #11239 from twbs/qunit-equals-deprecated
...
QUnit.equals() is deprecated; use QUnit.equal() instead
2013-10-25 14:21:43 -07:00
Chris Rebert
7b24f3c47c
QUnit.equals() is deprecated; use QUnit.equal() instead
2013-10-25 14:14:30 -07:00
Chris Rebert
f2f70a4a74
Merge pull request #11234 from ZDroid/patch-2
...
Kick up grunt-contrib-jshint dependency
2013-10-25 11:34:54 -07:00
Zlatan Vasović
ca6729e3d3
Kick up grunt-contrib-jshint dependency
2013-10-25 17:45:49 +02:00
Chris Rebert
a58c83a317
add missing space before open curly brace
2013-10-24 19:56:44 -07:00
Chris Rebert
aafe3f90bd
fix misspelling in comment
2013-10-24 19:50:08 -07:00
Chris Rebert
f31aae469e
fix misspelling in comment
2013-10-24 19:48:42 -07:00
Chris Rebert
3cd744fd5e
remove ref to nonexistent branch
2013-10-24 19:42:48 -07:00
Chris Rebert
c865a68e21
fix WebKit caps in comments
2013-10-24 19:20:08 -07:00
Chris Rebert
91fa801d33
doc that uncollapsing mobile navbar requires JS; per #10506
2013-10-24 15:16:02 -07:00
Chris Rebert
9d2cf56177
goofed on 1 dummy <img> src attribute; thanks @extesy
2013-10-24 12:01:09 -07:00
Chris Rebert
54cd0f8c2f
rm dummy 'src' attributes of <img>s & squelch validator warning; fixes #11216
2013-10-23 23:41:17 -07:00
Chris Rebert
0d122fc323
silence validator regarding http-equiv="X-UA-Compatible"
2013-10-23 23:25:17 -07:00
Zlatan Vasović
9a2d169762
Add quick fix to labels and badges in buttons
2013-10-23 22:14:34 +02:00
Mark Otto
eb77241ae2
Merge pull request #11209 from ZDroid/new_year
...
Update license year
2013-10-22 13:45:41 -07:00
Chris Rebert
bb3d17553c
Merge pull request #11208 from ZDroid/codestyle_fix
...
Put a space before `{` due to code style
2013-10-22 10:53:25 -07:00
Zlatan Vasović
63433fbef9
Update license year
2013-10-22 18:41:33 +02:00
Zlatan Vasović
b034362363
Put a space before { due to code style
2013-10-22 18:34:43 +02:00
Arnold Daniels
5a38a5775f
Scrollspy acting up when targets are hidden
...
If elements are hidden using `display: none;` which are targets mapped by scrollspy, the plugin might select an incorrect or no menu item.
Checking if the target is visible solved this.
2013-10-22 13:31:23 +02:00
Rogério Yokomizo
5f2bd59abb
variable way to set @caret-width-base
2013-10-22 02:50:08 -02:00
LFeh
89e0f1669f
Adjust in modal size rules
2013-10-21 16:39:31 -02:00
Mark Otto
9673c25e2c
Merge pull request #11192 from ZDroid/typo
...
Change upper case to lower case
2013-10-21 08:58:38 -07:00
Zlatan Vasović
214a78978d
Change upper case to lower case
2013-10-21 16:34:18 +02:00
Mark Otto
eed53d7811
Fixes #10601 : Use overflow-y: auto; for navbar collapse instead of visible to better enable scrolling on Android 4.x
2013-10-21 01:53:41 -07:00
Mark Otto
ee9be1a30f
run grunt on last commit for gradient syntax change
2013-10-20 23:29:23 -07:00
Mark Otto
eef9d5ae7b
Merge pull request #10893 from Shaun-Dychko/patch--webkit-linear-gradient
...
remove comma separating the color and the color-stop in -webkit-linear-gradient in the #gradient .vertical mixin.
2013-10-20 23:27:48 -07:00
Mark Otto
976866dcaa
Merge pull request #10729 from lipis/patch-2
...
Removed the unnecessary override and the !important from .wrap
2013-10-20 23:12:19 -07:00
Mark Otto
9a0849d818
more spacing
2013-10-20 22:56:29 -07:00
Mark Otto
2eec3f919e
Merge branch 'master' into pr/10656
...
Conflicts:
dist/css/bootstrap.min.css
2013-10-20 22:55:45 -07:00
Mark Otto
6585c5898a
spacing
2013-10-20 22:46:21 -07:00
Mark Otto
6ecb5d6cf3
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-20 22:43:03 -07:00
Mark Otto
d8fab5aa6e
Fixes #10620 : remove gradient on buttons for IE9 in theme.less due to bleed through with rounded corners
2013-10-20 22:41:57 -07:00
Mark Otto
98378d2d88
Merge pull request #11188 from twbs/navbar_zindex_auto
...
Fixes #10433 : Navbar z-index refactor
2013-10-20 21:16:37 -07:00
Mark Otto
76baacf2c9
Remove default z-index on navbar and only set on static and fixed variants
2013-10-20 21:12:09 -07:00
Mark Otto
c71f89518f
Fix up padding on default navbar example
2013-10-20 21:11:51 -07:00
Mark Otto
e486bb4f39
Fixes #10433 : Navbar z-index refactor
...
* Resets the default navbar z-index to auto at a certain breakpoint
* Adds fixed navbar z-index var to fixed bottom navbar (previously only on fixed top navbar)
2013-10-20 20:30:16 -07:00
Mark Otto
5aa4c5cb0c
fixes #11139 : add position: relative; to .modal-dialog so that z-index takes effect
2013-10-20 20:04:10 -07:00
Mark Otto
369f5ba760
Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan-kim-master
...
Conflicts:
dist/css/bootstrap.min.css
2013-10-20 19:55:56 -07:00
Mark Otto
dd34102cb6
Fixes #10522 : Enable use of form validation class on .radio, .checkbox, .radio-inline, and .checkbox-inline
2013-10-20 19:54:22 -07:00
Mark Otto
23a85d6a7a
fixes #11126 : remove box-shadow from open dropdown toggle with .btn-link
2013-10-20 17:59:15 -07:00
Mark Otto
6d5c5105fa
Merge pull request #11186 from twbs/carousel_indicators_ie
...
Carousel indicators for IE8-9
2013-10-20 17:48:36 -07:00
Mark Otto
bc76be5dcf
Merge branch 'master' into carousel_indicators_ie
...
Conflicts:
dist/css/bootstrap.min.css
2013-10-20 17:45:07 -07:00
Mark Otto
f45c05a97a
fixes #11151 : remove unused h5bp class from print CSS
2013-10-20 17:40:19 -07:00
Mark Otto
5e70642dd2
Merge branch 'master' into carousel_indicators_ie
2013-10-20 16:53:57 -07:00
Mark Otto
ecadbe56f7
mo grunt
2013-10-20 16:53:45 -07:00
Mark Otto
ac6a7f044e
Merge branch 'master' into carousel_indicators_ie
...
Conflicts:
dist/css/bootstrap.min.css
2013-10-20 16:49:18 -07:00
Mark Otto
ecc6d9873f
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-20 16:48:52 -07:00
Mark Otto
291fd9828c
run grunt dist
2013-10-20 16:48:42 -07:00
Mark Otto
6a93a6b88a
Fixes #10903 and #10457 : IE8-9 don't support events on elements without background-color, so we have to hack it
2013-10-20 16:46:38 -07:00
Mark Otto
438a40a7f8
Merge pull request #11183 from ZDroid/patch-1
...
Continue tag way implementation
2013-10-20 14:55:10 -07:00
Zlatan Vasović
8a9e1af18d
Continue tag way implementation
2013-10-20 18:50:14 +02:00
Rogério Yokomizo
15f15cafd6
added bower_components to .gitignore
2013-10-19 01:07:10 -03:00
Chris Rebert
32468b087b
Merge pull request #11166 from ZDroid/tag_way
...
(Not HTML) tag way is much better
2013-10-18 13:14:03 -07:00
Zlatan Vasović
d2ad1dc88f
(Not HTML) tag way is much better
2013-10-18 21:34:18 +02:00
LFeh
77bb7502bc
Options of sizes added in modal
2013-10-18 10:05:50 -03:00
Mark Otto
eb4a92bfed
Merge pull request #11155 from twbs/ie8-file-proto-respond.js-examples-warnings
...
Warn about IE8 + Respond.js + file:// problem in examples
2013-10-17 19:17:05 -07:00
Mark Otto
0806819bcf
Merge pull request #11156 from twbs/mobile-modals-xref
...
JS docs: add cross-reference to Getting Started mobile modal section
2013-10-17 19:16:12 -07:00
Chris Rebert
73bb911b29
JS docs: add cross-reference to Getting Started mobile modal section
2013-10-17 19:12:24 -07:00
Chris Rebert
c23d6a2766
Warn about IE8 + Respond.js + file:// problem in examples; fix #11019
2013-10-17 18:39:03 -07:00
Mark Otto
4c043b7d5f
Merge pull request #11096 from twbs/navbar-button-docs
...
Resolves #10923
2013-10-17 14:53:50 -07:00
Mark Otto
70d85be3b7
Merge branch 'master' into navbar-button-docs
2013-10-17 14:47:31 -07:00
Mark Otto
96a19c18fb
copy change, add to buttons anchor section
2013-10-17 14:47:27 -07:00
Mark Otto
bb30f6355a
Merge branch 'fix-11112'
2013-10-17 14:11:46 -07:00
Mark Otto
1f33dc8033
even shorter banner; remove space between slash and period
2013-10-17 14:11:40 -07:00
Chris Rebert
c88cd1cd95
add explicit copyright header to docs CSS & JS files; fixes #11112
2013-10-17 14:02:22 -07:00
Chris Rebert
872c3588f3
Merge pull request #11150 from ZDroid/patch-1
...
FIx invalid element selector
2013-10-17 12:35:15 -07:00
Zlatan Vasović
5f79354dbe
FIx invalid element selector
...
`kbd` (keyboard) is right, not `kdb`. :P
2013-10-17 21:25:08 +02:00
Chris Rebert
25b7a5200d
fix #11144
2013-10-17 11:21:06 -07:00
Chris Rebert
a28b2cb9e1
Merge pull request #11141 from vincentchan/master
...
Update translation sites URL
2013-10-17 01:01:49 -07:00
Vincent Chan
d8a68e38f7
Update translation URL
2013-10-17 15:52:59 +08:00
Max Edmands
693915d127
Active state overrides contextual list-item styles
2013-10-16 22:56:13 -07:00
Aaron Borden
0c2055ef38
Adding contextual styles to list-items
2013-10-16 19:02:04 -07:00
Mark Otto
3e9e339ee3
Merge pull request #11137 from twbs/explain-https
...
add note about third-party JS, CDNs, and HTTPS
2013-10-16 17:28:46 -07:00
Chris Rebert
4d663e3879
add note about third-party JS, CDNs, and HTTPS
2013-10-16 15:50:40 -07:00
Chris Rebert
cf95fe20ba
upgrade to html5shiv v 3.7.0
2013-10-16 15:36:37 -07:00
Mark Otto
c1bf625dfe
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-16 10:44:03 -07:00
Mark Otto
8ac1495c63
redo the glyphicons icons list to make icons not blurry on edges /cc @jankovarik
2013-10-16 10:43:56 -07:00
Julian Thilo
d880398038
Merge pull request #11128 from lipis/patch-3
...
Fixed broken link in README.md
2013-10-16 09:34:27 -07:00
Lipis
397481903a
Fixed broken link
2013-10-16 16:42:32 +02:00
jeonghwan
976f6dfdad
Fixes issue #11122 -- navbar-fixed-bottom border
...
Enable border-top in .navbar-fixed-bottom
2013-10-16 23:20:34 +09:00
Steven Black
4dffe7d2e3
Fixes issue #11098 -- Button documentation.
2013-10-16 09:39:45 -04:00
Chris Rebert
e317e116fd
add dots to class name references for consistency
2013-10-15 17:25:34 -07:00
Mark Otto
401dca0ed7
Merge pull request #11110 from nikolawannabe/patch-1
...
Include a note about text-based form control styling
2013-10-15 17:07:22 -07:00
Case Talbot
9d54a42951
Include a note about text-based form control styling
...
fixes #8824 .
2013-10-15 17:02:21 -07:00
Mark Otto
481791411c
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-15 14:11:29 -07:00
Mark Otto
acd4a0a140
update jumbotron docs; fixes #11109
2013-10-15 14:11:21 -07:00
Mark Otto
723f85fc0d
Merge pull request #11105 from twbs/license-note
...
Add notes about dual-licensing contributions before switching to MIT in v3.1
2013-10-15 13:12:46 -07:00
Rhodry Korb
dd5c8a53ee
Add Note About Changing to MIT
2013-10-15 13:06:27 -07:00
Geremia Taglialatela
3bfa630d2a
Added opacity to customizer and rebuilt customizer
2013-10-15 21:13:49 +02:00
Geremia Taglialatela
160ed85616
Customizable backdrop opacity
2013-10-15 20:53:56 +02:00
Mark Otto
2380b6be99
Merge pull request #11102 from ZDroid/less-fix
...
Ditch `&`, as `+ ...` is enought
2013-10-15 11:19:24 -07:00
Zlatan Vasović
0423635614
Ditch &, as + ... is enought
2013-10-15 17:35:11 +02:00
Mark Otto
dc495fe9d9
nuke commented out docs css
2013-10-14 22:08:23 -07:00
Alex Kalicki
21fad33858
Resolves #10923
...
Rebased from #10930
2013-10-14 21:20:17 -07:00
Chris Rebert
b05a287eb6
run grunt
2013-10-14 20:47:56 -07:00
Chris Rebert
a28d9539c7
fix #10952
2013-10-14 20:45:43 -07:00
Mark Otto
67829c6571
Merge pull request #11094 from twbs/address-10049
...
Recommend only <div> (not <span>) for putting tooltips on disabled elements
2013-10-14 20:21:17 -07:00
Chris Rebert
27e2c56792
In docs, recommend only <div> (not <span>) for putting tooltips on disabled elements
...
Per issue comments, `display: inline` elements like <span> don't work for this.
Resolves #10049
2013-10-14 20:18:12 -07:00
Mark Otto
a44bd01628
Merge pull request #10533 from topsitemakers/master
...
adding required attribute for example signin form
2013-10-14 19:56:33 -07:00
Chris Rebert
f11aa31023
Merge pull request #10519 from zba/master
...
changed attr('data-target') to data('target');
2013-10-14 19:14:58 -07:00
Chris Rebert
b5d7a51bff
Merge pull request #10779 from ssorallen/customizer-bootstrap-less-order
...
Use bootstrap.less file order in Customizer
2013-10-14 18:56:10 -07:00
Chris Rebert
4e1808930a
add IDs to frequently-referenced parts of the docs
2013-10-14 16:24:58 -07:00
Mark Otto
036712ed90
Merge pull request #11091 from yokomizor/extended_thumbnail_hover_state
...
Extended hover state of linked versions of .thumbnail
2013-10-14 16:14:28 -07:00
Rogério Yokomizo
e20b02ad0b
extended hover state of linked versions of .thumbnail
2013-10-14 20:10:49 -03:00
Mark Otto
fa64846acf
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/css/bootstrap.min.css
2013-10-14 13:45:57 -07:00
Mark Otto
7100711577
unnest the list-group-item link variation for #11085 and #11088
2013-10-14 13:45:32 -07:00
Mark Otto
3fb1381a30
Merge pull request #11084 from ZDroid/variable_way
...
Unhardcode .table-responsive bottom margin
2013-10-14 11:33:27 -07:00
Mark Otto
256f3a99c3
Merge pull request #11086 from twbs/table-responsive-breakpoint
...
fix .table-responsive media query; refs #11067
2013-10-14 11:32:46 -07:00
Mark Otto
50dd5d5088
fix about page html validation and run grunt
2013-10-14 11:30:06 -07:00
Mark Otto
6307d2c94d
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
getting-started.html
2013-10-14 11:06:25 -07:00
Mark Otto
1f5c754d57
remove dupe content
2013-10-14 11:05:49 -07:00
Chris Rebert
5c64ef393c
fix .table-responsive media query; refs #11067
2013-10-14 10:58:12 -07:00
Zlatan Vasović
4ce1b08c32
Unhardcode .table-responsive bottom margin
2013-10-14 18:22:31 +02:00
Mark Otto
70278a4e4f
Merge pull request #11078 from twbs/issue-11019-note
...
add note to docs about Respond.js & file:// ; fixes part of #11019
2013-10-14 09:09:02 -07:00
Mark Otto
efc741b151
Merge pull request #11082 from ZDroid/nuke_zeros
...
Nuke trailing zeros
2013-10-14 09:08:28 -07:00
Zlatan Vasović
b3c04c95d3
Nuke trailing zeros
2013-10-14 15:06:58 +02:00
Chris Rebert
3431f32349
Merge pull request #11079 from wangsai/mother-language
...
change english link text to chinese
2013-10-14 01:21:26 -07:00
wangsai
ee8ba8b540
Add description. And complete russian and spanish languages
2013-10-14 16:04:48 +08:00
Chris Rebert
3c69f59fe5
make Getting Started page's HTML more valid
2013-10-14 00:40:51 -07:00
Chris Rebert
df46b1b46e
make About page's HTML more valid
2013-10-14 00:38:19 -07:00
Chris Rebert
ceb7694ee3
add note to docs about Respond.js & file:// ; fixes part of #11019
2013-10-14 00:10:30 -07:00
wangsai
67c48f7703
change english link text to chinese
2013-10-14 14:52:53 +08:00
Chris Rebert
9416cd3738
update to latest jszip
...
commit 04fc93045334dc1b679aba5c2dce206da777a85c
2013-10-12T12:39:56-07:00
2013-10-13 23:37:16 -07:00
Chris Rebert
3abe86b7ed
Merge pull request #11076 from twbs/respond-js-cdn
...
use CDN for respond.js
2013-10-13 23:26:28 -07:00
Mark Otto
111b9bd194
Merge pull request #11077 from twbs/avoid-docs-assets-in-example
...
avoid referencing /docs-assets/ in Getting Started docs example; use CDN URL for respond.js
2013-10-13 23:25:23 -07:00
Mark Otto
e521be0f22
Merge pull request #11075 from twbs/respond-js-cross-domain-note
...
fix #11003
2013-10-13 23:24:35 -07:00
Chris Rebert
8450aa7dbf
avoid referencing /docs-assets/ in Getting Started docs example; use CDN URL for respond.js
2013-10-13 23:23:04 -07:00
Mark Otto
202f395b2f
Merge branch 'docs_welcome'
2013-10-13 23:19:17 -07:00
Mark Otto
25607c2683
add translations, copy edit a few things, and fix alignment of ads
2013-10-13 23:19:11 -07:00
Chris Rebert
c5da0597bc
use CDN for respond.js
2013-10-13 23:18:30 -07:00
Chris Rebert
f0f1b8319d
fix #11003
2013-10-13 22:55:50 -07:00
Mark Otto
810a852f4a
Merge pull request #11046 from ZDroid/patch-3
...
Nicer docs license name
2013-10-13 20:26:36 -07:00
Mark Otto
9da73d79c2
run grunt
2013-10-13 20:12:07 -07:00
Mark Otto
e7379f75bd
no trailing decimal place
2013-10-13 20:04:28 -07:00
Mark Otto
fbc67a395f
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-13 20:04:00 -07:00
Mark Otto
36b4639b0d
Merge pull request #10949 from StevenBlack/jumbotron.fontsize
...
Jumbotron: remove the hard-coded font-size from jumbotron.less and moved...
2013-10-13 20:03:02 -07:00
Mark Otto
be4e951b7d
scope top padding of .form-control-static to be within horizontal forms only; fixes #10927
2013-10-13 20:02:24 -07:00
Mark Otto
44b32a3036
move .hidden to utilities; fixes #10997
2013-10-13 19:59:42 -07:00
Mark Otto
7bd955318a
run grunt on that scaffolding change
2013-10-13 19:57:45 -07:00
Mark Otto
5a411af967
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-13 19:57:23 -07:00
Mark Otto
f946ff5d25
fix #10257
2013-10-13 19:57:14 -07:00
Mark Otto
7112d06a2b
Merge pull request #10955 from ZDroid/patch-1
...
Insert comma to fix validation warning
2013-10-13 19:41:12 -07:00
Mark Otto
f660bd4205
clarify more grid stuff, specifically 100% fluid designs; fixes #10711
2013-10-13 19:36:39 -07:00
Mark Otto
950453db43
mention rows must be in containers in grid docs
2013-10-13 19:31:39 -07:00
Mark Otto
ee4a1ea295
docs notice for #11010
2013-10-13 19:24:13 -07:00
Mark Otto
bf4c714851
follow up to #10102 , cc @cvrebert
2013-10-13 19:12:23 -07:00
Mark Otto
ed12d41cae
add docs example for #10938 to show responsive column clearing in grid
2013-10-13 19:10:17 -07:00
Mark Otto
a43696467f
Merge pull request #11050 from twbs/restore_grid_mixins
...
Restore grid mixins
2013-10-13 19:03:29 -07:00
Mark Otto
bf73f1f9d3
Merge branch 'master' into restore_grid_mixins
...
Conflicts:
dist/css/bootstrap.min.css
2013-10-13 18:59:40 -07:00
Mark Otto
6351c30782
comment and spacing
2013-10-13 18:58:09 -07:00
Mark Otto
6085973e25
drop .tabbable since it's unused and undocumented /cc #10102
2013-10-13 18:56:31 -07:00
Mark Otto
dcbe591fa9
mention .invisible in docs per #10102
2013-10-13 18:56:03 -07:00
Mark Otto
2d1fa8cb5b
mention .invisible in docs per #10102
2013-10-13 18:54:15 -07:00
Mark Otto
fd293be5a1
mention tooltip markup in docs per #10102
2013-10-13 18:49:13 -07:00
Mark Otto
c31ec22661
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-13 18:44:06 -07:00
Mark Otto
edca93b8c7
mention .modal-open and .modal-backdrop in docs /cc #10102
2013-10-13 18:43:19 -07:00
Mark Otto
6fa9037e1c
mention .dropdown-backdrop and .open in dropdown docs /cc #10102
2013-10-13 18:40:47 -07:00
Mark Otto
6a93e729db
Merge pull request #11016 from twbs/address-10965
...
address #10965 ; mention Glyphicons-over-file:// problem in Carousel example
2013-10-13 18:35:10 -07:00
Mark Otto
265fda7903
Merge branch 'master' into restore_grid_mixins
...
Conflicts:
dist/css/bootstrap.min.css
2013-10-13 18:32:34 -07:00
Mark Otto
727a91de1c
another grid .row mention
2013-10-13 17:25:27 -07:00
Mark Otto
49f177fe60
finish grid docs intro for now; needs work though
2013-10-13 17:12:04 -07:00
Mark Otto
be1f0b07f3
mention .small in docs /cc #10102
2013-10-13 16:02:56 -07:00
Mark Otto
590975b407
remove undocumented and unsupported .pill-content and .pill-pane /cc #10102
2013-10-13 15:55:13 -07:00
Mark Otto
6c9ec3d87f
run grunt dist on .small additions
2013-10-13 15:54:49 -07:00
Mark Otto
857e697d72
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-13 15:24:48 -07:00
Mark Otto
ef2e0c99f4
remove screen from all docs media queries
2013-10-13 15:24:39 -07:00
Mark Otto
12fa502e67
Document caret /cc #10102
2013-10-13 15:23:58 -07:00
Zlatan Vasović
c75f8a5bf6
Sort dependencies A-Z
2013-10-13 05:31:47 -07:00
Mark Otto
570aa8a309
Merge pull request #11059 from ZDroid/patch-5
...
Add more functionality to .small to match <small>
2013-10-12 16:58:49 -07:00
Mark Otto
d82650102c
Merge pull request #10933 from ZDroid/patch-2
...
Change border to border-radius
2013-10-12 15:35:07 -07:00
Zlatan Vasović
8098f4e5ba
Add more functionality to .small
2013-10-12 23:28:50 +02:00
Mark Otto
a46003b8c7
restore var to customizer
2013-10-11 22:01:11 -07:00
Mark Otto
c814ad1833
Combine separate efforts for grid mixins into one, cleanup and reorganize
2013-10-11 22:00:37 -07:00
Mark Otto
dcef0a78d5
Merge pull request #11049 from alexdahl/multiple-modals-doc
...
documentation that multiple modals are not supported
2013-10-11 18:52:57 -07:00
Alex Dahl
dfdde46312
documentation that multiple modals are not supported
2013-10-11 18:11:58 -07:00
Zlatan Vasović
40db8e811d
Nicer docs license name
...
DOCUMENTATION-LICENSE is so long.
2013-10-11 22:53:38 +02:00
Mark Otto
3ea40c0d4f
Merge pull request #11018 from twbs/use-https
...
use https:// for CDN links
2013-10-10 13:37:06 -07:00
Chris Rebert
a96aff1e56
fix typo in Getting Started docs prose
2013-10-10 02:27:26 -07:00
Chris Rebert
4b175d908c
use https:// for CDN links
...
- works when viewing page via file://
- sets a good example security-wise
2013-10-10 01:51:18 -07:00
Chris Rebert
c42af6951f
address #10965 ; mention Glyphicons-over-file:// problem in Carousel example
2013-10-10 01:42:34 -07:00
Mark Otto
84413f6e29
Merge pull request #11013 from twbs/fix-10989
...
Use CDNs for more example JavaScripts
2013-10-09 20:05:21 -07:00
Chris Rebert
7016f02e51
Merge pull request #11015 from twbs/use-data-ride-carousel
...
use data-ride="carousel" in the docs & examples; fixes #11005
2013-10-09 19:49:44 -07:00
Chris Rebert
ef1fc34e61
use data-ride="carousel" in the docs & examples; fixes #11005
2013-10-09 19:29:27 -07:00
Chris Rebert
4da37222cf
re-remove execute permissions; apparent upstream bug
2013-10-09 18:58:50 -07:00
Chris Rebert
1a0df1fbd0
upgrade holder.js to v2.1
2013-10-09 18:52:57 -07:00
Chris Rebert
a388b7906e
Merge pull request #10956 from ZDroid/patch-4
...
Sort tasks alphabetically
2013-10-09 18:31:17 -07:00
Kurt Maine
a216589056
Convert "Recess" to "RECESS"
...
Except when speaking of the "recess" Node package, RECESS should be in all-caps.
2013-10-09 18:18:05 -07:00
Chris Rebert
ca090aef02
fix #10805
2013-10-09 18:07:08 -07:00
Chris Rebert
f9ed8e6f00
trivial refactor in build-customizer grunt task
2013-10-09 18:03:08 -07:00
herom
aad70834fc
Fixes #9925 : convert font data to base64, fixing 0xefbfbd (Unicode Replacement Character) chars in customizer fonts.
...
Merges #9982
2013-10-09 18:03:04 -07:00
Stuart P. Bentley
58a47b6bfd
Customizer: include config.json in bootstrap.zip
...
merges #10633 ; fixes part of #9951
2013-10-09 17:35:26 -07:00
Chris Rebert
5e652332d1
use CDN for jQuery instead of vendoring it; fixes part of #10989
2013-10-09 16:36:15 -07:00
Chris Rebert
d72768a16a
use CDN for html5shiv instead of vendoring it; fixes part of #10989
2013-10-09 16:36:02 -07:00
Chris Rebert
d820c6d225
there's no reason for holder.js to be executable
2013-10-09 15:34:39 -07:00
Chris Rebert
da4a275473
Merge pull request #10896 from ZDroid/patch-3
...
Change clone protocol from git:// to https://
2013-10-09 12:45:43 -07:00
Mark Otto
a007769ac3
Merge pull request #10998 from ZDroid/patch-7
...
Remove [type]
2013-10-09 10:12:17 -07:00
Chris Rebert
65b5b20776
Merge pull request #10996 from ZDroid/patch-6
...
Updare grunt-jekyll dependency
2013-10-09 01:39:56 -07:00
Zlatan Vasović
62c905f5bc
Remove [type]
...
type="text/css" isn't needed
2013-10-09 09:45:05 +02:00
Zlatan Vasović
ef3ac6808f
Updare grunt-jekyll dependency
2013-10-09 08:33:03 +02:00
Chris Rebert
730d7f0b13
fix #10986
2013-10-08 11:44:30 -07:00
Mark Otto
969cb04acb
Fixes #10126 : Update responsive test cases to properly highlight hidden class examples
2013-10-07 15:00:46 -05:00
Mark Otto
352532cd63
Half fix for #9855 : Don't fuck with margins for open modal dialog on account of Lion non-scrollbars and inconsistencies elsewhere
2013-10-07 14:39:11 -05:00
Mark Otto
0647049513
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-07 14:32:29 -05:00
Mark Otto
1adbe2043a
Fixes #10959 : round the .lead values down to nearest pixel via floor()
2013-10-07 14:32:23 -05:00
Mark Otto
704635818f
run grunt
2013-10-07 14:31:41 -05:00
Chris Rebert
d32380657b
Merge pull request #10962 from twbs/doc-h1-thru-h6-classes
...
document .h1 thru .h6; fixes part of #10102
2013-10-07 00:55:21 -07:00
Chris Rebert
a8afb46688
document .h1 thru .h6; fixes part of #10102
2013-10-06 20:18:03 -07:00
Mark Otto
e62e7ffcbc
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
css.html
2013-10-06 19:06:40 -05:00
Mark Otto
61aa9a4f60
update gitignore to restore the ruby-version ignore and rename section to all docs stuff
2013-10-06 18:35:07 -05:00
Chris Rebert
bb50e33a30
fix #10961
2013-10-06 16:17:32 -07:00
Mark Otto
1eca83336e
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-06 17:24:32 -05:00
Mark Otto
548603a926
fixes #10961 : change variable names in grid docs
2013-10-06 17:24:26 -05:00
Steven Black
0740d01b4c
Good catch by @juthilo - omitted the modified in a prior commit.
2013-10-05 20:48:28 -04:00
Steven Black
c7120a7b04
The customizer now displays and collects the new Jumbotron font-size LESS variable
2013-10-05 18:38:45 -04:00
Steven Black
4b27c08783
The Jumbotron font-size LESS variable now conforms to the '@{bootstrapClass}-font-size' naming scheme.
2013-10-05 18:37:53 -04:00
Zlatan Vasović
146cd38867
Sort tasks alphabetically
2013-10-05 21:17:49 +02:00
Zlatan Vasović
b1cc07fa15
Insert comma to fix validation warning
...
BS doesn't support IE6/IE7, so comma can be inserted.
2013-10-05 20:14:19 +02:00
Mark Otto
56093dea99
Merge pull request #10950 from twbs/docs-navbar-class
...
Fix #10948 : Clarify navbar example target in docs
2013-10-05 10:59:44 -07:00
Julian Thilo
e8d7fb0737
Change all navbar example targets
...
According to comment on https://github.com/twbs/bootstrap/issues/10948#issuecomment-25751889 .
2013-10-05 19:32:52 +02:00
Mark Otto
a8f21b5ae9
merge in new ads
2013-10-05 11:44:41 -05:00
Martynas
80e8644230
removed outline from modal
2013-10-05 13:55:26 +03:00
Julian Thilo
e246a97b91
Fix #10948 : Clarify navbar example target in docs
2013-10-05 11:37:52 +02:00
Steven Black
38941881e9
Jumbotron: remove the hard-coded font-size from jumbotron.less and moved it into variables.less where other .font-size-xxxxx things now live.
2013-10-04 21:43:31 -04:00
Julian Thilo
56ee42d335
Merge pull request #10932 from ZDroid/patch-1
...
Correct grammar
2013-10-03 23:21:30 -07:00
Zlatan Vasović
6f9d980139
Change border to border-radius
...
Border isn't set, but border-radius is.
2013-10-03 23:15:49 +02:00
Zlatan Vasović
32c7483215
Correct grammar
...
Jekyll is the third person singular (it), so it should be 'its documentation', not 'their documentation'.
2013-10-03 23:05:23 +02:00
Tobias Lindig
70453c2327
unify button sizing, use mixin ".button-size" also for the base sized button
2013-10-03 10:43:35 -07:00
Chris Rebert
c43462678c
run grunt
2013-10-03 10:42:55 -07:00
Chris Rebert
ab34f27c37
Merge pull request #10871 from ZDroid/patch-2
...
Remove .ruby-version from excludes
2013-10-03 10:21:39 -07:00
Mark Otto
79c3f23ac4
Merge pull request #10908 from ZDroid/patch-4
...
Indent banner to match the *'s
2013-10-02 10:59:03 -07:00
Zlatan Vasović
dc5625c85b
Indent banner to match the *'s
2013-10-02 14:33:17 +02:00
Mark Otto
b79a2b3b7e
quick docs patch for spacing, remove glyphicons homepage link, and add ads to homepage
2013-10-02 00:11:51 -05:00
Chris Rebert
a32b626f5c
run up-to-date grunt
2013-10-01 11:01:08 -07:00
Mark Otto
93bc1af623
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-01 11:37:53 -05:00
Mark Otto
b352061d1d
run grunt
2013-10-01 11:37:47 -05:00
Zlatan Vasović
41444cd83a
Change clone protocol from git:// to https://
...
Cloning with git: protocol doesn't allow to change anything in `.git/`, like when using `git pull`.
2013-10-01 10:20:31 +02:00
Chris Rebert
f9dd7466cf
Merge pull request #10806 from twbs/ios-safari-pct-rounding
...
add iOS and versions to Safari percent rounding warning; fixes #10723
2013-09-30 18:11:20 -07:00
Chris Rebert
5bfd9e0d56
Merge pull request #10826 from twbs/doc-multiple-navbars-unsupported
...
document that multiple navbars aren't supported by default
2013-09-30 18:06:17 -07:00
Chris Rebert
a97918297e
add maintenance note regarding #10864 's addition
2013-09-30 17:54:49 -07:00
Chris Rebert
5528c6501c
document that multiple navbars aren't supported by default; addresses #10824
2013-09-30 17:44:50 -07:00
Mark Otto
0e628b6546
Merge pull request #10864 from akalicki/included_files
...
Added abridged form of 'What's included' docs to README
2013-09-30 17:15:15 -07:00
Mark Otto
ef66c31dd4
Merge pull request #10856 from akalicki/grid_class_docs
...
Better documentation and optimized examples for grid classes
2013-09-30 17:11:55 -07:00
Mark Otto
33673a4008
Merge pull request #10865 from Quy/master
...
Apply help-block class to help text in customize.html
2013-09-30 17:10:48 -07:00
Mark Otto
25954702ea
Merge pull request #10883 from ZDroid/patch-3
...
Remove "Remove margin on the body" from base css docs
2013-09-30 17:08:09 -07:00
Mark Otto
6670026572
Merge pull request #10889 from twbs/contextual-table-docs-xs
...
table contextual classes docs: .col-lg-* => .col-xs-*
2013-09-30 17:07:19 -07:00
Mark Otto
cc3f09d4d1
Merge pull request #10888 from twbs/favor-xs-in-docs
...
use .col-xs-* in "Forms: Column Sizing" docs so more responsive
2013-09-30 17:06:31 -07:00
Shaun Dychko
355525b2b7
remove comma separating the color and the color-stop in -webkit-linear-gradient in the #gradient .vertical mixin.
2013-09-30 13:21:54 -07:00
Chris Rebert
def45c1f74
table contextual classes docs: .col-lg-* => .col-xs-*
2013-09-30 11:01:29 -07:00
Chris Rebert
0b8a3e65aa
use .col-xs-* in "Forms: Column Sizing" docs so more responsive
2013-09-30 10:52:59 -07:00
Chris Rebert
7247527f04
also use .col-sm-* in other .form-horizontal example for consistency
2013-09-30 10:45:20 -07:00
Zlatan Vasović
f2d90d12dc
Remove "Remove margin on the body" from base css docs
...
Normalize did that.
2013-09-30 19:31:41 +02:00
Zlatan Vasović
40c61a9bd7
Remove .ruby-version due to https://github.com/twbs/bootstrap/commit/4f20a29c329aa58919919426cbd2190fabfdb723
2013-09-30 11:26:52 +02:00
Chris Rebert
df5aa7c0f1
Merge pull request #10869 from ZDroid/patch-2
...
Update qunit dependency
2013-09-30 01:09:30 -07:00
Zlatan Vasović
2306375d13
Update qunit dependency
2013-09-30 09:36:20 +02:00
Quy Ton
462f27813f
Apply help-block class to help text in customize.html
2013-09-29 18:24:00 -07:00
Alex Kalicki
80d74c1bf7
Moved 'getting started' link out of 'What's included' section in README
2013-09-29 20:45:55 -04:00
Chris Rebert
362c9c9f89
rm unnecessary backslashes from jqueryCheck
2013-09-29 15:37:22 -07:00
Chris Rebert
a84bd5d9f1
Merge pull request #10863 from DeanMarkTaylor/patch-2
...
Update Gruntfile.js fixing undefined jQuery check
2013-09-29 15:32:34 -07:00
Alex Kalicki
e21c744a57
Added abridged form of 'What's included' docs to README
2013-09-29 18:17:46 -04:00
Dean Taylor
429e92fd58
Update Gruntfile.js fixing undefined jQuery check
...
The check to see if jQuery was defined as incorrect causing the "Bootstrap requires jQuery" message to only be displayed if jQuery is defined and has a value which equates to `false`.
2013-09-29 21:14:24 +01:00
Alex Kalicki
e34e73714a
Better documentation and optimized examples for grid classes
2013-09-28 22:51:30 -04:00
Chris Rebert
1809894e8a
Merge pull request #10855 from dan-silver/master
...
Spelling mistakes in documentation.
2013-09-28 14:42:59 -07:00
Dan Silver
708dbe58f6
Spelling mistakes in documentation.
2013-09-28 16:21:23 -05:00
Chris Rebert
fc2cde0230
Merge pull request #10841 from DeanMarkTaylor/patch-1
...
Update Gruntfile.js removing pointless reading of customize.html.
2013-09-27 10:23:28 -07:00
Dean Taylor
f39db19306
Update Gruntfile.js removing pointless reading of customize.html.
...
I couldn't see a reason to read "customize.html", removed line.
2013-09-27 18:17:02 +01:00
Rodrigo Willrich
f32abbb6e1
bower.json: Modify assets directory on ignore to docs-assets
2013-09-27 09:04:33 -03:00
Alexander Prinzhorn
12a3bb31f8
Only preventDefault on click on [data-toggle="modal"] when the element is a link
...
In it's current state Bootstrap always prevents the default action for a click
event on `[data-toggle="modal"]` elements
(see https://github.com/twbs/bootstrap/blob/master/js/modal.js#L233 ).
Instead this should only happen when the element is a link.
2013-09-27 11:32:06 +02:00
Chris Rebert
eb3807609a
Merge pull request #10827 from akalicki/issue_10726
...
Resolves #10726 - clarifies javascript tab markup in docs
2013-09-26 15:04:23 -07:00
Alex Kalicki
5d6e1d742d
Resolves #10726 - clarifies javascript tab markup in docs
2013-09-26 17:49:03 -04:00
Chris Rebert
1cf8fcda65
add iOS and versions to Safari percent rounding warning; fixes #10723
2013-09-25 17:25:50 -07:00
Travesty3
1c1850f63e
Add 'collapse' class back after expanding
2013-09-25 08:59:01 -04:00
Mark Otto
1a476b623e
don't include . in link
2013-09-24 21:27:49 -05:00
Mark Otto
827fbc0a11
Merge pull request #10797 from twbs/input-groups-xref
...
add cross-reference to Input Groups in CSS Form docs; fixes #10792
2013-09-24 19:26:58 -07:00
Chris Rebert
2fa03734a3
add cross-reference to Input Groups in CSS Form docs; fixes #10792
2013-09-24 18:48:38 -07:00
Mark Otto
76e9d393ba
Merge pull request #10796 from twbs/skip-to-main-content
...
Use "Skip to main content" phrasing consistently; further #10786 fixes
2013-09-24 18:37:13 -07:00
Chris Rebert
af4d102767
Use "Skip to main content" phrasing consistently; further #10786 fixes
2013-09-24 18:02:18 -07:00
Mark Otto
63206a17e8
Merge pull request #10786 from acspike/skip-nav-link-wording
...
Alter wording of example Skip Nav link to improve pronunciation
2013-09-24 17:24:00 -07:00
Mark Otto
cf915f9c64
Merge pull request #10790 from twbs/disable-compatibility-mode
...
Disable IE Compatibility Mode in docs, examples
2013-09-24 17:16:06 -07:00
Julian Thilo
735105ae72
Add note about IE mode tag being included in docs
2013-09-24 22:49:47 +02:00
Chris Rebert
f19126ed08
Merge pull request #10778 from twbs/old-android-glyphicons-fix
...
Use updated Glyphicons to workaround old Android WebKit bug
2013-09-24 10:39:03 -07:00
Aaron Spike
dcfd9f27ff
Alter wording of example Skip Nav link to improve pronunciation
...
Screen reading applications, including Apple's VoiceOver, improperly pronounce the word "content" in "Skip to content" as an adjective rather than a noun because of insufficient context. "Skip to main content" is pronounced correctly.
See #6 and Guideline #10 at the following site for more information:
http://redish.net/content/papers/interactions.htmlAlter wording of example Skip Nav link to improve pronunciation
2013-09-24 11:52:06 -05:00
Julian Thilo
33e0877d21
Disable IE Compatibility Mode in docs, examples
...
...because we don't support it and it may cause problems for people
trying to view the docs in IE.
2013-09-24 18:43:16 +02:00
Ross Allen
3663e37005
Use bootstrap.less file order in Customizer
...
Appending stylesheets by iterating the `__less` Hash creates an order
that is not the same as 'bootstrap.less'.
Some stylesheets like 'component-animations.less' and 'modals.less' have
selectors with matching specificity, and so file order decides which
style wins. This causes issue #10030 by putting `.fade.in` after
`.modal-backdrop.in` and gives the backdrop a higher opacity than
intended.
This change uses the Less ordering in 'bootstrap.less' to generate the
final stylesheets in the Customizer to make sure customized file
ordering matches the distribution file order.
Fixes #10030
2013-09-23 23:33:20 -07:00
Chris Rebert
48f15faa5d
run grunt dist
2013-09-23 22:43:48 -07:00
Chris Rebert
2d0f5565ab
re-sort affected .glyphicon-* classes by new codepoints
2013-09-23 22:43:48 -07:00
Chris Rebert
b160e61451
Update affected .glyphicon-* CSS classes to use new codepoints
...
.glyphicon-briefcase: U+1F4BC -> U+E139
.glyphicon-calendar: U+1F4C5 -> U+E109
.glyphicon-pushpin: U+1F4CC -> U+E146
.glyphicon-paperclip: U+1F4CE -> U+E142
.glyphicon-camera: U+1F4F7 -> U+E046
.glyphicon-lock: U+1F512 -> U+E033
.glyphicon-bell: U+1F514 -> U+E123
.glyphicon-bookmark: U+1F516 -> U+E044
.glyphicon-fire: U+1F525 -> U+E104
.glyphicon-wrench: U+1F527 -> U+E136
2013-09-23 22:43:48 -07:00
Chris Rebert
dca7be6b67
Update Glyphicons font to resolve #10106
...
Workaround an old Android WebKit bug by switching to codepoints within the BMP.
Details: http://stackoverflow.com/questions/9241519/webkit-css-content-unicode-bug
Extra special thanks to @jankovarik for doing this update. <3
Source: https://www.dropbox.com/s/clh9y6lqtmj01l8/halflings_updated_for_android.zip
(As posted in https://github.com/twbs/bootstrap/issues/10106#issuecomment-24539909 )
2013-09-23 22:41:43 -07:00
Chris Rebert
b80f58b336
run grunt dist
2013-09-23 22:34:36 -07:00
Mark Otto
9ce142ca12
Merge pull request #10768 from twbs/polaroid-thumbnail-docs
...
fix #10767 ; current .img-thumbnail is equivalent to old .img-polaroid
2013-09-23 19:10:38 -07:00
Mark Otto
62c9199dc5
Merge pull request #10770 from twbs/rename-assets
...
move /assets/ to /docs-assets/ ; fixes #10715
2013-09-23 19:08:50 -07:00
Mark Otto
5911d95d69
Merge pull request #10769 from twbs/deprecate-hide
...
deprecate .hide; fixes #10446
2013-09-23 19:08:01 -07:00
Chris Rebert
f503efc490
avoid using the term "assets" due to potential confusion
2013-09-23 13:02:33 -07:00
Chris Rebert
8aa5181126
move /assets/ to /docs-assets/ ; fixes #10715
2013-09-23 13:02:26 -07:00
Chris Rebert
c4e7e3c933
deprecate .hide; fixes #10446
2013-09-23 12:46:57 -07:00
Chris Rebert
29935e4e26
fix #10767 ; current .img-thumbnail is equivalent to old .img-polaroid
2013-09-23 12:06:33 -07:00
Chris Rebert
229469e059
Merge pull request #10763 from XhmikosR/html5shiv
...
Update html5shiv to v3.7.0.
2013-09-23 09:03:16 -07:00
XhmikosR
d675e82e50
Update html5shiv to v3.7.0.
2013-09-23 16:51:49 +03:00
Jochen Berger
f350d1ba3d
don't create new Tooltip/Popover objects just to destroy them immediately
2013-09-23 15:14:37 +02:00
Mark Otto
8a181a1388
Merge pull request #10695 from FredericoC/fix-nav-active-caret
...
Fixed issue where caret wouldn't inherit "active" li style on nav-pills
2013-09-22 16:53:01 -07:00
Mark Otto
5b12736fb7
Merge pull request #10741 from ZDroid/patch-1
...
Avoid LESS nesting if isn't needed
2013-09-22 07:25:33 -07:00
Mark Otto
ed44a3255c
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-22 09:20:15 -05:00
Mark Otto
000b445a04
Fixes #10755 : Don't remove quotes around q element by default
2013-09-22 09:19:37 -05:00
Chris Rebert
88854a83d1
Merge pull request #10749 from ZDroid/patch-2
...
@headingsColor → @headings-color
2013-09-21 14:19:21 -07:00
Zlatan Vasović
dc3d16648c
@headingsColor → @headings-color
2013-09-21 14:19:11 +02:00
Mark Otto
86ec05793a
Merge pull request #10693 from twbs/include-docs-license
...
include a copy of the CC-BY 3.0 License that the docs are under
2013-09-20 22:14:57 -07:00
Chris Rebert
68c6deebda
fix #10737
2013-09-20 11:49:32 -07:00
Chris Rebert
d8ba5989cd
Merge pull request #10743 from hnrch02/patch-1
...
Fix a silly typo
2013-09-20 10:49:13 -07:00
Heinrich Fenkart
c938c4438f
Fix a silly typo
2013-09-20 19:43:47 +02:00
Zlatan Vasović
2304ba6a25
Avoid LESS nesting if isn't needed
2013-09-20 18:06:48 +02:00
Mark Otto
e148923f27
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/css/bootstrap.min.css
2013-09-19 22:57:11 -05:00
Mark Otto
ef636bd62d
Fixes #10694 : Remove unnecessary content property from .caret
2013-09-19 22:56:17 -05:00
Mark Otto
22d308b2c1
Merge pull request #10724 from ZDroid/patch-1
...
white → #fff
2013-09-19 17:20:47 -07:00
Chris Rebert
607b802d2f
fix #10732
2013-09-19 15:49:53 -07:00
Lipis
c6eca2c9ca
Same fix for the navbar example of sticky footer
2013-09-19 20:49:16 +02:00
Lipis
7823136a79
Removed the unnecessary override and the !important from .wrap
...
In the sticky footer example there were some weird stuff..
2013-09-19 20:48:16 +02:00
Zlatan Vasović
73403b78cc
white → #fff
2013-09-19 16:41:06 +02:00
Chris Rebert
abad169f4b
Merge pull request #10710 from XhmikosR/patch-2
...
Patch 2
2013-09-18 23:44:56 -07:00
XhmikosR
0379c2056d
Update jszip.js to the latest git.
2013-09-19 09:27:09 +03:00
XhmikosR
b741608964
Show minification report for uglify-js.
2013-09-19 08:33:52 +03:00
Chris Rebert
5deee652f9
Merge pull request #10703 from XhmikosR/sort
...
Sort by name.
2013-09-18 13:15:18 -07:00
XhmikosR
3c0489102e
Sort by name.
2013-09-18 20:36:17 +03:00
Chris Rebert
68099ec275
Merge pull request #10682 from gordonwoodhull/master
...
Suggest documenting changes to plugin classes
2013-09-18 09:54:41 -07:00
Chris Rebert
1882d15db8
Merge pull request #10680 from XhmikosR/master
...
Update normalize to v2.1.3.
2013-09-18 09:38:14 -07:00
Gordon Woodhull
40d3e4c48b
merge plugin changes into main table
2013-09-18 07:44:56 -04:00
XhmikosR
45b6c6de46
Run grunt dist.
2013-09-18 08:14:39 +03:00
XhmikosR
60afea85b4
less/mixins.less: tabs to spaces.
2013-09-18 08:14:19 +03:00
XhmikosR
0cd6d35058
Update normalize to v2.1.3.
2013-09-18 08:05:34 +03:00
Frederico Carvalho
29f24f746c
corrected caret colour when a nav dropdown is open
2013-09-18 14:45:56 +10:00
Frederico Carvalho
b1208f380a
fixed issue where caret wouldn't inherit "active" li style on nav-pills, which caused the caret to stay blue
2013-09-18 14:31:52 +10:00
Chris Rebert
0de96b8f35
include a copy of the CC-BY 3.0 License that the docs are under
...
downloaded from http://creativecommons.org/licenses/by/3.0/legalcode.txt
2013-09-17 18:58:15 -07:00
Chris Rebert
4e962c572e
fix #10692
2013-09-17 17:41:58 -07:00
Gordon Woodhull
abee1cdf9d
a start at documenting plugin class changes
2013-09-17 12:03:02 -04:00
Mark Otto
f2750dd6bc
Merge pull request #10626 from buob/variablize-nav-pill-border-radius
...
Variablize nav pill border radius
2013-09-16 22:00:39 -07:00
Mark Otto
21486ffad8
Merge pull request #10641 from ggam/remove-accordion
...
Removed unneeded 'accordion-toggle' class from collapse examples
2013-09-16 21:53:27 -07:00
Mark Otto
02423caa85
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-16 21:49:12 -07:00
Mark Otto
bf47968d9c
Merge pull request #10655 from Soben713/master
...
Remove unnecessary semicolons
2013-09-16 21:49:01 -07:00
Mark Otto
63d1d09ebd
run grunt
2013-09-16 21:43:55 -07:00
Mark Otto
8f43820fff
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-16 21:42:43 -07:00
Mark Otto
515e11da32
Merge pull request #10663 from lipis/patch-1
...
Changed the border-color of .navbar-form to @navbar-default-border
2013-09-16 20:36:04 -07:00
Mark Otto
c14fe7904a
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-16 18:59:06 -07:00
Mark Otto
776d3fd6a0
fixes #9908 : add type attribute to customizer compile button to prevent accidental submissions
2013-09-16 18:58:52 -07:00
Chris Rebert
630bf13fb4
Merge pull request #10664 from ZDroid/patch-1
...
Fix package.json
2013-09-16 12:15:23 -07:00
Zlatan Vasović
d7fb54e5fb
Remove "js" keyword /cc @cvrebert
2013-09-16 20:40:12 +02:00
Chris Rebert
46bb8b4290
Merge pull request #10661 from Shotster/simplified-responsive-invisibility
...
Simplified CSS responsive-invisibility mixin
2013-09-16 10:59:22 -07:00
Zlatan Vasović
66abfe577e
Fix package.json
...
* Add "js" keyword
* Fix homepage link
* Bump grunt-contrib-connect to newer version
2013-09-16 19:42:52 +02:00
Lipis
a6e2a93feb
Changed the border-color of .navbar-form to @navbar-default-border
2013-09-16 19:36:39 +02:00
Kevin Lisota
cde1b9a178
add responsive CSS to hyperlinked images when thumbnail caption markup is used
...
When thumbnail caption markup is used in combination with a hyperlinked image, the image is not responsive. (non-hyperlinked images are fine, like the example in the docs) Adding a selector to apply responsiveness to hyperlinked images when thumbnail captions are used.
2013-09-16 08:21:09 -07:00
Steve S
ae3a9169e0
Simplified CSS responsive-invisibility mixin
2013-09-16 09:16:53 -05:00
Soheil Behnezhad
cc69911335
Derp, there were more
2013-09-16 16:37:03 +04:30
Soheil Behnezhad
0c39045222
Remove some more unnecessary semicolons
2013-09-16 16:25:53 +04:30
Chris Ziogas
ab3d0a27b3
Dropdown in panel header does not inherit its colors
...
Fix for issue #10627
2013-09-16 12:38:26 +03:00
Soheil Behnezhad
bff23ee1fe
Remove unnecessary semicolons
2013-09-16 13:47:48 +04:30
Chris Rebert
559fcbfbd6
Merge pull request #10653 from homeyer/patch-1
...
remove duplicate text in documentation for popover
2013-09-15 20:11:56 -07:00
Andrew Homeyer
31f32e8485
remove duplicate text in documentation for popover
2013-09-15 21:07:15 -06:00
ggam
3a20ec410b
Removed unneeded 'accordion-toggle' class. Fixes #10481
2013-09-14 19:15:42 +02:00
Jake Buob
2381ab088b
Add nav-pills-border-radius variable
2013-09-13 15:57:10 -04:00
Jake Buob
4d4976fdcc
Make nav pills border-radius border-radius-base
2013-09-13 15:56:30 -04:00
Mark Otto
6b97970d31
Merge pull request #10623 from jdorfman/jdorfman-maxcdn-link
...
getting-started - Replace NetDNA.com with MaxCDN.com
2013-09-13 11:49:11 -07:00
Justin Dorfman
6397ba1125
getting-started - Replace NetDNA.com with MaxCDN.com
2013-09-13 11:45:15 -07:00
Chris Rebert
b896ce0270
Merge pull request #10619 from mathiasose/master
...
Further clarification about this step
2013-09-13 09:45:16 -07:00
Mathias Ose
03b1aed37b
As a node.js noob, even with the previous clarification this was a bit unclear. This change should (hopefully) make it obvious.
2013-09-13 17:54:48 +02:00
Mark Otto
33a1852336
Merge pull request #10598 from ZDroid/patch-1
...
Linux users also love Chrome
2013-09-12 19:40:42 -07:00
Chris Rebert
4f20a29c32
rm irrelevant entries from .gitignore; fixes #10609
2013-09-12 11:29:26 -07:00
Zlatan Vasović
9a21fdaf6d
Better? /cc @mdo
2013-09-12 18:35:33 +02:00
Mark Otto
370130669c
Merge pull request #10602 from mikefrancis/patch-2
...
Added in list elements for dividers
2013-09-12 09:04:52 -07:00
Mike Francis
3c6229c435
Added in list elements for dividers
2013-09-12 12:46:03 +01:00
Zlatan Vasović
869238c071
We also use Chrome :P
2013-09-12 10:15:38 +02:00
Chris Rebert
129b85b70d
Merge pull request #10597 from ZDroid/patch-1
...
@grid-float-breakpoint need to be @screen-sm-min
2013-09-12 00:57:27 -07:00
Zlatan Vasović
5caf780081
@grid-float-breakpoint need to be @screen-sm-min
...
😄
2013-09-12 09:52:33 +02:00
Mark Otto
88ae76536d
Merge pull request #10573 from gribelu/tooltip-fix
...
Hardcoded Tooltip arrow positioning
2013-09-11 23:19:56 -07:00
Mark Otto
dbcb05880f
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-11 23:13:28 -07:00
Mark Otto
28e5572bf4
Fixes #10492 : Account for responsive tables in panels
2013-09-11 23:11:18 -07:00
Mark Otto
9c0d04d3e4
Merge pull request #10569 from ZDroid/patch-2
...
Change @screen-* to @screen-*-min
2013-09-11 23:07:47 -07:00
Mark Otto
fc92931107
Merge pull request #10594 from twbs/navbar-form-labels-warning
...
add same accessibility warning from .form-inline to .navbar-form docs
2013-09-11 23:02:11 -07:00
Chris Rebert
851acf3f33
add same accessibility warning from .form-inline to .navbar-form docs
2013-09-11 22:58:07 -07:00
Mark Otto
682ee3ab1e
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-11 21:14:25 -07:00
Mark Otto
291a23aa4f
Massive customizer audit and overhaul
...
I probably missed a few things and screwed up a few others, but this
takes the place of much of #9910 . I haven't added many variables—that
should be reserved for v3.1—but I have rejiggered the layout, added
missing ones, corrected wrong values, etc.
/cc @cvrebert @juthilo @saas786
2013-09-11 21:14:10 -07:00
Mark Otto
ba818bc4e3
Remove unneeded comment in layouts
2013-09-11 21:12:58 -07:00
Mark Otto
ecc6978241
Merge pull request #10590 from twbs/doc-jquery-version
...
document jQuery version requirement; fixes #10355
2013-09-11 20:22:33 -07:00
Chris Rebert
0e54a49b9d
Merge pull request #10591 from twbs/modal-remote-migration-doc
...
add modal 'remote' option semantics change to migration docs
2013-09-11 20:17:18 -07:00
Chris Rebert
306d850d3a
add modal 'remote' option semantics change to migration docs; fixes #10585
2013-09-11 20:08:59 -07:00
Chris Rebert
a1b0311597
document jQuery version requirement; fixes #10355
2013-09-11 19:53:32 -07:00
Mark Otto
a1cdbbe55e
scope customizer h4 change
2013-09-11 16:59:51 -07:00
Mark Otto
d88e743b41
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/css/bootstrap.min.css
2013-09-11 16:35:27 -07:00
Mark Otto
fddcadbc21
run grunt
2013-09-11 16:35:00 -07:00
Chris Rebert
725e2b9ccf
re-fix typo in comment
2013-09-11 16:24:03 -07:00
Mark Otto
cd7cf40aff
Merge pull request #10584 from twbs/ie_viewports
...
Fixes #10497 : Fix Windows 8 and Windows Phone 8 behavior and apply to docs
2013-09-11 16:19:12 -07:00
Mark Otto
b0ea3a08cd
Merge branch 'ie_viewports' of github.com:twbs/bootstrap into ie_viewports
...
Conflicts:
getting-started.html
less/responsive-utilities.less
2013-09-11 16:15:12 -07:00
Mark Otto
6519303549
fixes #10497 : Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs
2013-09-11 16:06:43 -07:00
Mark Otto
6e064894db
remove unnecessary right and left properties on .modal-dialog
2013-09-11 14:56:02 -07:00
Mark Otto
2dc7ab4bbb
fixes #10497 : Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs
2013-09-11 14:46:31 -07:00
Mark Otto
6ea2893af1
Merge pull request #10338 from twbs/readd-optin-notes
...
Fix #10324 : Add opt-in note to tooltip docs
2013-09-11 12:49:24 -07:00
Mark Otto
37933a9e08
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/css/bootstrap.min.css
2013-09-11 12:31:21 -07:00
Mark Otto
c69092a176
move to separate about page
2013-09-11 12:30:46 -07:00
Mark Otto
5d1707a25c
Remove old and unused .prettyprint styles in code.less (per #10566 )
2013-09-11 11:09:50 -07:00
Chris Rebert
c62426daeb
Merge pull request #10579 from roryokane/patch-1
...
Fix capitalization of “list groups” in middle of sentence
2013-09-11 10:29:19 -07:00
Rory O’Kane
eebbee7c81
Fix capitalization of “list groups” in middle of sentence
...
When “list groups” is used in the middle of a sentence in http://getbootstrap.com/components/#list-group-basic , it is not capitalized.
2013-09-11 12:18:32 -04:00
gribelu
d8202dd626
Fixed hardcoded tooltip arrow positioning
...
Tooltip Arrow positioning was hardcoded to 5px instead of using @tooltip-arrow-width.
2013-09-11 16:47:13 +03:00
Zlatan Vasović
50fcaba24f
The last
2013-09-11 10:38:42 +02:00
Zlatan Vasović
d9613268b0
Again?
2013-09-11 10:35:12 +02:00
Zlatan Vasović
a0653ef018
Rumbo Jumbo
2013-09-11 10:33:30 +02:00
Zlatan Vasović
e2e1c80d1a
Another fixup
2013-09-11 10:32:08 +02:00
Zlatan Vasović
b8a33eb1e0
Eagle eye
2013-09-11 10:29:15 +02:00
Chris Rebert
1497c21fe3
Merge pull request #10567 from ZDroid/patch-2
...
Use @screen-sm-min in forms
2013-09-11 01:14:36 -07:00
Zlatan Vasović
c10238c95f
Use @screen-sm-min in forms
2013-09-11 09:54:38 +02:00
Mark Otto
022e40404c
Remove multiple touch icons and roll with a single one
2013-09-10 21:46:12 -07:00
Mark Otto
b7e1103c32
Merge pull request #9989 from eins78/more-monospace-elements
...
code.less: also set default monospace font for `<kbd>` and `<samp>`
2013-09-10 21:38:24 -07:00
Mark Otto
e645d51b62
Merge pull request #10565 from twbs/gruntfile-css-banner
...
generate CSS banners via Gruntfile; fixes #10101
2013-09-10 21:27:07 -07:00
Mark Otto
84567af1a8
Merge pull request #10560 from ZDroid/patch-1
...
Remove display: block from address
2013-09-10 21:25:31 -07:00
Chris Rebert
2b5d7d23d0
generate CSS banners via Gruntfile; fixes #10101
2013-09-10 19:22:20 -07:00
Chris Rebert
1f3a87a8a0
fix punctuation in author field of package.json
2013-09-10 19:12:47 -07:00
Chris Rebert
76d8757b0a
rm period from licensing header so it's not mistaken as part of the URL
2013-09-10 19:01:40 -07:00
Chris Rebert
a9335e94e1
run grunt dist
2013-09-10 18:59:09 -07:00
Chris Rebert
cf09ec3c77
Merge pull request #10563 from lipis/patch-1
...
Updated the old btn-large in carousel example
2013-09-10 16:52:37 -07:00
Lipis
a2a5be11a3
Updated the old btn-large in carousel example
2013-09-11 01:34:56 +02:00
Chris Rebert
52516eceba
add missing comma in carousel.less; fixes #10562
2013-09-10 16:20:36 -07:00
Julian Thilo
1ebd282693
Rephrase text
2013-09-10 23:31:57 +02:00
Zlatan Vasović
886e7037f6
Remove display: block from address
...
<address> is already displayed as block in all browsers (UAs).
2013-09-10 23:27:04 +02:00
Julian Thilo
10a9601560
Fix #10556
...
Make media queries example in docs clearer
2013-09-10 18:00:58 +02:00
Mark Otto
c8c3bf00b6
fixes #9985 : update grid classes in grid example
2013-09-09 13:56:10 -07:00
Mark Otto
cd98b10ea5
Merge pull request #10542 from twbs/controls-migration-docs
...
add .control* to migration docs; fixes #10532
2013-09-09 13:22:34 -07:00
Chris Rebert
6bc1a5cf6e
add .control* to migration docs; fixes #10532
2013-09-09 12:34:53 -07:00
Mark Otto
fb9c81f894
dat hash
2013-09-09 10:19:53 -07:00
Mark Otto
ea99a0a6f1
dat @juthilo edit
2013-09-09 09:51:38 -07:00
Mark Otto
674e83aa01
Copy edits from @cvrebert and @juthilo
2013-09-09 08:34:21 -07:00
Topsitemakers
3d97454c09
adding required attribute for example signin form
2013-09-09 12:36:56 +02:00
Mark Otto
632e3c42d5
Merge branch 'master' into docs_welcome
2013-09-08 20:39:07 -07:00
Mark Otto
fff5e540f5
fixes #10526 : Remove custom background on responsive tables and set it in the docs where it should've been originally
2013-09-08 20:03:52 -07:00
Mark Otto
d42591e6e5
use irc link
2013-09-08 19:56:11 -07:00
Mark Otto
f00e6deb92
shorter avatar urls
2013-09-08 19:49:40 -07:00
Mark Otto
77549410d5
Add Welcome section to docs
...
* Fixes unrelated typo in readme
* Add new Welcome section with history, team, callouts, and community
subsections
* Redesigns callouts to be a bit lighterweight with colored headings
2013-09-08 18:37:39 -07:00
Mark Otto
afb6cf1d01
Match order of vars to order of components; darken some alert borders
2013-09-08 16:58:56 -07:00
Mark Otto
16279056ae
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-08 08:04:19 -07:00
Mark Otto
3f158175ce
fixes #10521 : Only remove bottom-border from last row of cells in tbody and tfoot within responsive tables
2013-09-08 08:04:11 -07:00
Julian Thilo
601364418f
Merge pull request #10523 from ZDroid/patch-1
...
Added missing semicolon
2013-09-08 06:47:14 -07:00
Zlatan Vasović
f9fe6cd05f
Added missing semicolon
2013-09-08 15:37:02 +02:00
Alexey
7ee2b6a976
changed attr('data-target') to data('target');
...
this will extend js interface, to be possible to setup targets for tabs as
var content=$('<div class="tab-pane">',{text: 'content'});
var tab=('<li>',{html: $('<a>',{text: 'Main options'})}).addClass('active').data({target: $main,toggle: 'tab'}).appendTo(tabs);
2013-09-08 04:49:27 +03:00
Mark Otto
d126d8c6f3
Run grunt to gen raw files
2013-09-06 09:57:25 -07:00
Mark Otto
f80fd03542
Remove nav from jumbotron example (temp fix for #10228 )
2013-09-06 09:57:19 -07:00
Mark Otto
8bea86e2ef
fixes #10024 : Use negative margin to fix the border between button and input in input groups
2013-09-06 09:50:38 -07:00
Mark Otto
e5038a339c
Merge pull request #9968 from thelukemcdonald/master
...
Apply gradient stripe @color parameter
2013-09-06 09:31:36 -07:00
Mark Otto
5c4c7eba54
Merge branch 'master' of https://github.com/nuttertag/bootstrap into nuttertag-master
...
Conflicts:
dist/css/bootstrap.min.css
2013-09-06 09:23:49 -07:00
Mark Otto
532e4bab58
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-06 09:22:34 -07:00
Mark Otto
b24adeb82f
fix broke width of containers in docs given change to use width over max-width
2013-09-06 09:22:19 -07:00
Mark Otto
72a39eb747
Merge pull request #10025 from barryvdh/patch-2
...
Add missing methods (rotateX/Y, perspective(-origin) and transform-origin)
2013-09-06 09:18:00 -07:00
Mark Otto
394161f281
Merge branch 'GSEdits7' of https://github.com/StevenBlack/bootstrap into StevenBlack-GSEdits7
...
Conflicts:
getting-started.html
2013-09-06 09:11:26 -07:00
Mark Otto
cec89e20a9
fixes #10491 : new docs background base64 image
2013-09-06 09:03:50 -07:00
Mark Otto
b51579241f
account for last child bottom border; use 0 instead of none
2013-09-05 15:10:56 -07:00
Kevin O'Connor
ac244040d1
Don't double border a bordered table within a panel
2013-09-05 15:54:18 -04:00
Steven Black
00673991af
Fixed two more instances of [.]LESS in the text
2013-09-05 14:03:43 -04:00
Steven Black
bdb9fd9a7c
Removed the '.' from '.LESS' in two instances.
2013-09-05 13:43:04 -04:00
Chris Rebert
8651180ca7
Merge pull request #10471 from javiereguiluz/patch-4
...
[doc] fixed the horizontal form example
2013-09-05 10:25:06 -07:00
Steven Black
e94b790e64
Standardizing on LESS (uppercase) and avoiding the word 'less' where that's easy and sensible.
2013-09-05 09:09:20 -04:00
Steven Black
f1fba93c1e
Better wording, avoiding 'invoke', and misc edits
2013-09-05 08:53:50 -04:00
Javier Eguiluz
6c0f20c446
[doc] fixed the horizontal form example
2013-09-05 11:57:23 +02:00
Mark Otto
31dfc3218e
Merge pull request #10453 from ckundo/add-dropdown-button-text
...
Add visibly hidden button text for screen reader users.
2013-09-05 00:11:04 -07:00
Chris Rebert
121790c106
add <code> around ".less" in Getting Started docs
2013-09-04 21:28:04 -07:00
Steven Black
63b61eea7f
Docs - Getting started: refactor 'Customizing Bootstrap'
2013-09-04 23:39:57 -04:00
Chris Rebert
0b0087f3a7
fix swapped angle brackets in docs; fixes part of #10456
2013-09-04 20:33:18 -07:00
Mark Otto
56c8826c77
Fixes #10452 : Add note about deprecation of .nav-divider
...
Should have been dropped in v3, but ah well, we missed it. So, it gets
the deprecation.
2013-09-04 18:52:45 -07:00
Mark Otto
124c80b30a
add docs callout to mention #9947
2013-09-04 17:58:01 -07:00
Mark Otto
fc8e66d2cb
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-04 17:46:39 -07:00
Mark Otto
44fddf1c3e
fixes #10449 : use th with scope in table; add scope to th in thead
2013-09-04 17:46:25 -07:00
Cameron Cundiff
fbd7f2e052
Add visibly hidden button text for screen reader users.
...
[Finishes #10448 ]
2013-09-04 16:53:37 -06:00
Chris Rebert
a9b58181c6
clarify working directory requirement of npm install
2013-09-04 15:25:07 -07:00
Chris Rebert
d10ed7ef5e
bump minor/patch versions of other dependencies
2013-09-04 14:15:51 -07:00
Chris Rebert
07075456b7
bump grunt-recess to 0.4.0
2013-09-04 14:09:22 -07:00
Mark Otto
1c4bdb053b
Fixes #10399 : Add hover styles to text emphasis classes
2013-09-04 13:56:32 -07:00
Mark Otto
c0f6d722b0
polish off #10227 with an inline comment
2013-09-04 12:16:46 -07:00
Mark Otto
4498e8f57b
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-04 12:16:14 -07:00
Mark Otto
88e1e20b95
Merge pull request #10227 from UTCWebDev/master
...
Fixes 10212 - Make custom max-width on row conform to Bootstrap convention
2013-09-04 12:15:45 -07:00
Mark Otto
6ce9b4d041
Fixes #10417 : Document .hidden in the Helper classes *Screen reader content* section
2013-09-04 12:08:07 -07:00
Mark Otto
0d80320fa2
Merge pull request #10421 from StevenBlack/GSEdits6
...
Getting started docs - Migrating section: refactor the text for ...
2013-09-04 11:41:20 -07:00
Steven Black
e3647c1320
fixed a </p> tag that was on its own line.
2013-09-04 14:40:32 -04:00
Steven Black
11c3ffe4fc
Yet another manually wrapped text line consolidated
2013-09-04 12:22:51 -04:00
Steven Black
a37b37169f
Removed a trailing space at end of line.
2013-09-04 12:18:58 -04:00
Steven Black
43efd43717
Fixed to lowercase 'v' in 'v3.0'
2013-09-04 12:17:39 -04:00
Mark Otto
d8dc805f9b
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-04 09:09:22 -07:00
Mark Otto
34f1487146
Fixes #10436 : use screen-sm var instead of hardcoded pixel value
2013-09-04 09:08:52 -07:00
Steven Black
ea734863c3
No manual line breaks in HTML text as per custom.
2013-09-04 11:29:51 -04:00
Steven Black
a82d038f52
For consistency with the rest of the docs, removed manually line-wrapped HTML text.
2013-09-04 09:03:03 -04:00
Chris Rebert
5a6fac2d84
Merge pull request #10427 from liamzebedee/patch-1
...
Fixed error in documentation in mixins.less
2013-09-04 02:02:26 -07:00
Liam
12558bb504
Fixed error in documentation in mixins.less
2013-09-04 18:59:44 +10:00
Chris Rebert
4f7f1f6c6e
Merge pull request #10423 from hustlzp/master
...
CSS docs - Grid section: two dots are missing before 'col-md-8'
2013-09-04 00:54:03 -07:00
Zhipeng Liu
7c7c0e6139
CSS docs - Grid section: two dots are missing before 'col-md-8'
...
Add the two missing docs
2013-09-04 15:45:10 +08:00
Steven Black
6ed44eded5
Getting started docs - Migrating section: refactor some of the text for clarity and easy reading.Also removed some rogue tab characters in the source that I introduced in prior commits.
2013-09-04 00:20:28 -04:00
Mark Otto
5773638329
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-03 20:17:45 -07:00
Mark Otto
143403f3fd
Fixes #10407 : Add line-height to progress bar for proper text alignment within
2013-09-03 20:11:27 -07:00
Chris Rebert
95df76fc54
Merge pull request #10419 from twbs/doc-that-nav-lists-are-gone
...
add .nav-list & .nav-header to removals section of migration guide
2013-09-03 19:54:34 -07:00
Chris Rebert
6ac5a1e2dc
add .nav-list & .nav-header to removals section of migration guide; fixes #9139
2013-09-03 19:52:25 -07:00
Mark Otto
dcdafa4220
Merge branch 'master' into carousel-glyphicons-mainstream
...
Conflicts:
javascript.html
2013-09-03 18:43:42 -07:00
Mark Otto
72b1f69bfc
dat grunt
2013-09-03 18:31:02 -07:00
Mark Otto
894aa93a9f
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-03 18:21:28 -07:00
Mark Otto
2804d37429
Merge branch 'color-code-IE89-table'
2013-09-03 18:20:43 -07:00
Mark Otto
e62a04a19b
Color code IE8-9 table with text classes and Glyhpicons instead of table classes
2013-09-03 18:20:21 -07:00
Mark Otto
e4514b4596
Merge pull request #10413 from twbs/carousel-transitions-no-fallback-note
...
address #10343 more directly: add note on carousel transitions in IE8+9
2013-09-03 18:09:49 -07:00
Chris Rebert
73e4b81790
make Glyphicons mainstream in Carousel examples
2013-09-03 17:46:35 -07:00
Chris Rebert
01361951e6
address #10343 more directly: add note on carousel transitions in IE8+9
2013-09-03 17:34:21 -07:00
Chris Rebert
19db69c902
we've got your back (sorta), Linux Firefox users
2013-09-03 17:01:21 -07:00
Chris Rebert
5dc65894c0
Color-code the "Internet Explorer 8 and 9" features table
2013-09-03 16:51:17 -07:00
Chris Rebert
3bb3680aac
docs: fix typo in "Internet Explorer 8 and 9" features table
...
"placehoder" (sic)
2013-09-03 16:46:02 -07:00
Chris Rebert
f3c644cb1b
copyedit "Internet Explorer 8 and box-sizing" section
2013-09-03 16:36:13 -07:00
Mark Otto
b150422335
Merge pull request #10408 from twbs/getting-started-minor-edits
...
CSS vs. LESS vs. styles terminology; "precompiled" terminology
2013-09-03 15:52:28 -07:00
Mark Otto
171fc396ac
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-03 15:50:44 -07:00
Mark Otto
0a78e7907d
fixes #10406 : Update grid to use width on .container instead of max-width as IE8 improperly computes width
2013-09-03 15:49:03 -07:00
Mark Otto
5eead87ed7
remove min-height from ads because ie8
2013-09-03 15:35:48 -07:00
Mark Otto
6fb81f155b
more space below links on homepage
2013-09-03 15:33:36 -07:00
Chris Rebert
1113224e97
minor copyedit
2013-09-03 12:53:52 -07:00
Chris Rebert
7fbd8affe4
CSS vs. LESS vs. styles terminology; "precompiled" terminology
2013-09-03 12:32:24 -07:00
Chris Rebert
488b8dad2b
slightly clarify button.active use in docs
2013-09-03 12:21:19 -07:00
Chris Rebert
82d19a41ba
bump grunt-contrib-connect to 0.4.0
...
Thanks David.
2013-09-03 12:17:30 -07:00
Chris Rebert
a1b3fb339e
minor copyedit
2013-09-03 12:15:33 -07:00
Mark Otto
87df4784c1
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-03 07:31:00 -07:00
Mark Otto
c2a5334dee
fixes #10396 : mention table class change in migration docs
2013-09-03 07:30:46 -07:00
Mark Otto
b080347106
Merge pull request #10375 from StevenBlack/GSEdits4
...
Refactoring the paragraph describing the 'Examples' section.
2013-09-03 02:28:01 -07:00
Mark Otto
dd44123881
remove unused .panel-collapse ruleset
2013-09-03 01:04:17 -07:00
Mark Otto
352f5923d7
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-03 00:55:29 -07:00
Mark Otto
36afdbcaac
mo betta docs on box-sizing to build on e521ee8309
2013-09-03 00:49:59 -07:00
Mark Otto
49373b9b45
fixes #10372 : two download buttons on homepage; also fixes broke button styles
2013-09-02 20:20:47 -07:00
Mark Otto
a4897aed88
Merge pull request #10382 from StevenBlack/GSEdits5
...
'Disabling responsiveness' section of docs: simplification and focus
2013-09-02 20:13:57 -07:00
Mark Otto
54b75ffae3
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-02 19:53:20 -07:00
Mark Otto
e521ee8309
update box-sizing third party support section to include mention of google CSE and expand to include CSS and Less options
2013-09-02 19:52:59 -07:00
Steven Black
9361ebe4fd
Getting Started page: Simplified and focused the text of the 'Disabling responsiveness' section.
2013-09-02 20:01:36 -04:00
Steven Black
259be69e25
Refactoring the paragraph describing the 'Examples' section.
2013-09-02 15:24:55 -04:00
Julian Thilo
c6d51be2d8
Merge pull request #10374 from tagliala/patch-2
...
Fixed glyphicons count
2013-09-02 10:32:45 -07:00
Chris Rebert
e7f8d0c957
Merge pull request #10366 from coliff/patch-2
...
Update index.html (change from 'hero unit' to 'jumbotron')
2013-09-02 10:31:55 -07:00
Christian
5d88943a52
Update index.html
...
Updated text in the jumbotron container to reflect the Bootstrap 3 change from 'hero unit' to 'jumbotron'.
2013-09-02 21:36:54 +09:00
Chris Rebert
93dc003a83
Merge pull request #10364 from wangsai/patch-1
...
Completion of parentheses
2013-09-02 02:50:45 -07:00
wangsai
d132c48ec9
Completion of parentheses
2013-09-02 17:47:04 +08:00
Mark Otto
a245c0d1cd
derp, add on to #10153 with proper variable /cc @ggam
2013-09-01 20:52:23 -07:00
Aleksey V. Zapparov
626cef9fa4
Pass $element to offset top/bottom calc funcs
...
At the moment to make dynamic top offset calculator on multiple elements, one would write:
``` javascript
$('.my-affix').each(function () {
var $el = $(this);
$el.affix({
offset: {
top: function () { return $el.offset().top; }
}
});
})
```
This patch will allow to:
``` javascript
$('.my-affix').affix({
offset: {
top: function ($el) { return $el.offset().top; }
}
});
```
2013-09-02 03:24:27 +02:00
Mark Otto
079fa16b9f
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-02 00:10:35 +02:00
Mark Otto
14b3a3542f
fixes #10316 : Document .active and :active for buttons
2013-09-02 00:09:49 +02:00
Mark Otto
f69da1c2ef
Merge pull request #10342 from twbs/affix-docs
...
minor improvements to affix docs
2013-09-01 14:59:34 -07:00
Mark Otto
741e0fc52c
fixes #10344 : Update IE8-9 support section with table of specific CSS3 and HTML5 features and their support in Bootstrap
2013-09-01 23:58:22 +02:00
Mark Otto
8df05b95df
Remove links to navbar examples from example navbars in Theme example--nullifies #9894
2013-09-01 23:46:23 +02:00
Mark Otto
de82c80784
update vars to use new component-active-color
2013-09-01 23:40:04 +02:00
Mark Otto
1fd9237840
fixes #9909 : Add component active color variable to complement component active bg variable
2013-09-01 23:38:11 +02:00
Mark Otto
bfda156bb9
alt fix to #10278 : Change Google Maps compatibility warning to a general box-sizing warning
2013-09-01 23:32:35 +02:00
Mark Otto
26727bfefd
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-01 21:55:59 +02:00
Rodrigo Willrich
9d2491a808
Bower: Ignore development and documentation files on bower.json. Fix #10313 .
...
I've kept only the files I consider relevant to bower installation:
- Files in dist directory;
- Files in js directory;
- Files in less directory;
- bower.json file;
- README.md file;
- LICENSE file.
2013-09-01 16:50:24 -03:00
Geremia Taglialatela
f4fde25535
Fixed glyphicons count
...
Glyphicons are 200
refers to #9794
2013-09-01 14:36:32 +02:00
Chris Rebert
9369489883
fix straggler instance of "Tiny grid" terminology
2013-09-01 04:14:55 -07:00
Mark Otto
b45c3ea647
fixes #10164 : Document .center-block mixin and update CSS to include it as a class as well
2013-09-01 11:21:14 +02:00
Chris Rebert
d2e1fef34a
minor improvements to affix docs
2013-09-01 02:09:12 -07:00
Mark Otto
50bf4d47b1
reverse vars for backwards compatibility /cc @cvrebert
2013-09-01 11:06:33 +02:00
Mark Otto
25cc04c5ab
Merge branch 'deprecate_screen_containers'
2013-09-01 11:05:14 +02:00
Mark Otto
d28abc4bf1
fixes #10115 : Default carousel controls and Glyphicon controls should behave the same on small devices and up
2013-09-01 11:03:19 +02:00
Mark Otto
62477653e7
fixes #10111 : different colors for dropdown link hover and active states
2013-09-01 11:00:40 +02:00
Chris Rebert
604c3b2efc
tweak #10336 to double up on the hyphen-minuses to better approximate a long dash
2013-09-01 01:46:18 -07:00
Chris Rebert
24d45f26eb
Merge pull request #10336 from Shipow/master
...
Replace invalid US-ASCII character "\xE2")
2013-09-01 01:43:48 -07:00
Chris Rebert
5418a72243
tweak #10298
2013-09-01 01:35:56 -07:00
Mark Otto
e8f7d4fcef
fixes alignment and nav list in offcanvas example
2013-09-01 10:34:21 +02:00
Chris Rebert
2066ea50a2
Merge pull request #10298 from jhr007/patch-1
...
Note the change to the progress bar.
2013-09-01 01:34:15 -07:00
Mark Otto
129d8fcebc
fixes #10282 : Cross reference tabs and tabs plugin
2013-09-01 10:27:20 +02:00
Mark Otto
e2c6d32997
fixes #10277 : Mention removal of navbar vertical dividers in migration docs
2013-09-01 10:21:27 +02:00
Mark Otto
9616768659
remove unused link from navs section
2013-09-01 10:19:55 +02:00
Mark Otto
772e6e359e
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-01 10:18:54 +02:00
Mark Otto
58401daf1c
finishes #10256 to add updated var to customizer; also fixes another old var
2013-09-01 10:15:39 +02:00
Mark Otto
9a32b21dc7
Merge branch 'master' into tagliala-patch-1
2013-09-01 10:13:47 +02:00
Mark Otto
c9303c17ab
Merge pull request #10249 from coliff/patch-1
...
Update index.html (update text from hero unit to jumbotron)
2013-09-01 01:09:55 -07:00
Chris Rebert
a7863c112d
restore "only" wording in docs regarding Recess/less.js
...
It was there for good reason.
We're not gonna deal with lessphp or dotless bugs.
2013-09-01 01:09:28 -07:00
Mark Otto
dfda3dfe37
fixes #10246 : Use correct variable for link hover color in Customizer
2013-09-01 10:07:15 +02:00
Mark Otto
7f6210cea4
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-01 10:04:54 +02:00
Mark Otto
3a4ea1a7be
better layout
2013-09-01 10:04:44 +02:00
Mark Otto
e10bf3aa7f
finishes #10245 by adding it the new var to the customizer
2013-09-01 10:04:03 +02:00
Mark Otto
daa8330b41
Merge branch 'master' into dancek-breadcrumb-separator
2013-09-01 10:01:57 +02:00
Mark Otto
1e68143b39
Merge pull request #10232 from twbs/table-nesting
...
use direct-child selector more in table styles to better support nested tables
2013-09-01 00:59:55 -07:00
Mark Otto
560753da96
Merge branch 'master' into table-nesting
...
Conflicts:
dist/css/bootstrap.min.css
2013-09-01 09:59:27 +02:00
Mark Otto
4b53ea52e9
fixes #10223 : adds color to input addon
2013-09-01 09:53:41 +02:00
Mark Otto
794d784519
fixes #10153 : restore headings-color variable
2013-09-01 09:49:28 +02:00
Mark Otto
9e541fc717
fixes #10136
2013-09-01 09:46:33 +02:00
Mark Otto
f29ec45715
Merge branch 'master' into deprecate_screen_containers
2013-09-01 09:33:11 +02:00
Mark Otto
e47ebf3686
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-01 08:18:46 +02:00
Mark Otto
8f80a76bf3
Merge pull request #10299 from StevenBlack/GettingStartedEdits1
...
'Getting started' section: refactoring for succinctness, active voice, and consistency with button and link captions.
2013-08-31 23:17:54 -07:00
Mark Otto
5c3614d97c
Merge pull request #10323 from StevenBlack/GSEdits3
...
Getting started docs: tweaks to the _Basic template_ section
2013-08-31 23:15:47 -07:00
Mark Otto
9ba64cc1a9
Merge branch 'patch-1' of https://github.com/tagliala/bootstrap into tagliala-patch-1
2013-09-01 08:13:51 +02:00
Mark Otto
eb95574d80
Merge branch 'breadcrumb-separator' of https://github.com/dancek/bootstrap into dancek-breadcrumb-separator
2013-09-01 08:12:56 +02:00
Julian Thilo
95c796d61e
Fix #10324 : Add opt-in note to tooltip docs
...
* Re-added a note (now callout) about need to opt in to tooltip docs
* Converted same note in popover section to callout
2013-08-31 20:43:57 +02:00
Kevin Granger
f849e65d56
Replace invalid US-ASCII character "\xE2")
...
Replace invalid US-ASCII character "\xE2") '—' => '-'
2013-08-31 17:50:14 +02:00
Mark Otto
3e62905f9d
Merge branch 'master' of github.com:twbs/bootstrap
2013-08-31 09:04:17 +02:00
Mark Otto
644c227ae1
Merge pull request #10265 from twbs/fix-10252
...
fix #10252 by restricting Android Firefox reset to only .form-control & .btn
2013-08-30 23:31:30 -07:00
Roland Warmerdam
ed1bd2b150
carousel: correctly reset when the slide event is prevented
2013-08-31 18:03:09 +12:00
Steven Black
a18fefe9bc
Getting started docs: tweaks to the _Basic template_ section
2013-08-31 00:03:14 -04:00
Chris Rebert
216df5bb46
Merge pull request #10315 from mokkabonna/phantom-cleanup
...
deleted files not used anymore after transition to grunt-contrib-qunit
2013-08-30 12:58:24 -07:00
Martin Hansen
6d3ad5ed7f
deleted files not used anymore after transition to grunt-contrib-qunit
2013-08-30 21:39:48 +02:00
Chris Rebert
e08f4ff762
Merge pull request #10312 from jleight/master
...
Fix broken link to alerts section of JS page.
2013-08-30 12:26:11 -07:00
Jonathon Leight
ccb630e60f
Fix broken link to alerts section of JS page.
...
Link was pointing to #js-alerts, but that section of the page does not exist. Changed to #alerts instead.
2013-08-30 15:01:07 -04:00
jhr007
0aa4eecee1
Moved "Major class changes" section; Added progress-bar-*
2013-08-30 00:14:21 -05:00
Steven Black
2e2fffe8f8
more refactoring of the 'Getting started' section towards more succinct and active wording.
2013-08-30 01:07:09 -04:00
Steven Black
36044b3a11
More concise 'fastest way' statement, and consistency with the text of the Download button
2013-08-30 00:38:48 -04:00
jhr007
f567646738
Add a change to the progress bar.
...
In v3 the inner progress bar should have .progress-bar not .bar
2013-08-29 23:21:07 -05:00
Chris Rebert
5b21768c05
fix #10292
2013-08-29 16:12:39 -07:00
Julian Thilo
0ce3d67f35
Merge pull request #10276 from javiereguiluz/patch-3
...
Correct comment in grid mixin example
2013-08-29 08:30:17 -07:00
Javier Eguiluz
83354ab156
[doc] minor fix in the LESS mixins example
2013-08-29 11:51:39 +02:00
Chris Rebert
2ef147b16b
fix #10252 by restricting Android Firefox reset to only .form-control & .btn
2013-08-28 15:37:34 -07:00
Chris Rebert
5c7d339752
Revert "fix styling of alert-dismissable example"
...
This reverts commit b3a23fa33a .
2013-08-28 14:57:41 -07:00
UTCWebDev
ee2e2ae0ae
Prevent X-scroll on small screens
...
html overflow-x must be hidden to prevent accidental x-scroll on small screens. This is more apparent with touch screens, where the user often gestures diagonally instead of a true vertical gesture.
2013-08-28 15:55:45 -04:00
Geremia Taglialatela
86632a242b
Base the navbar default brand hover color on default brand color
...
IMHO this default is better
2013-08-28 18:18:44 +02:00
Christian
32fbc882b9
Update index.html
...
Updated text in the jumbotron container to reflect the Bootstrap 3 change from hero unit to jumbotron. (Wasn't sure if it should be 'a Jumbotron' or just 'Jumbotron' though...
2013-08-28 20:09:17 +09:00
Hannu Hartikainen
a19ff2f50f
Parameterize @breadcrumb-separator
2013-08-28 12:17:46 +03:00
Chris Rebert
901da1b2b4
use direct-child selector more in table styles to better support nested tables; fixes #10231
2013-08-27 17:13:34 -07:00
UTCWebDev
5ce4b8c7ff
Make custom max-width on row conform to Boostrap convention
...
Bootstrap break point for tablet portrait 768 keeps the row intact, so it's not appropriate to have off-canvas elements at that width. Custom off-canvas.css should be breakpoint 767px
2013-08-27 16:34:26 -04:00
Chris Rebert
73f10843a4
components.html: fix grammar
2013-08-27 11:18:10 -07:00
Chris Rebert
b3a23fa33a
fix styling of alert-dismissable example
2013-08-27 11:15:14 -07:00
Mark Otto
58408b0232
Fixes #10154 : add .small
2013-08-27 09:21:09 -07:00
Mark Otto
32c03994ee
Merge pull request #10222 from jodytate/upstream
...
a few wording tweaks
2013-08-27 09:15:30 -07:00
jody tate
1786aed71d
a few wording tweaks
...
- Changed some existential constructions (yes, they're really called
existential http://en.wikipedia.org/wiki/Existential_clause ). These
aren't innately evil, but rewordings of existential clauses often sound
more direct.
- Changed a "which" to a "that."
2013-08-27 09:11:33 -07:00
Mark Otto
4f28fdd227
Fixes #9928 and #9932 : carousel example in IE10
...
* Use absolute positioning instead to remove navbar from flow of
document
* No more negative margin fu
* Flip around padding between container and navbar for proper display
in xs and sm viewports
2013-08-27 09:10:06 -07:00
Mark Otto
c84374f9de
fixes #9901
2013-08-27 08:53:48 -07:00
Mark Otto
2f2ce15e58
Fixes #10082 : document .navbar-form
...
* Adds new section to navbar docs with example
* Updates example classes for all collapsing navbars so their numbers
increment as you scroll
2013-08-27 08:34:17 -07:00
Mark Otto
19c0d2ad94
Merge pull request #10131 from andyen/master
...
correct enable selector for button usage in docs
2013-08-27 08:23:40 -07:00
Mark Otto
e4a2c35b84
Fixes #10088 : Simpler nested headings section in accessibility docs
...
* Headings, not headers
* Simplifies content compared to #10088 which adds quite a lot
* Uses proper heading elements (`h1` - `h6`) and not `header`
* Collects links at bottom instead of mid-paragraph
2013-08-27 08:19:51 -07:00
Mark Otto
4b68858f90
Merge branch 'master' of github.com:twbs/bootstrap
2013-08-27 08:05:54 -07:00
Mark Otto
1445e09b5f
Fixes #9991 : Better docs for tabbable tabs and fade classes
...
* Adds full code snippets
* Adds snippet for `.fade`
* Adds callout for `.in` requirement on first fade-able tab
2013-08-27 08:05:26 -07:00
Mark Otto
b2b91a0a34
Merge pull request #10215 from XhmikosR/master
...
Various
2013-08-27 07:58:49 -07:00
Mark Otto
e97b8be2c4
Merge pull request #10208 from javiereguiluz/patch-2
...
[doc] tweaked the appearance of the last item of the file listings
2013-08-27 07:50:23 -07:00
Mark Otto
1f16e21e75
Merge pull request #10209 from clbn/master
...
Fixes #10207 : alert-dismissable example requires contextual class
2013-08-27 07:43:17 -07:00
Julian Thilo
4d0b895db7
Merge pull request #10210 from acmetech/master
...
Update the example for components/#btn-groups-justified to match the "Element-specific usage" callout
2013-08-27 07:40:45 -07:00
XhmikosR
26728576f3
Add bugs property to package.json.
2013-08-27 17:21:15 +03:00
XhmikosR
a586844c90
Update html5shiv.js to v3.6.2.
2013-08-27 17:05:41 +03:00
XhmikosR
d98206bc06
Update Respond.js to v1.3.0.
2013-08-27 16:56:03 +03:00
XhmikosR
263d775777
Compress PNG files losslessly.
...
Use zopfli with 1000 iterations, pngout /r with various blocksizes and deflopt.
assets/ico/apple-touch-icon-114-precomposed.png | Bin 2939 -> 2931 bytes
assets/ico/apple-touch-icon-144-precomposed.png | Bin 3614 -> 3549 bytes
assets/ico/apple-touch-icon-57-precomposed.png | Bin 1577 -> 1573 bytes
assets/ico/favicon.png | Bin 889 -> 887 bytes
Total difference: -79 bytes.
2013-08-27 16:56:03 +03:00
Tom Pietschker
77bee02c85
add role="button"
2013-08-27 09:46:10 -04:00
Tom Pietschker
d1f60671c7
per the docs - use <a> instead of <button>
2013-08-27 09:45:38 -04:00
Alex Olshansky
f8dc1858b0
Fixes #10207 : alert-dismissable example requires contextual class
2013-08-27 05:20:14 -07:00
Javier Eguiluz
52c7bacd44
[doc] tweaked the appearance of the last item of the file listings
2013-08-27 13:24:46 +02:00
Chris Rebert
f811c1b56c
Merge pull request #10204 from premist/master
...
Add missing period on customize page.
2013-08-27 00:17:40 -07:00
Minku Lee
c02f98a7bf
Add missing period on customize page.
2013-08-27 15:41:50 +09:00
Mark Otto
2970653bdc
Fixes #10016 and updates that rather badly formatted callout
2013-08-26 18:19:31 -07:00
Mark Otto
4ad2ecf975
Improve upon #9937 : Link and put reset column stuff to action in the grid example
2013-08-26 17:58:15 -07:00
Mark Otto
7796e645c9
Add margin to thumbnails for proper spacing
...
Hadn't thought about this until fixes #10137 , but it makes sense I
think to have margin on the bottom of thumbnails for spacing when
stacking (or using different grid tiers).
2013-08-26 17:48:32 -07:00
Mark Otto
dd9980e8c9
Fixes #10137 : correct classes on thumbnails
2013-08-26 17:47:56 -07:00
Mark Otto
4d23aa4ef5
Address #9873 and fix #9774
...
* Update styling of justified nav links to be more mobile friendly
(with all four rounded corners and some margin between items)
* Add note to docs to callout bogus WebKit rendering on component and
example
2013-08-26 17:37:52 -07:00
Lukasz Fiszer
0adb4e35f0
Fix hidden.bs.tooltip and shown.bs.tooltip events firing too early in tooltip.js
...
* events fire only after the CSS animation is completed
* this fixes also events in popover.js (as it inherits from tooltip.js)
2013-08-26 20:57:47 +02:00
Julian Thilo
8f83a6010a
rm inverted navbar search styles
2013-08-26 18:42:03 +02:00
Chris Rebert
d977c9902d
Merge pull request #10146 from unwiredben/master
...
javascript.html: add data-ride note
2013-08-25 21:36:31 -07:00
Ben Combee
92bb465ba3
javascript.html: add data-ride note
...
carousel docs were missing mention of the data-ride attribute
used to automatically start the carousel at load time
2013-08-25 23:07:43 -05:00
Chris Rebert
90604bbcea
Merge pull request #10148 from originell/patch-1
...
Correct Typo
2013-08-25 15:01:26 -07:00
Luis Nell
8401855f16
Correct Typo
2013-08-25 23:58:01 +02:00
Andreas Jendrzey
79efeec874
correct enable selector for button usage
...
following the given examples the correct selector to enable the buttons with javascript is ".btn-group".
2013-08-25 10:36:53 +02:00
Mark Otto
4c2b15d6f5
Merge pull request #10129 from pixelchutes/fix-3.0-migration-changes
...
Corrected 3.0 responsive utility class reference mapping when migrating ...
2013-08-25 00:36:03 -07:00
Mike Reid
62fde12c8a
Corrected 3.0 responsive utility class reference mapping when migrating from 2.x (now accounting for new Large device support.) Also synchronized breakpoint values from Grid options > Media queries, for clarity.
2013-08-25 00:05:20 -06:00
Mark Otto
bae1726509
Merge pull request #10128 from leoj3n/alert-block-remove
...
Fixes #9008 : remove `alert-block` class from example
2013-08-24 21:23:38 -07:00
Joel Kuzmarski
e63b6c0675
Fixes #9008 : remove alert-block class from example
2013-08-24 23:01:08 -05:00
Mark Otto
86f28f0380
update raw files (should fix builds)
2013-08-24 14:47:58 -07:00
Mark Otto
00895977ff
Merge branch 'master' of github.com:twbs/bootstrap
2013-08-24 14:40:36 -07:00
Mark Otto
7c8d9551cc
fixes #9887 : documents show and hide classes
2013-08-24 14:40:24 -07:00
Mark Otto
26eb9f3440
Merge pull request #10112 from kevinSuttle/button-roles
...
Add role="button" to <a> buttons
2013-08-24 14:31:33 -07:00
Mark Otto
5491d53b99
Deprecate container-{device} vars for container-{size} classes; updates customizer and grid to do the same
2013-08-24 14:00:52 -07:00
Mark Otto
4c794aaaef
grunt dist on glyphicons width change
2013-08-24 13:59:03 -07:00
Mark Otto
d67ce62f5d
Merge pull request #9996 from jodytate/master
...
changed description of default button
2013-08-24 13:41:24 -07:00
Kevin Suttle
dd9c15273c
Add even more role="button" attributes
...
Missed the <a class="btw" in my regex search
2013-08-24 16:31:15 -04:00
Kevin Suttle
0add7700ad
Add role="button" to <a> buttons
...
These should really be <button> elements, but until that gets squared away, this will suffice.
2013-08-24 16:29:35 -04:00
Mark Otto
c0b00f22fe
forgot a pair of buttons
2013-08-24 12:30:46 -07:00
Mark Otto
74a778a7e6
Merge branch 'master' of github.com:twbs/bootstrap
2013-08-24 12:29:45 -07:00
Mark Otto
ab3e1762d4
turn some buttons into <button> elements where possible
2013-08-24 11:46:24 -07:00
Mark Otto
a167a910d9
Merge pull request #10103 from hero-m/patch-1
...
Another case for Issue #10099
2013-08-24 01:33:04 -07:00
hero-m
54dcb4b699
Another case for Issue #10099
...
Another case for Issue #10099
2013-08-24 12:11:12 +04:30
Mark Otto
d9e991fefe
Merge pull request #10059 from felixhirschfeld/patch-1
...
Add mixin for transition-property
2013-08-24 00:19:37 -07:00
Mark Otto
c7db8eadc2
Merge pull request #10022 from thomaswelton/proposal-glyphicon-block
...
Proposal - Fixed width for glypicons
2013-08-24 00:15:34 -07:00
Mark Otto
9733a998e2
fixes #9969 : add support for output element
2013-08-24 00:14:09 -07:00
Mark Otto
802e5caf51
Merge branch 'master' of github.com:twbs/bootstrap
2013-08-23 23:59:11 -07:00
Mark Otto
700d7e7b2c
Remove footnote links and inline them; link to contributing guidelines in readme
2013-08-23 23:58:38 -07:00
Mark Otto
a6a97e1b27
Merge pull request #9964 from thomaswelton/patch-1
...
Bower - Added fonts to "main" files
2013-08-23 23:52:24 -07:00
Mark Otto
fc0e7686fb
Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-23 23:40:12 -07:00
Mark Otto
705f7ba279
fixes #9876 : avoid dropdowns in navbar examples to prevent overlap
2013-08-23 23:39:11 -07:00
Mark Otto
ddd594c6e2
follow up to #9963 and #10005 : update docs to use .screen-*-min vars, update customizer as well; run grunt to adjust raw files
2013-08-23 23:33:16 -07:00
Mark Otto
adac269f95
grunt on previous ms scroll fix
2013-08-23 23:32:16 -07:00
Mark Otto
d82030f482
Merge pull request #10057 from sambowler/patch-1
...
Fix responsive table scrolling on Windows Phone 8.
2013-08-23 23:19:05 -07:00
Mark Otto
0a2ec5545b
Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-23 23:16:37 -07:00
Mark Otto
99afaba2bf
Merge pull request #10005 from twbs/deprecate-screen-device-vars
...
deprecate @screen-{phone,tablet,desktop} vars
2013-08-23 23:14:13 -07:00
Mark Otto
b86cd3bc3d
Merge branch 'master' into deprecate-screen-device-vars
...
Conflicts:
less/variables.less
2013-08-23 22:56:23 -07:00
Mark Otto
d5a2785545
more specific deprecation comment
2013-08-23 22:51:39 -07:00
Mark Otto
8a96616726
Merge pull request #9963 from twbs/min-breakpoint-naming
...
rename @screen-XX to @screen-XX-min for clarity+unambiguity
2013-08-23 22:50:41 -07:00
Chris Rebert
a7e5bac2d7
Merge pull request #10100 from twbs/document_hide_text
...
Fixes #10076 : Document hide text
2013-08-23 22:39:26 -07:00
Mark Otto
48d929d69e
Use jekyll var for current version in docs; update banner in gruntfile to match .less banner
2013-08-23 22:38:51 -07:00
Mark Otto
a66ccbc562
split mixin and grunt dist to be sure
2013-08-23 22:19:58 -07:00
Mark Otto
6de67c0ab6
Deprecate .hide-text mixin for .text-hide as mixin and class
2013-08-23 22:11:41 -07:00
Mark Otto
e25ca1e7a9
Document .hide-text and .text-hide
2013-08-23 22:01:42 -07:00
Mark Otto
7a7149d2ee
Rearrange helper classes docs section; add subnav list items to docs side nav
2013-08-23 22:00:54 -07:00
Mark Otto
7edd87dde9
Merge branch 'master' of github.com:twbs/bootstrap
2013-08-23 21:45:58 -07:00
Mark Otto
c4f1591e70
fixes #10095 : note about backwards incompatibility
2013-08-23 21:45:46 -07:00
Mark Otto
c1ddb06de7
Merge pull request #10098 from wangsai/fix-form
...
fix form
2013-08-23 21:34:44 -07:00
Mark Otto
b67e49367a
Merge pull request #10097 from wangsai/complete-td
...
complete missed </td>
2013-08-23 21:34:25 -07:00
wangsai
df56ecbdcb
fix form
2013-08-24 11:39:34 +08:00
wangsai
e3f9719096
complete missed </td>
2013-08-24 11:09:33 +08:00
Chris Rebert
1a1394dc62
Merge pull request #9931 from realityking/toolbar
...
Add role="toolbar" to elements with .btn-toolbar.
2013-08-23 16:19:30 -07:00
Chris Rebert
9b2ff3713e
fix #10054 ; mention .muted -> .text-muted in migration docs
2013-08-23 16:12:24 -07:00
Mark Otto
ae96cfd909
Merge pull request #9966 from twbs/header-font-size-vars
...
add variables for heading font sizes; fixes #9921
2013-08-23 14:26:40 -07:00
Mark Otto
fab039f29b
run grunt
2013-08-23 14:26:16 -07:00
Mark Otto
12a70cec88
Run grunt dist on theme for some reason
2013-08-23 14:23:13 -07:00
Mark Otto
2b37d2b533
Update and document use of small in headings
2013-08-23 14:22:51 -07:00
Mark Otto
310642d5ac
Merge branch 'master' into header-font-size-vars
2013-08-23 14:00:28 -07:00
Mark Otto
7b0d035dd4
Merge branch 'master' of github.com:twbs/bootstrap
2013-08-23 13:46:40 -07:00
Mark Otto
acb338766e
fixes #10087 : add version number to all docs pages in footer
2013-08-23 13:46:28 -07:00
Chris Rebert
ec7fa0a254
fix data-api portion of #10084
2013-08-23 11:14:54 -07:00
Chris Rebert
0f669b6dcb
repeat #10081 caveat for popovers too
2013-08-23 11:09:01 -07:00
Chris Rebert
3d72942384
tweak #10081 phrasing
2013-08-23 11:08:37 -07:00
Chris Rebert
34db002875
Merge pull request #10081 from bcarrell/master
...
docs: add explanation for adding tooltips to disabled elements
2013-08-23 11:02:46 -07:00
Mark Otto
f8de960c38
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
css.html
2013-08-23 10:47:36 -07:00
Mark Otto
a0d0864bd7
fixes #9877 : improve active state on nav list items in theme
2013-08-23 10:44:13 -07:00
Mark Otto
5bbbdb399b
fixes #9879 : add hover state to theme buttons
2013-08-23 10:36:37 -07:00
Chris Rebert
4912f960f4
fix #10070 by resyncing fieldset disabled live example & example code
2013-08-23 10:18:39 -07:00
bcarrell
5d39794287
docs: add explanation for adding tooltips to disabled elements, closes #10049
2013-08-23 12:10:52 -04:00
Cameron Little
9bdc841acc
Added -webkit-overflow-scrolling: touch to responsive tables
2013-08-23 08:55:02 -07:00
Felix Hirschfeld
c52e1b85ab
Add mixin for transition-property
...
It's quite handy if a transition needs the same duration, timing-function or delay and only specific properties to animate.
2013-08-23 09:22:54 +02:00
Sam Bowler
343fd1bb1e
Fix responsive table scrolling on Windows Phone 8.
2013-08-23 07:53:09 +01:00
Mark Otto
c4c87fede5
fixes #9880 : use correct grid classes on jumbotron example
2013-08-22 23:25:26 -07:00
Mark Otto
495768bbf5
Merge branch 'master' of github.com:twbs/bootstrap
2013-08-22 23:19:49 -07:00
Mark Otto
3318a98229
add blog link to homepage
2013-08-22 23:18:45 -07:00
Mark Otto
35a069466c
Fixes #10045 : use v2.3.2 release link in old docs instead of master zip
2013-08-22 21:27:27 -07:00
Mark Otto
24f57bdf41
Merge pull request #10012 from twbs/david-badge
...
add David (david-dm.org) badge to monitor currentness of dependencies
2013-08-22 19:26:18 -07:00
Mark Otto
615ca89b1b
Merge pull request #10040 from twbs/pull-navbar-docs
...
add cross-reference to .navbar-left/right in .pull-left/right docs
2013-08-22 19:23:21 -07:00
Chris Rebert
99b35150ee
update outdated JSFiddle example
2013-08-22 16:51:57 -07:00
Chris Rebert
f7d6b488e6
fix #10029
2013-08-22 12:30:32 -07:00
Chris Rebert
354e2ee4f9
add cross-reference to .navbar-left/right in .pull-left/right docs
2013-08-22 12:28:00 -07:00
Josh Dague
f140084f2b
Don't explicitly reference global jQuery
...
Removes `window.jQuery` in favor of `jQuery`, fixes #10038
2013-08-22 14:50:15 -04:00
Chris Rebert
0c0400633a
Merge pull request #10034 from nschonni/use-published-version-for-grunt-html-validation
...
Use NPM version of grunt-html-validation
2013-08-22 10:10:13 -07:00
Nick Schonning
ca63686fda
Use NPM version of grunt-html-validation
...
The package is now published, so the direct git url is no longer
required
2013-08-22 12:20:56 -04:00
Barry vd. Heuvel
c5cfc690dd
Add missing methods (rotateX/Y, perspective(-origin) and transform-origin)
...
Added missing mixins:
rotateX
rotateY
perspective
perspective-origin
transform-origin
2013-08-22 13:05:06 +02:00
Thomas Welton
31ab249809
Removed glyphicon-block instead target :empty .glyphicons
2013-08-22 10:30:18 +01:00
Thomas Welton
8663b75c4d
Added glyphicon-block class
...
Prevents elements moving around the page after the font file has loaded by setting a defined width on elements using the icon font.
2013-08-22 02:54:54 +01:00
Jason Nutter
a40568a1e0
Fixing carousel control positioning
...
The left control should be positioned from the left, while the right
control should be positioning from the right. Positioning both from the
left results in the right carousel control being incorrectly positioned
(most noticeable with a larger than normal font size).
2013-08-21 15:51:24 -07:00
Chris Rebert
1bcf9f126d
Merge pull request #10011 from nschonni/patch-1
...
Update Grunt instruction links and wording
2013-08-21 15:42:58 -07:00
Mark Otto
bc2e97756f
Always wrap form examples in .bs-example; add some missing role='form'
2013-08-21 15:12:55 -07:00
Chris Rebert
31641d3d6d
add David (david-dm.org) badge to monitor currentness of dependencies
2013-08-21 15:11:56 -07:00
Nick Schonning
b32cfa2cf2
Update Grunt instruction links and wording
2013-08-21 18:11:33 -04:00
Mark Otto
6fc988613a
Merge branch 'master' of github.com:twbs/bootstrap
2013-08-21 14:30:27 -07:00
Mark Otto
aea1d8839f
Merge pull request #10006 from jodytate/master
...
remove .btn-group
2013-08-21 14:25:49 -07:00
jody tate
e4bf27b223
remove .btn-group
...
Removing this class--it's not used in the example and using it causes "bad things to happen."
http://jsfiddle.net/josephtate/Jn6H4/
2013-08-21 13:31:17 -07:00
jody tate
cb2e11ece4
remove .btn-group
...
The example doesn't use .btn-group and adding the class causes "bad things to happen," as the saying goes.
http://jsfiddle.net/josephtate/g6AWF
2013-08-21 13:06:46 -07:00
Chris Rebert
22ce649910
deprecate @screen-{phone,tablet,desktop} vars
2013-08-21 12:26:20 -07:00
Chris Rebert
c429fd1a3c
Merge pull request #9999 from sqrt4/fix-9974
...
Fixes #9974
2013-08-21 11:36:02 -07:00
James Lawrence
2cb1626907
Fixes #9974
...
Added th selector in .table-row-variant mixin
2013-08-21 17:56:36 +01:00
Chris Rebert
fee05d1f3e
Merge pull request #9987 from wangsai/fix-typo
...
change `else if` to `else`
2013-08-21 09:23:31 -07:00
jody tate
68b7998c05
removed extraneous space
2013-08-21 08:46:13 -07:00
jody tate
3d366038d7
removed reference to button color and gradient
...
Changed the wording to reflect the default button's new look since it's no longer grey and doesn't have a gradient. I'd say this new wording isn't ideal and needs something a bit more, well, descriptive.
2013-08-21 08:44:54 -07:00
Max F. Albrecht
27d92f45a5
code.less: also set default monospace font for <kbd> and <samp>
2013-08-21 14:08:43 +02:00
wangsai
004f2a2b2f
change else if to else
2013-08-21 19:36:33 +08:00
Denis Gonchar
4284fc0a5e
fix #9941
2013-08-21 15:57:48 +06:00
Chris Rebert
e143c35472
Merge pull request #9973 from coliff/patch-6
...
Update justified-nav.css (Removed unnecessary ms-linear-gradient prefix)
2013-08-21 00:35:15 -07:00
Christian
c76b7a53a4
Update justified-nav.css
...
Removed unnecessary ms-linear-gradient prefix. There was never a stable release of IE that supported -ms- prefixed gradients, those were only in preview versions (stable IE10 supports both prefixed and unprefixed gradients). (source: http://lea.verou.me/2013/04/can-we-get-rid-of-gradient-prefixes/ )
2013-08-21 16:30:12 +09:00
Thomas Welton
56f1ff6ca7
Added fonts to "main" files
...
When using bower the "main" property is used to specify the files that should be consumed by applications including the package as a dependency.
Without including the fonts in this array the glyphicons do not work correctly as the relative font paths do not work after the "main" files are copied into my projects public dir using tools like https://github.com/yatskevich/grunt-bower-task
For now I have manually copied the fonts dir in the location needed for my project. But by accepting this pull request this will not be necessary for me or for other people that use bower.
2013-08-21 08:08:56 +01:00
Chris Rebert
a3a02f9e6e
rename @screen-XX to @screen-XX-min for clarity+unambiguity
2013-08-20 23:25:13 -07:00
Luke McDonald
c8402e6e2a
Remove progress bar striped @color parameters; use default transparent white.
...
* If the @color parameter is not removed, the stripes are the same color as the element background color. In this case, the stripes do not appear.
2013-08-20 22:46:01 -05:00
Luke McDonald
e965ef0df3
Apply @color argument to striped gradient
...
The @color argument is currently not being used for the striped gradient.
2013-08-20 22:13:03 -05:00
Chris Rebert
bbc32f7e79
add header font size vars to customizer page
2013-08-20 18:47:04 -07:00
Chris Rebert
631e200da3
regenerate customizer's raw-files.js
2013-08-20 18:46:20 -07:00
Chris Rebert
9a4fbde461
add variables for heading font sizes; fixes #9921
2013-08-20 17:49:23 -07:00
Chris Rebert
924e9e7450
update copyright year
2013-08-20 16:34:57 -07:00
Chris Rebert
d666a89621
fix #9915
2013-08-20 16:21:18 -07:00
Chris Rebert
7c88db5c42
master branch is no longer stationary, so don't imply otherwise
2013-08-20 14:18:30 -07:00
Chris Rebert
295fef252e
links to a release instead of master, so rephrase description accordingly
2013-08-20 14:16:31 -07:00
Chris Rebert
55088bbff8
point release download link to an actual release instead of master
2013-08-20 14:00:48 -07:00
Chris Rebert
63f8c8caab
CONTRIBUTING: reflect move away from *-wip branch style of development
...
Per http://blog.getbootstrap.com/2012/12/10/bootstrap-3-plans/ :
> * Drop the `*-wip` branch style of development.
2013-08-20 13:45:52 -07:00
Chris Rebert
6735dc8c16
fix #9917
2013-08-20 13:36:22 -07:00
Chris Rebert
d924bca6f6
fix #9924
2013-08-20 12:41:41 -07:00
Chris Rebert
0759dc4119
Merge pull request #9930 from tagliala/whitespaces-fix
...
Removed trailing whitespaces in responsive-utilities.less
2013-08-20 10:35:00 -07:00
Chris Rebert
94599259e1
Merge pull request #9918 from lamby/master
...
Correct "Aligninment" -> "Alignment" typo.
2013-08-20 09:36:00 -07:00
Rouven Weßling
a9d1f901c5
Add role="toolbar" to elements with .btn-toolbar.
2013-08-20 15:07:43 +02:00
Geremia Taglialatela
db7cce42f2
Removing whitespaces
2013-08-20 14:56:10 +02:00
Chris Lamb
3515964578
Correct "Aligninment" -> "Alignment" typo.
...
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk >
2013-08-20 11:18:23 +01:00
Mark Otto
b0086cb3de
Merge branch 'master' into gh-pages
2013-08-19 15:12:27 -07:00
Mark Otto
0886fee103
quick fix for docs mention
2013-08-19 15:12:25 -07:00
Chris Rebert
af75dca908
update grunt-html-validation output file ignores
2013-08-19 14:23:07 -07:00
Mark Otto
05ace147cb
Merge branch 'master' into gh-pages
2013-08-19 14:18:28 -07:00
fat
e8a1df5f06
remove dumb validation reports
2013-08-19 14:18:20 -07:00
fat
b6ddaf63d6
fix customizer
2013-08-19 14:16:52 -07:00
Mark Otto
6ea7e4f019
Merge branch 'master' into gh-pages
2013-08-19 13:58:37 -07:00
Mark Otto
f95ab89fb1
really do the raw liquid tag
2013-08-19 13:58:29 -07:00
Mark Otto
0335e9726f
Merge branch 'master' into gh-pages
2013-08-19 13:53:56 -07:00
Mark Otto
fadf016043
wrap generated customizer code in raw liquid tag for proper jekyll serve
2013-08-19 13:49:58 -07:00
Mark Otto
1a8f1e68ef
fix broken panels in js example
2013-08-19 13:27:45 -07:00
Mark Otto
ee5f030770
run grunt to generate customizer
2013-08-19 13:17:16 -07:00
Mark Otto
6248b71183
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-19 13:16:39 -07:00
Mark Otto
3f87bf46e4
fixes #9855 : account for modal overflow on body hiding scrollbar
2013-08-19 13:16:32 -07:00
fat
c2d5861232
update gruntfile not to run validation + remove validation status
2013-08-19 12:22:42 -07:00
fat
c64a8cfc72
add glyphicons to customizer
2013-08-19 12:19:00 -07:00
Mark Otto
c15b259f43
run grunt dist for #9864
2013-08-19 10:43:58 -07:00
Mark Otto
3d5ccc6c6f
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-19 10:43:45 -07:00
Mark Otto
723b9b89d7
Merge pull request #9864 from boomsb/3.0.0-wip
...
Update tables.less
2013-08-19 10:43:26 -07:00
Mark Otto
48cddf9633
fix 144 apple icon
2013-08-19 09:54:16 -07:00
Mark Otto
16976cc494
Fixes secondary issue in #9798
2013-08-19 09:36:56 -07:00
Mark Otto
7bc845abfa
Add default navbar z-index to fix #9844
...
iOS doesn't pick up the z-indexing properly on the dropdowns unless you
specify one for the parent navbar.
2013-08-19 09:31:16 -07:00
boomsb
bfe2dc4109
Update tables.less
...
Fixed Table cell sizing with multiple classes by using *= instead of ^=
2013-08-19 11:30:38 -05:00
Mark Otto
b569836126
Comment out grid cols var until we get mixins back in v3.1
2013-08-19 09:17:49 -07:00
Mark Otto
dacfb354ba
Generate customizer stuff
2013-08-19 09:12:34 -07:00
Mark Otto
72fb2caf00
Update thumbnails col classes
2013-08-19 09:10:19 -07:00
Mark Otto
01f7bc4d86
run grunt dist on #9847
2013-08-19 08:59:12 -07:00
Mark Otto
d195d5989f
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-19 08:58:59 -07:00
Mark Otto
50674b16d3
Merge pull request #9847 from wangsai/remove-duplicate-code
...
`.table` style is duplicate in `List groups in panels` and `Tables in panels`
2013-08-19 08:58:47 -07:00
Mark Otto
55b7b1494f
Update jsbin example
2013-08-19 08:56:08 -07:00
Mark Otto
f497b5e1f5
move dropdown change from navbar to dropdowns to fix customizer compiling
2013-08-19 08:54:40 -07:00
Mark Otto
a9297c7ad2
save and recompile for that last commit
2013-08-19 08:51:25 -07:00
Chris Rebert
73a85d6eb3
Merge pull request #9851 from liuyl/typo
...
fix typo
2013-08-19 08:47:35 -07:00
Mark Otto
7e82ceb533
fix #9832 somewhat: more vars for jumbotron
2013-08-19 08:46:49 -07:00
Yulong Liu
e82e8321f2
fix typo
2013-08-19 23:02:03 +08:00
saiwang
fabbb9e4ba
.table style is duplicate in List groups in panels and Tables in panels
2013-08-19 22:08:06 +08:00
Mark Otto
285393fb77
Re-enable glyphicons in carousel controls and then remove redundant CSS from example
2013-08-19 00:58:29 -07:00
Mark Otto
dbd749c226
Merge pull request #9828 from cmdoptesc/3.0.0-wip
...
Add background-color to carousel.
2013-08-19 00:56:04 -07:00
al // @idest
eb43c26855
Fix vertical alignment of carousel navigation arrows.
...
Navigation arrows were aligned to the top of page. Vertically centered them in this fix.
2013-08-19 00:54:54 -07:00
Mark Otto
4fd861a704
Fix the customizer.js; Update alert styles for pre blocks
2013-08-19 00:54:53 -07:00
al // @idest
8b24c47788
Add background-color to carousel.
...
Set a background color for the carousel example so that white text is now legible. Also fixed typo on line 97.
2013-08-19 00:49:28 -07:00
Mark Otto
ea3fa72f1d
Clarify responsive tables and tuck margin
2013-08-19 00:45:20 -07:00
Mark Otto
08d19af710
Fix remainder of panel default examples and reorder nav links
2013-08-19 00:43:22 -07:00
Mark Otto
7481aa7398
Add subnav link for panels with tables
2013-08-19 00:42:39 -07:00
Mark Otto
2a3018a9a6
Fix broken tables in panel groups example
2013-08-19 00:42:12 -07:00
Mark Otto
20fed789f9
More legible examples for progress bars
2013-08-19 00:41:03 -07:00
Mark Otto
38009ec8ef
Double quotes not single quotes
2013-08-19 00:39:00 -07:00
Mark Otto
17c1388f23
Consistent alert link examples (adds warning and reorders)
2013-08-19 00:38:20 -07:00
Mark Otto
07cecc88bc
Nuke top margin on pager examples
2013-08-19 00:36:45 -07:00
Mark Otto
d8128fca94
Change up label padding to equalize top and bottom
2013-08-19 00:36:39 -07:00
Mark Otto
14c4484ec4
Nuke margin for last child navbar text
2013-08-19 00:34:31 -07:00
Mark Otto
efa8b40ce8
Run grunt dist on responsive changes
2013-08-19 00:34:16 -07:00
Mark Otto
5b2e3dd769
Doh! Really undo that navbar thing
2013-08-19 00:33:27 -07:00
Mark Otto
515d7caa94
remove redundant docs section
2013-08-19 00:31:38 -07:00
Mark Otto
5639287d5d
Copy edits, fix classes for demo, add subnav links
2013-08-19 00:16:51 -07:00
Mark Otto
3260288df8
Merge branch '3.0.0-wip' of https://github.com/eratzlaff/bootstrap into eratzlaff-3.0.0-wip
2013-08-19 00:15:47 -07:00
Elvis Ratzlaff
7818c5e186
Add Test case to documentation
2013-08-19 03:14:38 -04:00
Mark Otto
6262230d0f
update grid options max container width in docs to reflect latest changes
2013-08-19 00:06:26 -07:00
Mark Otto
0682af9ee4
use n/a not -
2013-08-19 00:05:03 -07:00
Mark Otto
0730c22e21
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-19 00:03:35 -07:00
Mark Otto
c77bae308a
more copy edits
2013-08-19 00:03:28 -07:00
Mark Otto
de7cc0c17f
don't repeat ourselves in the disabled responsiveness stuff
2013-08-18 23:58:31 -07:00
Chris Rebert
c6a1a493c7
Merge pull request #9826 from phillipalexander/patch-1
...
Remove unnecessary trailing comma in Gruntfile.js
2013-08-18 23:57:43 -07:00
Mark Otto
2275277be4
no linenos
2013-08-18 23:54:42 -07:00
Phillip Alexander
39bc5198ae
Remove extra trailing comma in Gruntfile.js
...
validation: {
options: {
reset: true
},
2013-08-18 23:54:25 -07:00
Mark Otto
35092a7cfd
no lead on that paragraph
2013-08-18 23:54:18 -07:00
Mark Otto
f7a7cb479f
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
...
Conflicts:
getting-started.html
2013-08-18 23:52:22 -07:00
Mark Otto
7dcfc44426
Nuke the repeated blog stuff and just point people to the upcoming post
2013-08-18 23:51:24 -07:00
Mark Otto
0e61e8783b
Undo jank jump to docs section via side nav thing for all but h1s
...
While it worked, it overlaps content and makes links unclickable,
elements unselectable, etc. Le sad.
2013-08-18 23:51:09 -07:00
Mark Otto
7eddb94fa6
simpler customizer files section; adds glyphicons.less
2013-08-18 23:36:36 -07:00
Chris Rebert
c0f477a107
update version number in anticipation of final release
2013-08-18 23:27:46 -07:00
Chris Rebert
4ab4678f0f
let's avoid calling it that
2013-08-18 23:24:31 -07:00
Chris Rebert
c9b4f7254b
This-Is-SPARTA! Or rather, HTML. Not Markdown.
2013-08-18 23:18:58 -07:00
Mark Otto
2234f0e333
janky not ghetto <3
2013-08-18 23:09:09 -07:00
Mark Otto
2e962e6599
give some more space on that janky docs navbar fix
2013-08-18 23:08:57 -07:00
Mark Otto
1b97f2a16e
update template in getting started docs to reflect shim and respond.js in examples
2013-08-18 23:07:36 -07:00
Mark Otto
0853ece4c8
Merge branch '3.0.0-wip' into bs3_homepage
2013-08-18 22:47:09 -07:00
Mark Otto
831d3215c6
more accurate dist contents
2013-08-18 22:45:30 -07:00
Mark Otto
73f56a9036
more migration guide work
2013-08-18 22:43:29 -07:00
Mark Otto
e3e408bb78
Merge pull request #9822 from gdi2290/patch-1
...
fix file structure in "What's included"
2013-08-18 22:35:19 -07:00
PatrickJS
2a2a8e9e20
fix file structure in What's included
2013-08-18 22:27:30 -07:00
Mark Otto
87924abdc2
Super ghetto fix for preventing navbar overlap when clicking side nav links /cc @fat
2013-08-18 22:19:56 -07:00
Mark Otto
869a163e67
Fix broken link and wrong label
2013-08-18 22:19:16 -07:00
Mark Otto
2f2232cc3f
screw it, errbody gets a single map base64 image
2013-08-18 22:04:51 -07:00
Mark Otto
8daa8a8dbd
create smaller map pattern so ios picks it up
2013-08-18 21:59:23 -07:00
Mark Otto
e293873484
smaller h1 and h2
2013-08-18 21:49:05 -07:00
Elvis Ratzlaff
988c03d462
Variable name fix
2013-08-19 00:46:09 -04:00
Mark Otto
140f6d3bdc
Merge branch '3.0.0-wip' into bs3_homepage
2013-08-18 21:43:58 -07:00
Chris Rebert
74ae8ecc80
customize.html: fix typo
2013-08-18 21:43:14 -07:00
Mark Otto
e989acfc79
Add responsive tables with help of .table-responsive wrapper
2013-08-18 21:43:05 -07:00
Chris Rebert
2c2311c318
fix spelling of "Togglable"
2013-08-18 21:34:17 -07:00
Jacob Thornton
1aa0eb32e3
catch a view data-vars
2013-08-18 21:29:46 -07:00
Elvis Ratzlaff
5b3e6eb563
make visible/hidden classes mixable
2013-08-19 00:23:53 -04:00
Mark Otto
1a8d1b7586
docs cleanup around alignment on homepage and footers
2013-08-18 21:15:07 -07:00
Mark Otto
2713a75156
larger download btn on customizer
2013-08-18 21:04:46 -07:00
Mark Otto
b360a97f5c
mo betta btn classes in docs
2013-08-18 21:02:52 -07:00
Mark Otto
a9378a9267
Merge branch '3.0.0-wip' into bs3_homepage
...
Conflicts:
customize.html
dist/css/bootstrap.min.css
2013-08-18 20:15:45 -07:00
Mark Otto
f584500211
Merge pull request #9819 from twbs/bs3_panel_base_class
...
BS3: Refactor panels to require default class
2013-08-18 20:11:36 -07:00
Mark Otto
a1db2d7a5e
Merge branch '3.0.0-wip' into bs3_panel_base_class
...
Conflicts:
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.min.css
2013-08-18 20:11:04 -07:00
Mark Otto
2e91843661
Merge pull request #9818 from twbs/bs3_alert_base_class
...
BS3: Refactor alerts to require a modifier class
2013-08-18 20:10:14 -07:00
Mark Otto
0615142834
update customizer to latest vars
2013-08-18 20:08:03 -07:00
Mark Otto
e6ff75bcea
Update var in theme
2013-08-18 19:57:25 -07:00
Mark Otto
03ba9ed9ed
update theme to match
2013-08-18 19:53:28 -07:00
Mark Otto
108d10a920
Refactor alerts to have a base class, but no default class, thus requiring a modifier class at all times
2013-08-18 19:50:53 -07:00
Mark Otto
bab51d27ac
Refactor panels to have a base class for improved flexibility when customizing (and no overriding to start, too)
2013-08-18 19:40:57 -07:00
Jacob Thornton
93887f4bd0
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-18 19:40:56 -07:00
Jacob Thornton
ea383804ec
fixes #9807
2013-08-18 19:40:26 -07:00
Mark Otto
d5cd040f57
improve dependencies for image thumbnails and thumbnail component
2013-08-18 19:24:10 -07:00
Mark Otto
cf09e6a6b5
better alignment of glyphicons vertically
2013-08-18 19:05:48 -07:00
Mark Otto
841dac58ca
move glyphicons styles to docs css
2013-08-18 19:04:30 -07:00
Mark Otto
9dcae610e9
Merge branch '3.0.0-wip' into bs3_homepage
...
Conflicts:
customize.html
examples/justified-nav/justified-nav.css
2013-08-18 19:02:42 -07:00
Mark Otto
5bd2d7ed7e
fixes #9815 : proper alignment of navbar nav if first child
2013-08-18 18:49:07 -07:00
Mark Otto
87a1d7e5a0
update non responsive example
2013-08-18 18:47:05 -07:00
Mark Otto
1bc13c659f
don't include other navbar links in non responsive docs; use generic links
2013-08-18 18:44:40 -07:00
Mark Otto
7241d7beb7
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-18 18:16:14 -07:00
Mark Otto
35ad599df6
prevent navbar from collapsing in non responsive example ( fixes #9812 )
2013-08-18 18:16:01 -07:00
Chris Rebert
ed3e870da8
tweak formatting of additional migration notes
2013-08-18 16:39:08 -07:00
Chris Rebert
2ca46ff97e
add angle brackets
2013-08-18 16:36:49 -07:00
Mark Otto
9c12d670ed
clarify inline block mention in docs
2013-08-18 16:27:20 -07:00
Mark Otto
8a594a25af
Merge branch '3.0.0-wip' into gh-pages
2013-08-18 15:52:55 -07:00
Mark Otto
f4b744e697
Merge pull request #9791 from pereorga/pere-optimize-images
...
Optimize images using lossless compression
2013-08-18 15:52:24 -07:00
Mark Otto
c240460f0b
Merge branch '3.0.0-wip' into glyphicons-LESS-fixes
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-18 15:47:29 -07:00
Mark Otto
638db635d7
fix broken button
2013-08-18 15:45:56 -07:00
Mark Otto
7b4e2a9a4a
Merge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-navbar-default
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-18 15:43:27 -07:00
Mark Otto
fe767a18d3
fixes #9798 : update spacing on checkboxes and radios for horizontal
2013-08-18 15:41:24 -07:00
Chris Rebert
fa7cc6cafd
account for 9fa0a5d127 in the docs
2013-08-18 15:37:07 -07:00
Chris Rebert
c338f2782d
regenerate Glyphicons listing/demo section of docs
2013-08-18 15:36:24 -07:00
Julian Thilo
ef68cf8ebd
Add new navbar-default class to examples
2013-08-19 00:35:40 +02:00
Mark Otto
5746979aad
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-18 15:30:02 -07:00
Chris Rebert
0501d83f8b
regenerate CSS
2013-08-18 15:20:16 -07:00
Chris Rebert
9fa0a5d127
tweak some of the Glyphicon class names to match Bootstrap conventions
2013-08-18 15:19:13 -07:00
Mark Otto
43271f1ab6
Merge pull request #9804 from twbs/redundant-ampersands
...
rm redundant ampersands from button-groups LESS
2013-08-18 15:15:53 -07:00
Chris Rebert
7b0d93f79e
regenerate Glyphicons LESS from their website; fixes some wrong codepoint numbers
2013-08-18 15:15:33 -07:00
Mark Otto
8d8d165ee7
Merge pull request #9800 from ZDroid/patch-1
...
Nesting for link styles
2013-08-18 15:10:48 -07:00
Mark Otto
9b61b7a722
fixes #9803 : label and input alignment in horizontal forms
2013-08-18 15:10:28 -07:00
Chris Rebert
fa3959a1e1
rm redundant ampersands from button-groups LESS
2013-08-18 15:05:42 -07:00
Julian Thilo
546b2cc614
Fix some forgotten things for navbar-default
...
New variable names were missing here and there.
2013-08-18 23:30:40 +02:00
Zlatan Vasović
743fc9ac7e
Nesting for link styles
2013-08-18 23:28:55 +02:00
Julian Thilo
abca00870f
Add a .navbar-default class for default colors
...
* Extract color styles from .navbar { } and put them into
.navbar-default { }
* Change variable names
* Change the docs accordingly (i.e., add the .navbar-default class to
all default navbars)
* Change customizer accordingly
2013-08-18 23:05:56 +02:00
Chris Rebert
518488cb40
make Recess part of the Grunt test task to guard against bad LESS
2013-08-18 13:47:16 -07:00
Chris Rebert
b5d87fc42b
rename HTML5 validation Grunt task since it checks the examples too
2013-08-18 13:43:53 -07:00
Chris Rebert
af9fd02638
Merge pull request #9796 from twbs/fix-glyphicons-btns-docs
...
fix wrong closing tags on Glyphicons-in-buttons examples
2013-08-18 13:41:21 -07:00
Chris Rebert
1b49b42683
fix wrong closing tag on Glyphicons-in-buttons examples
2013-08-18 13:40:39 -07:00
Chris Rebert
896bd327c7
Merge pull request #9793 from vsn4ik/fix_examples_url
...
Fix examples url in _layouts/home.html
2013-08-18 13:18:55 -07:00
vsn4ik
d721c61d99
Fix examples url in _layouts/home.html
2013-08-18 23:06:56 +04:00
Pere Orga
0665b67760
Optimize images using lossless compression
2013-08-18 19:50:33 +01:00
Mark Otto
1174e777b3
Merge branch '3.0.0-wip' into gh-pages
2013-08-18 11:17:37 -07:00
Mark Otto
9b66e6b0f4
fixes #9790 : nullify right padding in container-ed navbars when last element in collapse is a right aligned navbar nav
2013-08-18 11:17:28 -07:00
Mark Otto
776fb435c5
update nav for getting started migration
2013-08-18 11:13:56 -07:00
Mark Otto
26067d3d7d
fixes #9768 : unbold buttons
2013-08-18 11:11:31 -07:00
Mark Otto
8989d7791b
Merge branch '3.0.0-wip' into gh-pages
2013-08-18 11:09:32 -07:00
Mark Otto
b5ac1b065e
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-18 11:08:29 -07:00
Mark Otto
ef4590dfb4
fixes #9786 : enable tables in panels
2013-08-18 11:08:20 -07:00
Chris Rebert
0cbffb3bcb
Delete glphyicons.less
...
File is empty and has misspelled name.
Fixes #9787
2013-08-18 11:00:27 -07:00
Mark Otto
3c1d951d29
fixes #9787 : remove derp file
2013-08-18 11:00:04 -07:00
Chris Rebert
40a1bcea7d
Merge pull request #9789 from thgh/patch-2
...
Fix well class names in migration section of getting-started.html
2013-08-18 10:57:23 -07:00
Chris Rebert
25d9b2ad49
Merge pull request #9788 from brunoamaral/3.0.0-wip
...
fixes two type-o's in glyphicons
2013-08-18 10:55:22 -07:00
thgh
5e2569f15b
Fix well class names in migration section of getting-started.html
2013-08-18 19:54:28 +02:00
Bruno Amaral
0989babe5d
fixes two type-os in glyphicons
2013-08-18 18:47:40 +01:00
Mark Otto
a918b34eeb
Merge branch '3.0.0-wip' into gh-pages
2013-08-18 10:35:49 -07:00
Mark Otto
d7eee9bd6e
Merge pull request #9767 from twbs/bs3_restore_glyphicons
...
BS3: Restore Glyphicons
2013-08-18 10:35:26 -07:00
Mark Otto
f8b65b41ab
Merge branch '3.0.0-wip' into bs3_restore_glyphicons
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-18 10:28:32 -07:00
Mark Otto
92d8989553
Merge pull request #9785 from mikepage/patch-1
...
Update mixins.less to fix error .button-variant is undefined in Grunt
2013-08-18 10:27:53 -07:00
Mark Otto
6496ffb7d4
reformat all the things
2013-08-18 10:26:50 -07:00
Mike Pagé
2488f2ae68
Update mixins.less
2013-08-18 19:23:42 +02:00
Mark Otto
a5ac0b7498
Merge branch '3.0.0-wip' of https://github.com/iatek/bootstrap into iatek-3.0.0-wip
2013-08-18 10:12:33 -07:00
Mark Otto
73a1a4133c
combine and simplify caret border widths
2013-08-18 10:08:18 -07:00
Mark Otto
a9e741bffc
Merge branch 'fixcaret' of https://github.com/liuyl/bootstrap into liuyl-fixcaret
2013-08-18 10:07:34 -07:00
Mark Otto
0c9bf6bcce
remove padding from justified nav masthead and footer
2013-08-18 10:02:32 -07:00
Mark Otto
8ae9736ead
Merge branch 'remove-body-content' of https://github.com/lipis/bootstrap into lipis-remove-body-content
2013-08-18 10:00:30 -07:00
Mark Otto
78701778d0
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-18 10:00:20 -07:00
Mark Otto
4246f6a01f
fixes #9769 : use navbar border radius var in theme
2013-08-18 09:58:21 -07:00
Chris Rebert
db5aee54df
Merge pull request #9782 from minddust/3.0.0-wip
...
Update progressbar docs
2013-08-18 09:01:41 -07:00
Stephan Groß
142ada4219
Update progressbar
...
there is no gradient in 3.x
2013-08-18 17:17:07 +02:00
liuyl
ce410dc36e
fixed caret
2013-08-18 20:13:48 +08:00
iatek
863b03cf38
updates to migration
2013-08-18 07:20:56 -04:00
iatek
d1519400f2
updates to migration
2013-08-18 07:19:53 -04:00
Panayiotis Lipiridis
e6e8499ab8
Got rid of body-content from examples
2013-08-18 12:25:23 +02:00
Mark Otto
6b24297c5b
update urls
2013-08-18 02:11:57 -07:00
Mark Otto
fd97c2fce4
bad copypasta
2013-08-18 02:04:39 -07:00
Mark Otto
c7e5fa15e0
Merge branch '3.0.0-wip' into bs3_restore_glyphicons
2013-08-18 02:04:10 -07:00
Mark Otto
72a3819f6c
remove carousel icons include
2013-08-18 01:55:47 -07:00
Mark Otto
e13ca6d384
Upgrade to latest glyphicons
2013-08-18 01:46:26 -07:00
Mark Otto
b09fcc019c
remove old glyphicons mention
2013-08-18 01:32:33 -07:00
Mark Otto
f2e35bf702
docs layout and alignment refinement
2013-08-18 01:23:45 -07:00
Mark Otto
1e0453f825
Restore glyphicons
2013-08-18 00:36:51 -07:00
fat
b790bbbafc
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-18 00:29:15 -07:00
fat
57f5872467
bunch of updates to customizer
2013-08-18 00:28:52 -07:00
Mark Otto
09d80fab99
Merge pull request #9761 from wangsai/fix-eamples-respondjs
...
add IE's Conditional comments for respondjs and html5shiv
2013-08-17 23:55:05 -07:00
Mark Otto
578a14e14a
Rearrange the docs CSS
2013-08-17 23:53:27 -07:00
saiwang
0c094efe28
add IE's Conditional comments for respondjs and html5shiv
2013-08-18 14:28:52 +08:00
Mark Otto
d13c4e5e5b
Update URLs in config to what I think they need to be; add theme CDN url
2013-08-17 23:07:15 -07:00
Mark Otto
c729f16282
it's levi-OH-sa, not levi-oh-SAR
2013-08-17 22:51:00 -07:00
Mark Otto
40cbfb69d2
undo old change to navbar brand from this branch
2013-08-17 22:44:59 -07:00
Mark Otto
6b74b871df
clean up padding and alignment and stuff
2013-08-17 22:43:15 -07:00
Mark Otto
18766db634
Merge branch '3.0.0-wip' into bs3_homepage
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-17 22:39:07 -07:00
Mark Otto
b03a2df0b0
Merge branch '3.0.0-wip' into gh-pages
2013-08-17 22:11:40 -07:00
Mark Otto
04a73ebe42
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 22:11:27 -07:00
Mark Otto
3e02b0f5d0
Update docs text a bit
2013-08-17 22:11:21 -07:00
fat
95732b429f
add dependency support to customizer
2013-08-17 21:50:01 -07:00
Mark Otto
f891f91bac
Reorder bootstrap.less to match docs oder
2013-08-17 21:18:00 -07:00
Mark Otto
811120ffa2
Add data-dependency to less and js files in customizer
2013-08-17 21:17:35 -07:00
Mark Otto
8d59d8def7
sub headings for modals and mobile devices on browser support
2013-08-17 21:01:58 -07:00
Mark Otto
9533a1339f
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 21:00:20 -07:00
Mark Otto
5539db5237
Navbar update
...
Addresses a few different cases where the navbar has and doesn't have a
container, and accordingly adjusts the padding and margin of key
elements.
2013-08-17 21:00:13 -07:00
Mark Otto
b413aff045
Favicon in navbar example
2013-08-17 20:35:31 -07:00
Mark Otto
d713f8341c
Update jumbotron
...
* Defaults to no rounded corners and full width in the viewport
* When in a container, the jumbotron has extra padding and will have
rounded corners
* Updates default jumbotron example to show the full width default
display
Fixes #9759 .
2013-08-17 20:33:52 -07:00
fat
47fcb322eb
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 20:29:36 -07:00
fat
734b6acf13
add small fix for tooltip consistency + fix customizer syntax issue
2013-08-17 20:28:58 -07:00
Mark Otto
d9e38312d2
copy edit
2013-08-17 20:11:18 -07:00
Mark Otto
f6c151aa20
Merge pull request #9756 from twbs/bs3_theme
...
BS3: Add optional theme (fixes #8706 )
2013-08-17 19:17:25 -07:00
Mark Otto
9a66906d3d
generic comment
2013-08-17 19:14:13 -07:00
Mark Otto
761b80c391
Merge branch '3.0.0-wip' into bs3_theme
2013-08-17 19:09:33 -07:00
fat
06c3d87973
use correct arg name
2013-08-17 19:07:59 -07:00
fat
9828aa5b4d
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 19:04:58 -07:00
fat
00d2986858
add logging
2013-08-17 19:04:41 -07:00
Mark Otto
b31ce3204d
Merge branch '3.0.0-wip' into bs3_theme
2013-08-17 19:00:35 -07:00
Mark Otto
0098c358c8
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 19:00:22 -07:00
Mark Otto
3780edd956
update examples to use new .btn-lg class
2013-08-17 19:00:14 -07:00
Mark Otto
c56a749323
Finish first pass at and docment Bootstrap v2-ish theme
...
* Adds new "theme" example
* Adds new theme.less file to provide all the overrides and additional
styles for the theme
* theme.less compiles, via Grunt, to two new files to `dist/css`,
bootstrap-theme.css and bootstrap-theme.min.css
2013-08-17 18:59:50 -07:00
fat
a39cb4be90
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 18:41:51 -07:00
fat
29bf254fc3
move customizer onto gists
2013-08-17 18:41:36 -07:00
Chris Rebert
405df13044
fix typo in JS docs
2013-08-17 17:44:42 -07:00
Chris Rebert
cc3077ac17
improve grammar in "Disabling responsiveness" docs
2013-08-17 17:41:47 -07:00
Chris Rebert
50b9c7339a
comma & <code> in "Modals and mobile devices" docs
2013-08-17 17:38:53 -07:00
Mark Otto
ba20e512ce
Merge branch '3.0.0-wip' into bs3_theme
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-17 17:31:58 -07:00
Mark Otto
e29c23afab
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 17:27:05 -07:00
Chris Rebert
27424ee422
improve grammar in "Alternate customization methods" docs
2013-08-17 17:26:54 -07:00
Mark Otto
e587219958
Fix navbar brand alignment by removing header padding when above 768px
2013-08-17 17:26:52 -07:00
Mark Otto
90d5e48f5f
Add alert for customizer errors
2013-08-17 17:26:36 -07:00
Mark Otto
b3e06aea01
Delete the customizer layout (again?)
2013-08-17 17:26:05 -07:00
fat
5d84e02c1c
add the customizer builder to the default grunt task
2013-08-17 16:44:54 -07:00
fat
2dbf02b129
rebuild
2013-08-17 16:19:09 -07:00
fat
4696565044
fixes #9745
2013-08-17 16:18:26 -07:00
fat
63ac9e354f
fixes #9674
2013-08-17 16:13:48 -07:00
fat
70f1cac841
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 16:11:41 -07:00
fat
c0eabdda9f
fixes #9543
2013-08-17 16:11:05 -07:00
Mark Otto
0b96015dc9
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 16:10:35 -07:00
Mark Otto
c8b51e1cd8
Update description in composer
2013-08-17 15:58:04 -07:00
fat
d754e6564d
add some crap
2013-08-17 15:54:42 -07:00
fat
8b5314096f
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 15:49:27 -07:00
fat
1d53dd31f5
add role=menu to html
2013-08-17 15:48:29 -07:00
Mark Otto
6636734388
Fixes #9752 : clear floats in .panel-body
2013-08-17 15:46:42 -07:00
Mark Otto
3fbc1fc555
Fixes #9749 : provide js bin link in readme for easier bug reports
2013-08-17 15:43:54 -07:00
Mark Otto
665559a450
smaller example screenshots, fixes #9748
2013-08-17 15:35:15 -07:00
Mark Otto
61caed21e2
More consistent naming with screen size variables using xs, sm, md, and lg
2013-08-17 15:21:38 -07:00
Mark Otto
5ba19dc884
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 15:08:02 -07:00
Mark Otto
4f97df8aa4
update non-responsive docs and example to really disable it
2013-08-17 15:07:53 -07:00
fat
a01b1dd71a
fixes #9585
2013-08-17 15:07:26 -07:00
fat
f4c7629592
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 15:06:29 -07:00
fat
a10ec62f63
fixes #9579
2013-08-17 15:05:59 -07:00
Mark Otto
6c765ac821
add nonresponsive template to examples
2013-08-17 15:02:38 -07:00
Mark Otto
fdb7121f41
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 14:49:58 -07:00
Mark Otto
3bcadfc2c5
brand, not title, in navbar examples
2013-08-17 14:42:55 -07:00
fat
484d51ce48
add doc comment for #9517
2013-08-17 14:42:44 -07:00
Mark Otto
3cb38197f2
more specific panel titles and docs notes
2013-08-17 14:27:21 -07:00
fat
2d875c8d5e
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 14:25:16 -07:00
fat
33f448f605
rebuild
2013-08-17 14:25:04 -07:00
Mark Otto
5e31478a91
base64 map bg
2013-08-17 14:24:48 -07:00
fat
712b89ed4e
fixes #9362
2013-08-17 14:24:38 -07:00
Mark Otto
214835c6b2
tweak ads styling
2013-08-17 14:21:58 -07:00
Mark Otto
441e04c84a
Merge branch '3.0.0-wip' into bs3_homepage
...
Conflicts:
dist/css/bootstrap.min.css
getting-started.html
2013-08-17 14:16:40 -07:00
Mark Otto
1b814ddd0a
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 14:15:43 -07:00
Mark Otto
6ca32589b5
2px border on thead th elements for just a tad more separation
2013-08-17 14:15:33 -07:00
Mark Otto
903e92a327
Update helper classes to reflect changes and mention mixins
2013-08-17 14:15:14 -07:00
Mark Otto
6fe1264a80
mo betta heading examples labels
2013-08-17 14:11:05 -07:00
Mark Otto
2a4bd786ed
more accurate grid classes in examples
2013-08-17 14:09:35 -07:00
fat
728a5e17d6
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-17 13:43:58 -07:00
fat
53c80ed9cb
add comment addressing #9023
2013-08-17 13:40:28 -07:00
Mark Otto
0c70744ea2
fixes #9538 : prevent Firefox rendering bug via some border-fu
2013-08-17 13:33:53 -07:00
Mark Otto
0e39f94574
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-17 13:18:19 -07:00
Mark Otto
82f6f08f89
Fixes #9552 : Downsize and use whole numbers for panel title to prevent odd 1px bug
2013-08-17 13:18:10 -07:00
fat
5e89f71ab2
fix for #8768
2013-08-17 13:14:19 -07:00
Mark Otto
ab700d753c
fix #9743 : pager hover background should be light gray
2013-08-17 13:07:21 -07:00
Mark Otto
3505606d34
add respond.js to all examples ( fixes #9731 )
2013-08-17 12:32:11 -07:00
Mark Otto
e279ffab14
Merge pull request #9737 from ZDroid/patch-1
...
Removed blank .hidden-print
2013-08-17 11:58:19 -07:00
Mark Otto
fc9c7a9189
Merge pull request #9726 from twbs/calculate-it-son
...
un-hardcode @grid-gutter-width in @container-* LESS vars
2013-08-17 11:52:38 -07:00
Zlatan Vasović
0555d11665
Removed blank .hidden-print
...
Blank .hidden-print class doesn't have sense.
2013-08-17 15:24:37 +02:00
Chris Rebert
e12d6208b6
un-hardcode @grid-gutter-width in @container-* LESS vars
2013-08-17 00:02:17 -07:00
Mark Otto
6a8cc191b5
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into bs3_row_margins
2013-08-16 22:37:11 -07:00
Mark Otto
cd0df1d21a
fixes #9436 more: put padding on containers, not the body because full width elements
2013-08-16 22:37:02 -07:00
Mark Otto
16d5e1bae8
Merge pull request #9718 from twbs/bs3_row_margins
...
BS3: Simpler row margins
2013-08-16 15:32:18 -07:00
Mark Otto
e4bb388bc9
Make negative margins on rows the default, not just in containers, and add padding to body to compensate
2013-08-16 15:16:03 -07:00
Mark Otto
f459d76e38
fixes #9475
2013-08-16 15:07:45 -07:00
Chris Rebert
60d150dfd7
Merge pull request #9717 from twbs/carousel-html-compliance
...
Fix carousel example to pass HTML5 validator
2013-08-16 14:51:43 -07:00
Chris Rebert
07d15c4927
carousel example: add alt text to images
2013-08-16 14:50:46 -07:00
Chris Rebert
de39c2f896
carousel example: add dummy 'src' attributes to <img>s
2013-08-16 14:43:39 -07:00
Mark Otto
62083a45b7
fixes #9701 : fix up offcanvas example
2013-08-16 14:12:18 -07:00
Mark Otto
d2e2ec0985
increase spacing on homepage links and social buttons ( fixes #9706 )
2013-08-16 14:04:11 -07:00
Mark Otto
e6f185acad
Justified nav now responsive; example updated accordingly ( fixes #9708 )
2013-08-16 14:01:32 -07:00
Mark Otto
af7b072a74
basic cleanup on carousel example ( fixes #9709 and #9700 )
2013-08-16 13:50:17 -07:00
Mark Otto
3c880e681d
finish up second pass through docs nav, headings, organization, naming, etc (another run through at #9710 )
2013-08-16 13:30:33 -07:00
Mark Otto
551c561ee2
docs cleanup on naming to fix #9710
2013-08-16 12:43:54 -07:00
Mark Otto
c13772d5f7
switch to margin on navbar-nav to avoid stacking negative space reported in #9705
2013-08-16 12:38:41 -07:00
Mark Otto
648c56fbe2
Merge branch '3.0.0-wip' into gh-pages
2013-08-16 12:35:20 -07:00
Mark Otto
4d36992180
Fixed up examples more
...
* sticky footer side scrolling
* static and fixed navbar more similar
* min-height on static and fixed navbar examples to illustrate
differences
last two items fix #9702
2013-08-16 11:35:19 -07:00
Mark Otto
e5f38207e0
fixed navbar static top borders
2013-08-16 11:34:30 -07:00
Mark Otto
ed4316d9b2
fixes #9642 : open dropdown nav items get proper styling
2013-08-16 11:16:32 -07:00
Mark Otto
6965c12e30
fixes #9697
2013-08-16 11:10:35 -07:00
Mark Otto
771ac3207e
xs button is xs-er ( fixes #9695 )
2013-08-16 11:08:29 -07:00
Mark Otto
4684e0c09b
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-16 11:04:16 -07:00
Mark Otto
1974aa6967
fix up sticky footer example ( fixes #9680 ) and add favicons to all examples
2013-08-16 11:03:52 -07:00
Chris Rebert
9464489720
fix Examples link on docs homepages; fixes #9693
2013-08-16 11:03:28 -07:00
Mark Otto
29fe7ed684
fix up justified nav example
2013-08-16 10:58:28 -07:00
Mark Otto
ffbec23c98
Docs cleanup for v3 prep
2013-08-16 00:54:19 -07:00
Mark Otto
3bb5644c72
Fix alignment of navbar header in fixed navbars
2013-08-16 00:54:12 -07:00
Mark Otto
afdaa0e6f0
Merge branch '3.0.0-wip' into bs3_homepage
2013-08-16 00:36:46 -07:00
Mark Otto
031703190c
Merge pull request #9670 from saiwang/fix-examples-link
...
fix links in examples
2013-08-15 22:48:00 -07:00
saiwang
a9268c01c9
fix links in examples
2013-08-16 13:42:43 +08:00
Mark Otto
2fa0975956
don't scope width on .make-xs-column mixin
2013-08-15 21:51:41 -07:00
Mark Otto
6a22a85ee9
Merge branch '3.0.0-wip' into gh-pages
2013-08-15 21:39:43 -07:00
Mark Otto
e04590babb
remove grid examples callout
2013-08-15 21:39:40 -07:00
Mark Otto
446b23bbf2
Merge branch '3.0.0-wip' into gh-pages
2013-08-15 21:38:48 -07:00
Mark Otto
45e2d73e93
use getbootstrap for tweet button
2013-08-15 21:29:44 -07:00
Mark Otto
908207ed0c
Merge branch '3.0.0-wip' into gh-pages
2013-08-15 21:09:40 -07:00
Mark Otto
b2f6268372
more docs updates for new examples
2013-08-15 21:09:25 -07:00
Mark Otto
c4b59fc1ca
fixes #9663 : third part, document the resets
2013-08-15 20:43:55 -07:00
Mark Otto
111bdc4e93
fixes #9663 : second part, reset pushes and pulls in md and lg grid tiers
2013-08-15 20:31:11 -07:00
Mark Otto
0c582f722b
More responsive customizer layout
2013-08-15 20:25:43 -07:00
Mark Otto
b0a66e60c1
Fixes #9663 : Add offset overrides for medium and large grid tiers
2013-08-15 20:25:20 -07:00
Mark Otto
fc88bcf0d1
fixes #9655 : scrope list group styles in panels to immediate children only
2013-08-15 18:58:02 -07:00
Mark Otto
7960845f50
new screenshot images and docs section
2013-08-15 18:55:20 -07:00
Mark Otto
024e320e5c
hella examples fixing, mostly navbars and lots of work on grids example
2013-08-15 17:39:37 -07:00
Mark Otto
05ebd5ebf9
Merge pull request #9653 from twbs/bs3_restore_examples
...
BS3: Restore examples back to main repo
2013-08-15 16:44:48 -07:00
Mark Otto
3d99a4c15e
move to examples dir
2013-08-15 16:40:39 -07:00
Mark Otto
54670ab64a
Merge branch 'bs-ex' into bs3_restore_examples
...
Conflicts:
.editorconfig
.gitignore
2013-08-15 16:38:12 -07:00
Mark Otto
cfab4b1e9e
nuke bootstrap dependencies
2013-08-15 16:32:36 -07:00
Mark Otto
e47b0e5c9a
nuke assets pre-move
2013-08-15 16:30:09 -07:00
Mark Otto
33f8c43eef
Merge pull request #40 from huyouare/carousel-example
...
Added glyphicons to index.html
2013-08-15 16:23:40 -07:00
Mark Otto
6b5a199559
Merge pull request #42 from huyouare/navbar-paths
...
Paths to navbar, navbar-fixed-top and navbar-static-top fixed in the navbar.
2013-08-15 16:23:33 -07:00
Mark Otto
0bc2a69fc9
Merge pull request #46 from ggam/revamp-offcanvas
...
Simplified Off Canvas example
2013-08-15 16:23:24 -07:00
Mark Otto
7cd35f0cb6
nuke bg image on active/open for buttons for when we add gradients
2013-08-15 16:17:44 -07:00
Mark Otto
7ab52272d7
better well content labels
2013-08-15 15:27:37 -07:00
Mark Otto
16d7265c9b
fixes #9647 : ensure open dropdown toggles get .active styles
2013-08-15 15:16:46 -07:00
Mark Otto
c389c9e8f4
fixes #9648
2013-08-15 14:57:55 -07:00
Mark Otto
e0c6a5a32f
fixes #9644 : update scrollspy navbar to use latest code
2013-08-15 14:46:28 -07:00
Mark Otto
e3c6a1fc4f
form control state ordering
2013-08-15 14:35:15 -07:00
Mark Otto
5349075f36
update customizer vars
2013-08-15 13:58:23 -07:00
Mark Otto
bf17721308
fixes #9587 : add var for nav link padding
2013-08-15 13:58:16 -07:00
Mark Otto
2dbf2bb8fb
fixes #9629
2013-08-15 13:54:47 -07:00
Mark Otto
25e11903e3
clear up rounded corners and nuke min-height
2013-08-15 13:52:46 -07:00
Mark Otto
61a395338d
improve the navbar top display in example--fixes #9635
2013-08-15 13:48:47 -07:00
Mark Otto
418ca6c09b
fixes #9622 : reset to inline-block for img-thumbnail, but keep block for .thumbnail > img
2013-08-15 13:40:21 -07:00
Mark Otto
0664b3f0da
fixes #9634 : turn off overflow-y when the navbar is re-expanded into horizontal mode
2013-08-15 13:29:45 -07:00
Mark Otto
98368c0cca
fixes #9632 : button spacing in narrow viewports
2013-08-15 13:24:48 -07:00
Mark Otto
c0c72a64b4
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-15 13:17:11 -07:00
Mark Otto
f9d2f9b6cd
improve pagination's active state so it looks less like the active state and more like active nav items
2013-08-15 13:16:06 -07:00
Mark Otto
3d37833134
reorder alerts
2013-08-15 13:06:51 -07:00
Mark Otto
dd4d618717
remove unused submenu css in docs
2013-08-15 13:06:25 -07:00
Mark Otto
4da7cad021
reorder and cleanup progress bar display
2013-08-15 13:06:01 -07:00
Mark Otto
8211b12c0f
improve table classes' snippets and ordering
2013-08-15 13:00:34 -07:00
Mark Otto
69a7c16705
fix spacing between examples and highlights again (my bad yo)
2013-08-15 13:00:06 -07:00
Chris Rebert
a3cbdfab06
docs.css: rm duplicate semicolon
2013-08-15 12:55:43 -07:00
Mark Otto
834cbce9b7
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-15 12:35:46 -07:00
Mark Otto
33edb95b98
drop legend from docs example per #9626
2013-08-15 12:35:22 -07:00
Chris Rebert
bc89c06b6c
Merge pull request #9625 from twbs/fix-9513-more
...
more fixes for #9513
2013-08-15 12:27:42 -07:00
Chris Rebert
5f311790b9
more fixes for #9513
2013-08-15 12:26:37 -07:00
Chris Rebert
5a4401ac91
copyediting tweaks to "Disabling responsiveness" docs
2013-08-15 12:01:53 -07:00
Mark Otto
4b350f8b79
delete comments
2013-08-15 11:56:07 -07:00
Mark Otto
2690a3dc31
Add to #9578 and fix #9614 : use cursor not-allowed on radios and checkboxes
2013-08-15 11:52:22 -07:00
Mark Otto
5a0ba42a7b
fix up inverse navbar form styles
2013-08-15 11:47:56 -07:00
Mark Otto
49e95f2bcf
add clearfix mention to another grid example and clear up examples
2013-08-15 11:47:45 -07:00
Mark Otto
3a7ddae39e
fixes #9600
2013-08-15 11:37:35 -07:00
Mark Otto
06e6da0918
fixes #9596 : proper dropup caret colors
2013-08-15 11:36:08 -07:00
Mark Otto
209d3af301
Fixes #9617 : consistent variation order, add .label-primary
2013-08-15 11:31:26 -07:00
Mark Otto
a5cb6c7a15
fixes #9613 : update docs css to prevent misaligned buttons example
2013-08-15 11:13:57 -07:00
Mark Otto
da6a7827d2
fixes #9616
2013-08-15 11:09:13 -07:00
Mark Otto
4002ac7e65
update to include nav link and mo betta docs on that last commit
2013-08-15 10:54:32 -07:00
Mark Otto
e550e113a0
fixes #9586 : add documentaton on how to disable the responsiveness of BS3
2013-08-15 10:50:58 -07:00
Mark Otto
f681c9712d
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-15 10:30:47 -07:00
Mark Otto
51f2c907e7
fixes #9607 : restore bottom border on hover of nav tabs for proper display
2013-08-15 10:30:37 -07:00
Mark Otto
18be4e880c
Merge pull request #9591 from BBosman/9523
...
Doc fixes related to #9523
2013-08-15 10:01:14 -07:00
Mark Otto
b9052a74bb
Merge pull request #9598 from coliff/patch-5
...
Change input type for the email input examples
2013-08-15 09:59:19 -07:00
Christian
6b612ae3fe
Update css.html
...
I know the form code are only examples, but it'd be good to encourage usage of the proper input type for the email inputs by changing the type from "text" to "email".
2013-08-15 21:57:24 +09:00
Bas Bosman
1619122603
Doc fixes related to #9523
2013-08-15 11:40:39 +02:00
Mark Otto
fee3f1e733
fixes #9582 : restore img-responsive as a class and move it's mixin to mixins.less
2013-08-15 00:46:18 -07:00
Mark Otto
1b6a5bbca2
fixes #9507 : remove padding on navbar-collapse as any padding on an animated object screws it up; instead use some padding on the navbar nav
2013-08-15 00:08:21 -07:00
Mark Otto
7f4e05fcce
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-14 23:53:21 -07:00
Mark Otto
f058a6a3ea
fixes #9522
2013-08-14 23:52:57 -07:00
Chris Rebert
c84d34b5f1
fix inaccurate comment in media query docs
2013-08-14 23:31:21 -07:00
Mark Otto
6e26f846cd
fix #9454 : add grid docs about responsive column clearing
2013-08-14 23:11:38 -07:00
Mark Otto
622fe05ff4
fixes #9445 : make img responsive mixin use display block, but provide option to pass custom value to it
2013-08-14 23:06:37 -07:00
Mark Otto
0456e5e4b3
fixes #9508 : use navbar align mixin for buttons to get correct top/bottom spacing
2013-08-14 23:02:58 -07:00
Mark Otto
c5ca743cb7
Merge branch 'navbar-brand-margin' of https://github.com/Luis-TP/bootstrap into Luis-TP-navbar-brand-margin
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-14 22:59:02 -07:00
Mark Otto
70b0fb445e
fixes #9523 : more accurate grid table breakpoint numbers
2013-08-14 22:57:59 -07:00
Mark Otto
083b7c0981
fixes #9563 : add callout about browser zooming to browser support section
2013-08-14 22:52:07 -07:00
Mark Otto
039966a0fc
add call out to fix #9569
2013-08-14 22:48:04 -07:00
Mark Otto
dff88d66e2
reaffix the docs sidenav at all times--screw this height business; fix space between code snippet and example
2013-08-14 22:45:26 -07:00
Mark Otto
9de788134f
refactor navbar file to better nest css and restore navbar-color to navbar text ( fixes #9500 )
2013-08-14 21:32:23 -07:00
Mark Otto
2e8a146b61
remove gradients from dropdown menu items on hover/active ( fixes #9473 )
2013-08-14 21:24:48 -07:00
Chris Rebert
3a67054536
fix copypasta-o to fully fix #9295
2013-08-14 19:07:14 -07:00
Mark Otto
a58bf08360
Merge pull request #9578 from twbs/cursor-not-allowed-disabled-btn-checkbox-radio
...
fixes #9511 ; set cursor:not-allowed for disabled buttons,checkboxes,radios
2013-08-14 18:32:15 -07:00
Chris Rebert
e684758b55
fixes #9511 ; set cursor:not-allowed for disabled buttons,checkboxes,radios
2013-08-14 18:20:28 -07:00
Mark Otto
a9d6b7ee0b
Merge branch '3.0.0-wip' into reset-FF-Android-default-background-image
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-14 16:24:39 -07:00
Chris Rebert
4d527ec316
fixes #8702 until Normalize.css starts handling this
2013-08-14 16:08:24 -07:00
Mark Otto
8e8fe8de93
fixes #9509 : add margin around buttons so they don't shit the bed when wrapping
2013-08-14 15:39:21 -07:00
Mark Otto
db684a1a61
remove unused docs css
2013-08-14 15:37:21 -07:00
Mark Otto
0086761660
Merge branch '3.0.0-wip' of https://github.com/lerks/bootstrap into lerks-3.0.0-wip
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-14 15:33:38 -07:00
Mark Otto
c8c9274728
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-14 15:33:06 -07:00
Mark Otto
60a281507a
Merge pull request #9498 from ggam/panel-variant-fix
...
Made panel-variant apply styles only to first child
2013-08-14 15:32:21 -07:00
Mark Otto
057a87ed65
Merge pull request #9521 from Luis-TP/fix-javascript-docs
...
Javascript Docs: Add .navbar-header, and correct .nav-collapse
2013-08-14 15:27:41 -07:00
Mark Otto
5381ed085c
really fix the pres in scrollable tables
2013-08-14 15:26:01 -07:00
Mark Otto
4b0590b0e7
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-14 15:20:21 -07:00
Mark Otto
48bcf81646
Merge branch '3.0.0-wip' of https://github.com/jharbert/bootstrap into jharbert-3.0.0-wip
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-14 15:19:57 -07:00
Mark Otto
4bf9fc3d02
Merge pull request #9544 from gabrielecirulli/3.0.0-wip
...
Add information on how to disable zoom on mobile devices to the docs
2013-08-14 15:17:34 -07:00
Mark Otto
2002045b7f
fuck aside and main elements, use divs so IE8 doesn't shit the bed
2013-08-14 14:59:08 -07:00
Gabriele Cirulli
fb71f40245
tweak note about zoom disabled on mobile
2013-08-14 23:51:26 +02:00
Mark Otto
8d3dbe78c6
fixes overflowing table due to pre
2013-08-14 14:30:00 -07:00
Mark Otto
b02e80c6fb
fixes #9557 : set tooltip demo to use body as container
2013-08-14 14:29:53 -07:00
Gabriele Cirulli
a3b279c556
improve the "zoom disabled" documentation
2013-08-14 23:26:34 +02:00
Mark Otto
e5e1270e57
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-14 14:24:06 -07:00
Mark Otto
49932d60b4
fixes #9556
2013-08-14 14:24:00 -07:00
Mark Otto
f7c8612f39
Merge pull request #9540 from ggam/table-variant
...
Added table-row-variant mixin
2013-08-14 14:21:51 -07:00
Guillermo González de Agüero
537910d484
Removed commented lines
2013-08-14 23:12:47 +02:00
Chris Rebert
a9972c5d20
Add missing close-parens in docs sentence; fixes #9512
2013-08-14 13:45:20 -07:00
Gabriele Cirulli
fb6bd757df
add information on how to disable mobile zoom to the docs
2013-08-14 22:08:17 +02:00
ggam
72a2efb3db
Added table-row-variant mixin
2013-08-14 21:16:45 +02:00
Luis Aleman
b0aef6cde0
Removed containers, and moved brand to after the navbar-toggle
2013-08-14 14:30:35 -04:00
Chris Rebert
3890ab3987
Merge pull request #9531 from ggam/docs-indentation
...
Fixed inconsistencies in JavaScript examples
2013-08-14 11:10:24 -07:00
ggam
2be8a5a245
Removed trailing semicolons from examples
2013-08-14 19:57:54 +02:00
ggam
cde39f7b78
Fixed indentation in JavaScript example
2013-08-14 19:53:37 +02:00
Luis Aleman
80ff4bf870
Add .navbar-header, and correct .nav-collapse
2013-08-14 13:31:29 -04:00
Luis Aleman
ef60b0e5fb
Get rid of navbar-brand margin-right
2013-08-14 13:03:00 -04:00
Mark Otto
b9620a1d5e
Merge pull request #9489 from BBosman/ol-breadcrumb
...
OL breadcrumbs
2013-08-14 09:44:18 -07:00
Mark Otto
518c32423e
Merge pull request #9493 from brenoc/3.0.0-wip
...
Reference only not minified files in Bower
2013-08-14 09:40:29 -07:00
Mark Otto
4ff48c9c3c
Merge pull request #9496 from BBosman/accordion-border-color
...
Remove old accordion remnant
2013-08-14 09:39:55 -07:00
Mark Otto
6f7c3e2d5b
Merge pull request #9499 from ggam/docs-print
...
Added hidden-print class to docs sidebar
2013-08-14 09:38:23 -07:00
Mark Otto
99a5f16db6
Merge pull request #9502 from Luis-TP/navbar-padding
...
Remove .navbar-collapse padding when not in mobile context
2013-08-14 09:37:50 -07:00
Luis Aleman
1b3896fabf
Remove .navbar-collapse padding when not in mobile context
2013-08-14 11:39:38 -04:00
ggam
72785644bd
Added hidden-print class to docs sidebar
2013-08-14 17:09:13 +02:00
ggam
80d1b6b117
Made panel-variant apply styles only to first child
2013-08-14 16:40:26 +02:00
Bas Bosman
09464b5d41
Remove old accordion remnant
2013-08-14 16:33:35 +02:00
Breno Calazans
48c1add83b
Reference only not minified files in Bower
...
Fixes #8985
2013-08-14 11:10:48 -03:00
Bas Bosman
c4568e4c3b
Ordered breadcrumbs
2013-08-14 15:16:30 +02:00
Luca Wehrstedt
1e1b5c737b
fixes #9406 : proper border for justified btn-groups inside tables
2013-08-14 12:37:48 +02:00
Chris Rebert
1fd51b0fa3
Merge pull request #9463 from PMPP/css-ex-fix
...
CSS Grid old classes in use
2013-08-14 02:14:59 -07:00
Pedro Pereira
1800edc07c
CSS Grid old classes in use
2013-08-14 17:02:57 +08:00
Chris Rebert
aa2c152d85
rm action attr from highlighted example code too
...
fixup to e61c71e077
2013-08-14 00:09:42 -07:00
Chris Rebert
13d2616631
tweak punctuation in sentence of docs
2013-08-13 21:32:49 -07:00
Mark Otto
9d82a8ba1f
Merge pull request #9451 from Luis-TP/3.0.0-wip
...
Fix .navbar-right > .dropdown-menu alignment
2013-08-13 20:47:58 -07:00
Luis Aleman
c79fa6ad04
Apply mixin to correct class
2013-08-13 22:53:23 -04:00
Jason Harbert
09e1f69d3e
fixes issue after navbar is collapsed, dropdown-menus on uncollapsed menu are no longer visible
2013-08-13 19:40:12 -07:00
Luis Aleman
e29c2d0c24
Fix .navbar-right > .dropdown-menu alignment
2013-08-13 22:30:02 -04:00
Chris Rebert
66122fa153
Merge pull request #9443 from mattleff/patch-1
...
Tiny typo in class prefix
2013-08-13 17:04:34 -07:00
Matthew Leffler
a380e80cd7
Typo
2013-08-13 17:56:12 -06:00
Mark Otto
bda3db0b55
remove old dist zip
2013-08-13 16:11:41 -07:00
Mark Otto
17f9ddd8ec
Merge branch '3.0.0-wip' into gh-pages
...
Conflicts:
components.html
2013-08-13 16:11:26 -07:00
Mark Otto
d1e18e55ac
remove accordion from customizer; shorten min height for affix
2013-08-13 16:00:05 -07:00
Mark Otto
5b4fe08f42
fixes #9439 : use overflow: auto on navbar collapse
2013-08-13 15:22:05 -07:00
Mark Otto
fa330f308a
Overhaul navbar alignment (.pull-) utilities ( fixes #9440 )
...
Now navbars have their own float utility classes, mixin-ed versions of
`.pull-left` and `.pull-right`.
* Removed chained `.navbar-nav.pull-right`
* Added `.navbar-left` and `.navbar-right` as mixins of the default
float utilities, but only above the `@grid-float-breakpoint` to match
the new navbar behavior
* Updated components docs to match the new changeas
* Added callout about component alignment here to explain the new
classes
2013-08-13 15:19:59 -07:00
Mark Otto
8d2948c0d6
grunt dist on prev forms change
2013-08-13 14:56:58 -07:00
Mark Otto
3da3f7e474
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-13 14:56:33 -07:00
Mark Otto
bb059f28de
only affix the sidenav in the docs if the viewport is >800px tall ( fixes #8704 and avoids #8721 )
2013-08-13 14:56:22 -07:00
Mark Otto
2bc67b334d
nuke the box-shadow on uncollapsed navbar-collapse
2013-08-13 14:46:34 -07:00
Mark Otto
78da4975e6
Merge pull request #9437 from ggam/patch-1
...
Swapped input-lg and input-sm
2013-08-13 14:32:36 -07:00
Guillermo González de Agüero
f0ee3aaac0
Swapped input-lg and input-sm
...
Fixing my own error. Thanks to @kyleledbetter for reporting.
2013-08-13 23:31:33 +02:00
Mark Otto
a2475f0145
better rc2 download action
2013-08-13 14:23:17 -07:00
Mark Otto
e61c71e077
fix up broken tests by removing empty attr
2013-08-13 14:23:10 -07:00
Mark Otto
51f692f686
fix navbar border in docs
2013-08-13 14:12:11 -07:00
Mark Otto
9482a5f812
Merge pull request #9403 from twbs/bs3_navbar_overhaul
...
BS3: Navbar overhaul
2013-08-13 13:53:27 -07:00
Mark Otto
bd93ed2cb6
Merge branch '3.0.0-wip' into bs3_navbar_overhaul
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-13 13:48:33 -07:00
Mark Otto
3c772b1ceb
lighter default navbar, add borders to navbars, tweak padding and alignments
2013-08-13 13:39:21 -07:00
Mark Otto
a8769b8cab
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-13 13:17:01 -07:00
Mark Otto
270af4dda3
fixes #9431 : specify font-size in dropdown menus to avoid inheritance issues
2013-08-13 13:16:56 -07:00
Mark Otto
e7d6bd94b7
Merge pull request #9427 from saiwang/fix-example-snippet
...
fix mixin code example
2013-08-13 13:13:57 -07:00
saiwang
84b1ef5048
fix mixin code example
2013-08-14 02:23:44 +08:00
Mark Otto
9a3aa9f1de
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-13 11:15:46 -07:00
Mark Otto
d482b712e7
fixes #9425 : focused input in docs gets actual focus styles
2013-08-13 11:15:36 -07:00
Mark Otto
729854fa5f
Merge pull request #9404 from twbs/bs3_drop_accordion_for_panel
...
BS3: Drop the accordion for the panel (fixes #8648 )
2013-08-13 10:44:43 -07:00
Mark Otto
33a88c9a94
Merge branch '3.0.0-wip' into bs3_drop_accordion_for_panel
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-13 10:36:38 -07:00
Mark Otto
3e373a844c
Merge pull request #9410 from ggam/pagination-size
...
Added pagination-size mixin
2013-08-13 10:35:24 -07:00
Mark Otto
ce77f10ce5
Merge pull request #9421 from ggam/input-size
...
Added input-size mixin
2013-08-13 10:35:04 -07:00
Mark Otto
d4b14cbf44
Merge pull request #9424 from twbs/bs3_btn_groups
...
BS3: `.btn-group`s for your `.btn-group`s
2013-08-13 10:31:29 -07:00
Mark Otto
69a3e9b4d0
enable button groups in vertical button groups
2013-08-13 10:24:18 -07:00
ggam
6ec0fd7d43
Added input-size mixin
2013-08-13 19:06:02 +02:00
Mark Otto
f15f259876
derp
2013-08-13 09:59:38 -07:00
Mark Otto
99312d2d83
Merge pull request #9418 from BBosman/fix-9415
...
Fixes #9415
2013-08-13 09:57:18 -07:00
Chris Rebert
e5263fb6ad
Merge pull request #9420 from saiwang/patch-highlight-hint
...
patch highlighting hint
2013-08-13 09:42:35 -07:00
saiwang
21a7de7a18
patch highlighting hint
2013-08-14 00:21:07 +08:00
Bas Bosman
052edcd8de
Fixes #9415
2013-08-13 18:10:57 +02:00
Guillermo González de Agüero
e74ac0723b
Fixed errors
2013-08-13 14:25:05 +02:00
ggam
ea04fa538e
Added pagination-size mixin
2013-08-13 13:27:45 +02:00
Mark Otto
36c4223b1d
fixes #8985 : only specify minified dist files for bower
2013-08-13 00:04:58 -07:00
Mark Otto
b0ab806dcc
fix negative indenting in button group for nested button groups
2013-08-12 23:44:50 -07:00
Mark Otto
09b2a153fc
copy
2013-08-12 23:38:52 -07:00
Mark Otto
237640c706
Drop the accordion for the panel
...
* Deletes the accordion.less file
* Extends the panel to be collapsible with our JS plugin
* Supports panel color variations
2013-08-12 23:36:25 -07:00
Mark Otto
54a3e4b780
mention fubared state of overflow hidden on body in android and iOS to fix #8975 and #9315
2013-08-12 22:47:19 -07:00
Mark Otto
f25a4805ed
Merge pull request #9389 from twbs/emphasize-git-HEAD
...
Emphasize git HEAD downloads
2013-08-12 22:29:25 -07:00
Mark Otto
48e7468e3a
invert dropdown styles in navbar for inverse variation
2013-08-12 21:43:59 -07:00
Mark Otto
80eb09cc1b
Merge branch '3.0.0-wip' into bs3_navbar_overhaul
...
Conflicts:
components.html
dist/css/bootstrap.min.css
2013-08-12 21:34:55 -07:00
Mark Otto
8aecfb4e3f
Merge pull request #9396 from twbs/docs-html-validation
...
add HTML5 validation of docs pages to the build
2013-08-12 21:30:57 -07:00
Mark Otto
49576704ea
finish fixing #9295 : add button group buttons to new input group sizing
2013-08-12 21:27:15 -07:00
Mark Otto
40723c8716
fixes #9400 : add box-sizing to pseudo elements as well
2013-08-12 21:26:43 -07:00
Mark Otto
0b338b0dc7
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-12 21:23:53 -07:00
Mark Otto
8bb7def26c
Navbar refactor
...
* Now responsive by default (fits better with mobile-first approach)
* Requires `.nav-header` to group `.navbar-brand` and `.navbar-toggle`
for proper mobile display.
* Changed `.nav-collapse` to `.navbar-collapse`
* Simplified examples in docs
2013-08-12 21:23:28 -07:00
Chris Rebert
f111c3e763
Components docs: Dropdowns section: add .sr-only toggle buttons so aria-labelledby validates
2013-08-12 19:47:18 -07:00
Chris Rebert
df7c9a6d96
add alt text to <img>s in javascript.html
2013-08-12 19:47:05 -07:00
Chris Rebert
f2cea2dc47
add alt text to <img>s in components.html
2013-08-12 19:46:34 -07:00
Chris Rebert
b33989a977
add src attribute to holder.js-powered <img>s so that they validate
...
use `data:` URL of empty invalid PNG: src="data:image/png;base64,"
2013-08-12 18:59:59 -07:00
Chris Rebert
3ec7930720
add ARIA roles to Dropdown examples in Components docs
2013-08-12 18:09:25 -07:00
Chris Rebert
bb5be0a2f9
add HTML5 validation of docs pages to the build
2013-08-12 17:49:01 -07:00
Chris Rebert
715e924217
Merge pull request #9399 from twbs/make-docs-html-more-valid
...
Make docs HTML more valid
2013-08-12 17:48:11 -07:00
Mark Otto
f4bb660974
drop iframe attributes for CSS styling
2013-08-12 17:46:02 -07:00
Chris Rebert
8a1fc99f50
give navbar forms non-empty actions
2013-08-12 17:43:38 -07:00
Chris Rebert
a13fe0a4a0
use unique IDs in Forms examples in docs
2013-08-12 17:43:38 -07:00
Chris Rebert
10356f9d67
rm unnecessary blank id attribute
2013-08-12 17:43:38 -07:00
Chris Rebert
81ab8ffae0
Headings docs: use put <hN>s within <td>s instead of <th>s
2013-08-12 17:43:38 -07:00
Chris Rebert
520bc8cf37
add alt text to <img>s in Images section of CSS docs
2013-08-12 17:28:53 -07:00
Chris Rebert
598f811fa0
add alt text to media object <img>s
2013-08-12 17:28:53 -07:00
Chris Rebert
5b9717ef67
add alt text to thumbnail <img>s
2013-08-12 17:28:53 -07:00
Chris Rebert
df59ecc9c4
add alt text to carousel <img>s
2013-08-12 17:28:53 -07:00
Chris Rebert
4876a3a716
Validation states docs: fix closing tag
2013-08-12 17:06:02 -07:00
Chris Rebert
9391f4de4b
Merge pull request #9398 from twbs/minor-docs-fix
...
fix ID of <select> in fieldset[disabled] example
2013-08-12 16:55:47 -07:00
Chris Rebert
1c64c8f43b
fix ID of <select> in fieldset[disabled] example
2013-08-12 16:54:58 -07:00
Mark Otto
eac61de138
fix navbar form alignment of inputs by restoring inline-block
2013-08-12 16:09:21 -07:00
Mark Otto
c558c035d7
fixes #9258 : no more float bug with full-width grid columns by removing float on all .col-*-12 classes
2013-08-12 16:02:27 -07:00
Mark Otto
fb8ae7e514
drop the class on the button group toggles CSS (alt fix to #9297 )
2013-08-12 15:46:11 -07:00
Mark Otto
55c36f86d0
safari not webkit
2013-08-12 15:44:01 -07:00
Chris Rebert
3d6efcf250
fix typo; fix caps
2013-08-12 15:25:41 -07:00
Mark Otto
3f2408f9e8
mention #9282 in docs browser section
2013-08-12 15:13:38 -07:00
Mark Otto
89346410c7
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-12 15:02:21 -07:00
Mark Otto
394f698056
undo the grid max-width boundary because it makes offsets kinda borked (you'd have to set twice, for medium and large, in most cases--and that sucks)
2013-08-12 15:02:09 -07:00
Mark Otto
888e14d64e
Merge pull request #9395 from twbs/valid-github-btn-html
...
social-buttons.html: drop 'px' from height+width attrs per HTML5
2013-08-12 14:53:53 -07:00
Mark Otto
8a669bea2e
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-12 14:52:54 -07:00
Mark Otto
eb1565681f
fixes #9392 : no need for width auto on inline/navbar form controls given inline-block on parent form group
2013-08-12 14:52:49 -07:00
Chris Rebert
e6e60d325c
social-buttons.html: drop 'px' from height+width attrs per HTML5
2013-08-12 14:48:46 -07:00
Chris Rebert
7c7c447d85
Merge pull request #9394 from twbs/valid-github-btn-html
...
_includes/social-buttons.html: escape ampersands in URLs so HTML validates
2013-08-12 14:40:07 -07:00
Chris Rebert
7f8f1ca65e
_includes/social-buttons.html: escape ampersands in URLs to fix HTML validation error
2013-08-12 14:30:28 -07:00
Chris Rebert
e245bffe8c
fix spelling
2013-08-12 14:25:15 -07:00
Mark Otto
c02269a9f0
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-12 14:05:42 -07:00
Mark Otto
a78c8d9c04
Newfangled input and button group sizing ( fixes #9295 )
...
Instead of applying `.btn-` or `.input-` to individual elements in
button and input groups, we now have new sizing classes to keep your
markup a little leaner.
* Add `.input-group-sm` or `.input-group-lg` to your `.input-group` to
replicate `.input-sm` and `.input-lg`, respectively.
* Add `.btn-group-xs`, `.btn-group-sm`, or `.btn-group-lg` to your
`.btn-group` to replicate `.btn-xs`, `.btn-sm`, and `. btn-lg`,
respectively.
Both sets of new sizing classes simply use the existing individual
sizing classes as mixins, so customization of them is automatically
inherited when compiling.
2013-08-12 14:03:57 -07:00
Chris Rebert
38d6e7179a
don't show download_dist in favor of site.download; addresses #9138 & its many dupes
2013-08-12 13:35:53 -07:00
Chris Rebert
af2ea581b2
update CDN links to point to continuously-updated build; addresses #9138 & its many dupes
2013-08-12 12:13:15 -07:00
Chris Rebert
461b05f5b1
update download_dist for RC 2
2013-08-12 12:09:52 -07:00
Mark Otto
c3c0218379
Merge pull request #9388 from johvik/patch-1
...
Javascript > Alert should use danger not error
2013-08-12 12:04:39 -07:00
Mark Otto
abedd38c5b
update grid xs mixin and update docs to match new mixins
2013-08-12 11:52:51 -07:00
johvik
7eb0793223
Javascript > Alert should use danger not error
2013-08-12 20:52:25 +02:00
Mark Otto
a09531a40e
update to rename rc2
2013-08-12 11:48:35 -07:00
Mark Otto
1462fe2c81
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-12 11:34:44 -07:00
Mark Otto
9564c356d3
inherit font-size in code when inside pre
2013-08-12 11:34:28 -07:00
Chris Rebert
f5b1499776
copyedit media queries docs added in aefed0ada9
2013-08-12 11:31:45 -07:00
Mark Otto
a74d6cfe73
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-12 11:09:07 -07:00
Mark Otto
f662dff6e9
fixes #9382 : inline forms now require use of .form-group for proper alignment of all form controls
2013-08-12 11:07:23 -07:00
Mark Otto
ddd13dc100
Merge pull request #9373 from ggam/button-sizes
...
Added button-size mixin
2013-08-12 10:40:56 -07:00
Mark Otto
3d11e6dedf
Merge pull request #9371 from ggam/buttons-consistency
...
Renamed btn-pseudo-states mixin to btn-variant for consistency
2013-08-12 10:06:34 -07:00
Mark Otto
a9a27d3794
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-12 10:01:22 -07:00
Mark Otto
55cfa8d38f
Drop background-clip and background-size mixins since they have no prefixes anyway
2013-08-12 10:01:13 -07:00
Mark Otto
1f745176d4
Merge pull request #9384 from BBosman/aria-hidden
...
Add missing aria-hidden attribs to close buttons
2013-08-12 09:55:46 -07:00
Mark Otto
657c19f943
Merge pull request #9383 from BBosman/aria-search
...
Aria role search instead of form
2013-08-12 09:55:24 -07:00
Mark Otto
0c879d3ece
Merge pull request #9381 from ggam/dropdown-events
...
Added Dropdown JS plugin events to docs
2013-08-12 09:53:24 -07:00
Mark Otto
3ce2b645c7
Merge pull request #9374 from ggam/carousel-glyphicons
...
Removed remaining Glyphicons mentions in carousel.less
2013-08-12 09:52:38 -07:00
Bas Bosman
8dd45053ce
Add missing aria-hidden attribs to close buttons
2013-08-12 17:56:10 +02:00
Bas Bosman
38b2083f3c
Aria role search instead of form
2013-08-12 17:38:20 +02:00
ggam
587a001dcc
Added Dropdown JS plugin events ( fixed #9375 )
2013-08-12 17:05:15 +02:00
ggam
d80d9251ef
Removed remaining Glyphicons mentions in carousel.less
2013-08-12 14:20:17 +02:00
ggam
6993db1840
Added button-size mixin
2013-08-12 14:07:19 +02:00
ggam
83293516b6
Renamed btn-pseudo-states mixin to btn-variant for consistency
2013-08-12 13:55:09 +02:00
Mark Otto
175a112548
fix #9239 by restoring old ie8 responsive img foo
2013-08-12 01:56:38 -07:00
Mark Otto
5e73cc90d9
fixes #9266 manually on account of list group file reorganization
2013-08-12 01:39:43 -07:00
Mark Otto
acdbe73851
fixes #8835 : make it so active list group items aren't dependent on an <a> tag
2013-08-12 01:38:06 -07:00
Mark Otto
6dbf588237
fixes #9310 : alerts aren't dismissable by default, now requires .alert-dismissable if you need a close button
2013-08-12 01:20:22 -07:00
Mark Otto
aefed0ada9
fixes #9317 : document media queries
2013-08-12 00:48:36 -07:00
Mark Otto
86fd07f93c
update docs affix for large desktop given latest grid changes
2013-08-12 00:40:36 -07:00
Mark Otto
efe62a7ef4
rename and refactor a smidge to add medium grid mixins
2013-08-12 00:36:22 -07:00
Mark Otto
f50aea30c4
Merge branch 'patch-12' of https://github.com/ggam/bootstrap into ggam-patch-12
2013-08-12 00:31:28 -07:00
Mark Otto
a2b9988eb9
Media query (grid and responsive utilities) overhaul
...
Grid classes have been changed to account for a fourth set of classes,
meaning we now have XS, S, M, and L options. Specifically, we made the
following changes:
* Renames `.col-` to `.col-xs-`
* Adds `.col-md-` for devices 992px wide and up
* Remaps `.col-lg-` for devices 1200px wide and up
Alongside that, we've updated our media queries to better handle
advanced grid layouts:
* All column classes now kick in when they hit a `min-width`, undoing
the #9128 fix in
https://github.com/twbs/bootstrap/commit/db45a60cc86190a060f0baf0b3961cb
c690f3a65
* All column offsets, pushes, and pulls are scoped to an appropriate
range, meaning a `min-width` and `max-width` (thanks for the idea,
@eratzlaff)
We've also modified the widths of our grid containers for the small
device grid (now a max 720px instead of 728px) and large device grid
(now a max 1140px instead of 1170px) to avoid horizontal scrollbar
problems in Firefox (likely due to box-sizing, which is why we didn't
see it in 2.x).
Similarly, we've updated the responsive ultility classes to match the
new four media query approach of the grid system. That means we've:
* Added new `.visible-xs` and `.hidden-xs` classes
* Reassigns visible and hidden classes for small, medium, and large to
matching grid system media queries
* Updates docs examples to match grid system and account for fourth
utility range
-----
Fixes the following:
* #9135 : fourth grid tier
* #9302 : undoes previous range change for small grid system, so no need
to update any docs here
* #8755 : consistent grid and responsive utilities schemas)
* #9195 , #9216 , and #9227 : no more horizontal scrollbars
2013-08-12 00:28:50 -07:00
Mark Otto
95affa32e6
simplify padding in list groups and margins on badges within
2013-08-11 21:17:49 -07:00
Mark Otto
a0f301995c
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-11 20:46:22 -07:00
Mark Otto
ac74655998
add another var
2013-08-11 20:45:51 -07:00
Mark Otto
c52a3508c6
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-11 20:45:42 -07:00
Mark Otto
9e316beba1
Merge pull request #9355 from kevinSuttle/aside
...
Map 'role="complementary"' to proper HTML5 aside element
2013-08-11 20:43:18 -07:00
Kevin Suttle
9d5473255b
Map 'role="complementary"' to proper aside element
...
http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex
http://www.w3.org/TR/wai-aria/roles#complementary
2013-08-11 23:40:22 -04:00
Mark Otto
2a8e5765b9
Merge pull request #9353 from kevinSuttle/contentinfo
...
Map "contentinfo" role to HTML5 footer element
2013-08-11 20:34:58 -07:00
Mark Otto
2ae8be3b31
Customizer field updates for variables
2013-08-11 20:33:58 -07:00
Mark Otto
0819cfc450
addressing #9189 manually, part 7: thumbnails vars
2013-08-11 19:32:16 -07:00
Kevin Suttle
1355c58cf2
Map "contentinfo" role to HTML5 footer element
...
http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex
http://www.w3.org/TR/wai-aria/roles#contentinfo
2013-08-11 22:26:40 -04:00
Mark Otto
bf4900072d
Drop the font-weight on panel labels since heading elements already get it
2013-08-11 19:20:23 -07:00
Mark Otto
fca5c812c5
Restore prior docs spacing
2013-08-11 19:19:56 -07:00
Mark Otto
85ec6e741d
Follow up commit: fix collapse clearing and navbar brand/nav spacing
2013-08-11 19:19:44 -07:00
Mark Otto
f47a1905e2
Merge pull request #9352 from kevinSuttle/aria-forms
...
Give forms and search fields proper ARIA roles
2013-08-11 19:18:36 -07:00
Mark Otto
ba8026e00f
Refactor navbars to simplify things
...
* `.navbar-brand` is no longer centered, thus removing need for
max-width and a few lines of code
* Clear floats of `.navbar-brand` in the `.nav-collapse` like we did in
2.x, thus simplifying some clearing and other things.
* Restyle the `.navbar-toggle` button to align it's bars up with the
text and flow of the document.
* Restyle the `.navbar-brand` to not use padding on left/right as to
avoid negative margin and other fuckery. This limits the ability to put
a bg color on the brand, but I think that's fine for now.
2013-08-11 19:06:26 -07:00
Kevin Suttle
a86f5d24f8
Give forms and search fields proper ARIA roles
...
http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex
http://www.w3.org/TR/wai-aria/roles#form
http://www.w3.org/TR/wai-aria/roles#search
2013-08-11 21:45:50 -04:00
fat
63425cd804
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-11 18:42:34 -07:00
fat
8bdffecf8f
rebuild + first bit of customizer urls
2013-08-11 18:42:13 -07:00
Mark Otto
c2cfd3153b
addressing #9189 manually, part 6: add a navbar margin var, but avoid the navbar-nav var because that should really be customizable
2013-08-11 18:32:52 -07:00
Mark Otto
e9650f51bf
addressing #9189 manually, part 5: don't bother with a .label font-weight var and let's just use bold because windows hates 500
2013-08-11 18:10:42 -07:00
Mark Otto
a66cdb0c30
addressing #9189 manually, part 4: input group background var
2013-08-11 18:09:56 -07:00
Mark Otto
83f1a75e7a
addressing #9189 manually, part 3: forms
2013-08-11 18:06:26 -07:00
Chris Rebert
12b9058df9
Merge pull request #9351 from vsn4ik/quotes_in_nav_main
...
Move quotes in nav-main.html
2013-08-11 17:59:27 -07:00
Mark Otto
286636755a
spacing
2013-08-11 17:47:53 -07:00
Mark Otto
58b90dae15
addressing #9189 manually, part 2: dropdown header and disabled link colors (and refactor commenting styles)
2013-08-11 17:47:30 -07:00
vsn4ik
06da490707
Move quotes in nav-main.html
2013-08-12 04:46:07 +04:00
Mark Otto
8b76e0d0f0
addressing #9189 manually, part 1: code and pre vars
2013-08-11 17:23:19 -07:00
Mark Otto
32f6cbf9d0
Merge pull request #9211 from zacwasielewski/responsive-visibility-utilities-as-less-mixins
...
Make visibility utility classes responsive when used as LESS mixins
2013-08-11 17:03:24 -07:00
Mark Otto
83c236f570
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-11 16:07:57 -07:00
Mark Otto
1ff1dfb2bd
fixes #9348 by ditching a comment
2013-08-11 16:07:45 -07:00
Jacob Thornton
92c2ad98e7
fixes #8983
2013-08-11 15:41:06 -07:00
Jacob Thornton
b8ed111a18
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-11 15:17:30 -07:00
Jacob Thornton
89b3cb0dac
fixes #9318
2013-08-11 15:17:04 -07:00
Mark Otto
9b07b999d2
Merge pull request #9286 from neilhem/3.0.0-wip
...
set img-circle class in percents
2013-08-11 15:15:53 -07:00
Jacob Thornton
c49ecc5f21
refresh scrollspy after page 'loads'
2013-08-11 15:03:48 -07:00
Mark Otto
39899e46cd
Merge pull request #9229 from ggam/patch-13
...
Removed Glyphicons mention from carousel.less
2013-08-11 15:02:07 -07:00
Mark Otto
0561cfec6b
fixes #8900 : nuke empty space between panel heading and list group
2013-08-11 15:01:16 -07:00
Jacob Thornton
31ab07b32a
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-11 14:59:57 -07:00
Jacob Thornton
bf2ab457ea
fix comment in tooltip
2013-08-11 14:59:39 -07:00
Mark Otto
a88888aaeb
fix broken components page, also likely from @kevinsuttle's #9332
2013-08-11 14:49:50 -07:00
Mark Otto
da75d0d30b
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-11 14:44:39 -07:00
Mark Otto
65c0f847e9
fix borked js docs layout, likely from @kevinsuttle's latest PR
2013-08-11 14:44:32 -07:00
Jacob Thornton
5c6b995971
add event prefixes
2013-08-11 14:39:11 -07:00
Jacob Thornton
6393a78bf0
fixes #9279
2013-08-11 14:32:32 -07:00
Mark Otto
b4081e6cd4
Merge pull request #9347 from kevinSuttle/header
...
Ensure proper use and location of role="banner"
2013-08-11 14:09:46 -07:00
Kevin Suttle
f38241d77e
Ensure proper use and location of role="banner"
...
http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex
http://www.w3.org/TR/wai-aria/roles#banner
2013-08-11 16:34:48 -04:00
Mark Otto
0b9efa9565
fix indentation
2013-08-11 13:20:24 -07:00
Mark Otto
a19ed6dcc1
Merge branch 'aria-nav' of https://github.com/kevinSuttle/bootstrap into kevinSuttle-aria-nav
2013-08-11 13:15:52 -07:00
Mark Otto
6b6241feaa
fixes #9241 : enable collapsing for labels, in addition to badges, when empty
2013-08-11 12:43:43 -07:00
Kevin Suttle
aa454134ec
Use nav for proper HTML5 ARIA role mapping
...
http://www.w3.org/html/wg/drafts/html/master/sections.html#the-nav-element
http://dev.w3.org/html5/spec/sections.html#the-nav-element
http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex
2013-08-10 22:33:53 -04:00
Mark Otto
d5290c61d8
fixes #9217 manually--use main element instead of div in home and default layouts
2013-08-10 16:11:34 -07:00
Mark Otto
308d40a729
remove customize layout now that we're bringing it back for rc2
2013-08-10 16:11:10 -07:00
Mark Otto
5eac5dab5d
Merge pull request #9245 from jlaswell/patch-1
...
Update components.html
2013-08-10 15:39:28 -07:00
Mark Otto
1b04535f69
Merge pull request #9230 from ggam/patch-14
...
Changed "Standard pagination" to "Default pagination"
2013-08-10 15:30:00 -07:00
Jacob Thornton
1abb7947c2
fixes #9222
2013-08-10 14:09:05 -07:00
Jacob Thornton
7998c45570
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-10 13:35:48 -07:00
Jacob Thornton
a4f0e8d37a
fixes #9111
2013-08-10 13:35:20 -07:00
ggam
6e8ace4b2b
Simplified Off Canvas example:
...
- Removed unneeded media queries to be more consistent with the rest of Bootstrap.
- Fixed unworking grid on latest 3.0 builds (BS version on this repo is outdated)
- Inluded needed bootstrap.js
2013-08-10 13:36:05 +02:00
Chris Rebert
da417c3e7e
Use protocol-relative URL in example
2013-08-09 18:01:11 -07:00
Chris Rebert
d48387aa4d
Fixes #9260
2013-08-09 17:55:12 -07:00
Chris Rebert
b2b44a53b7
getting-started docs: rephrase to avoid "helpful...help"
2013-08-09 17:48:29 -07:00
Rakhat Jabagin
c07717ce47
set img-circle class in percents
2013-08-09 17:57:49 +06:00
Chris Rebert
d0ac0f30b4
Merge pull request #9273 from liuyl/navbars
...
navbar.less
2013-08-09 00:59:43 -07:00
liuyl
d557fa2839
navbar.less
2013-08-09 15:44:10 +08:00
Chris Rebert
32369b2f78
Merge pull request #9271 from liuyl/panels
...
refactor panels.less
2013-08-09 00:28:08 -07:00
liuyl
ee62c37f17
panels
2013-08-09 15:24:38 +08:00
Jacob Thornton
dbed9da774
fixes #6159
2013-08-09 00:16:47 -07:00
Jacob Thornton
e46708f7ce
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-08 23:08:40 -07:00
Jacob Thornton
dec00eeeaf
add loading class for mdo to style on customizer
2013-08-08 23:07:14 -07:00
Chris Rebert
f86f6ee955
fix 'Calcuated' typo & run grunt; thanks @FagnerMartinsBrack
...
fixes typo introduced in 2b6ec38987
2013-08-08 13:31:22 -07:00
Chris Rebert
d3a26a5afe
Fix Find/Replace-o; good catch, @FagnerMartinsBrack!
...
Problem introduced in 6b23a66c29
2013-08-08 12:07:27 -07:00
jlaswell
64888ce0b0
Update components.html
...
Keeping bs-examples consistent with code provided.
2013-08-08 12:31:48 -04:00
Guillermo González de Agüero
5c98288122
Changed "Standard pagination" to "Default pagination"
2013-08-08 12:26:06 +02:00
Guillermo González de Agüero
f69833f9a9
Removed Glyphicons mention from carousel.less
2013-08-08 12:21:27 +02:00
Jacob
d22bd3a660
Merge pull request #9089 from jdiamond/3.0.0-wip
...
accordion's data-parent can't contain dots
2013-08-07 23:37:05 -07:00
Jacob Thornton
d320123374
zip js as well …
2013-08-07 23:15:03 -07:00
Jacob Thornton
89b69ed770
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
...
Conflicts:
_layouts/customize.html
2013-08-07 23:10:11 -07:00
Jacob Thornton
b35b65d0b3
first prototype of new customizer
2013-08-07 23:06:29 -07:00
Mark Otto
f3104a3e3b
Merge pull request #9200 from geedmo/3.0.0-wip
...
Update to use @list-group-border-radius
2013-08-07 18:11:15 -07:00
Mark Otto
8cc00901a0
Merge pull request #9201 from ggam/patch-11
...
Added panel-variant mixin
2013-08-07 18:10:52 -07:00
Zac Wasielewski
407c966736
Make visibility utility classes responsive when used as LESS mixins
2013-08-07 16:47:49 -04:00
Chris Rebert
c587114f99
Merge pull request #9210 from twbs/browserstack-travis-pr-fix-take-2
...
apparently PRs against twbs/bootstrap have the same Travis slug
2013-08-07 13:32:45 -07:00
Chris Rebert
887125d9f5
apparently PRs against twbs/bootstrap have the same Travis slug
2013-08-07 13:30:00 -07:00
Guillermo González de Agüero
001e5d3da9
Added missing grid make-column mixins and fixed some inconsistencies
...
make-column() was still been use to generate "medium size" columns (col-sm), while make-small-column was creating the default columns (col).
I also changed @grid-float-breakpoint to @screen-small, as it was used in make-row() and I think it makes more sense here than the other.
2013-08-07 21:15:01 +02:00
Guillermo González de Agüero
f90ac58410
Updated panels.less to use variant-panel mixin
2013-08-07 20:19:12 +02:00
Guillermo González de Agüero
a24bc28de8
Added panel-variant mixin
2013-08-07 20:15:12 +02:00
geedmo
2f786aa0c1
Update to use @list-group-border-radius
2013-08-07 14:47:47 -03:00
Mark Otto
d490c35af3
Merge pull request #9198 from bwhitty/3.0.0-wip
...
Fixed #9196 - malformed HTML in doc
2013-08-07 08:34:33 -07:00
Mark Otto
554a476546
Merge pull request #9191 from ggam/patch-10
...
Fixed link to JavaScript buttons plugin
2013-08-07 08:25:42 -07:00
Braden Whitten
a4638259a5
Fixed #9196 - malformed HTML in doc
...
Stray <h3> was being closed by an </h2>. Updated to valid HTML. Fixes #9196
2013-08-07 09:18:12 -04:00
Guillermo González de Agüero
50d5a6d17a
Fixed link to JavaScript buttons plugin
2013-08-07 12:42:46 +02:00
Mark Otto
03258683ed
property order
2013-08-07 00:28:44 -07:00
Mark Otto
fef413f997
copy changes
2013-08-07 00:28:23 -07:00
adamjacobbecker
a8d95d4721
Improve accessibility (Section 508, WCAG)
...
This PR significantly improves Bootstrap's accessibility for users of assistive technology, such as screen readers. Some of the these changes add additional markup to the source examples, but we believe that the sacrifice in readability is worth achieving more widespread usage of accessibility best-practices.
What was done
- Added lots of [WAI-ARIA attributes](http://www.w3.org/WAI/intro/aria )
- Added `.sr-only` helper class, that is only readable by screen readers (and invisible for all other users). This lets us - make progress bars and paginations accessible to screen reading users.
- Advised users to always use label elements. For inline forms, they can hide them with `.sr-only`
- Added 'Skip navigation' link
- Added "Accessibility" section to getting-started.html.
What *wasn't* done
- Contrast issues (twbs#3572)
- Tooltips (twbs#8469)
- Documentation re: usage of icons, since they now live in a separate repo
Major props to all that contributed: @bensheldon, @jasonlally, @criscristina, and @louh. Feel free to chime in, guys, if I've left anything out.
2013-08-06 21:58:09 -07:00
Mark Otto
d1e712d848
fixes #8959 : only negative indent rows within .container (prevents horizontal scroll on full-width pages)
2013-08-06 21:11:16 -07:00
Mark Otto
18a4082553
fixes #8935 : add gutter width param to grid mixins
2013-08-06 21:00:12 -07:00
Chris Rebert
e100817740
Merge pull request #9183 from twbs/fix-other-peoples-travis-builds
...
disable BrowserStack for folks w/o their own key who are making PRs
2013-08-06 20:19:59 -07:00
Chris Rebert
fd3c4cab73
disable BrowserStack for folks w/o their own key who are making PRs
2013-08-06 20:14:36 -07:00
Mark Otto
2af9cf10ce
more twerks to the theme
2013-08-06 18:42:10 -07:00
Mark Otto
402dbfb617
Merge branch '3.0.0-wip' into bs3_theme
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-06 18:29:54 -07:00
Mark Otto
41bdd1a482
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-06 18:29:24 -07:00
Mark Otto
75b0e92bc4
little better spacing between major sections in le docs for jump to nav
2013-08-06 18:29:18 -07:00
Mark Otto
d89b364260
Merge pull request #9120 from FLOKER/patch-2
...
fix scrollSpy instructions for JS call
2013-08-06 18:09:49 -07:00
Mark Otto
000f89829e
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-06 18:06:36 -07:00
Mark Otto
3f3dfc54e7
update use of mixins and add bg-colors where necessary
2013-08-06 18:05:37 -07:00
Mark Otto
076ec90d0b
Merge branch '3.0.0-wip' of https://github.com/archanl/bootstrap into archanl-3.0.0-wip
...
Conflicts:
less/mixins.less
2013-08-06 18:05:24 -07:00
Chris Rebert
fe5580e4fc
Temporarily disable IE BrowserStack testing, to fix the build
...
Per @mdo's request.
Can re-enable IE after @fat figures out wassup w/ the unittest failures.
2013-08-06 17:56:20 -07:00
Mark Otto
acc9f5d88a
Merge pull request #9175 from twbs/bs3_third_party_support_docs
...
BS3: Add third party support docs
2013-08-06 17:51:31 -07:00
Mark Otto
dbde90ec0d
some copy editing
2013-08-06 17:46:40 -07:00
Mark Otto
ab79b4ac2d
Merge branch '3.0.0-wip' into bs3_third_party_support_docs
2013-08-06 17:40:33 -07:00
Mark Otto
167753273a
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-06 17:29:52 -07:00
Mark Otto
443ff0cc32
Pull from GitHub downloads for latest v3-wip on homepage
...
/cc @cv
2013-08-06 17:29:41 -07:00
Mark Otto
c3ac95333d
Fixes #8749 : prevent navbar nav from overlapping navbar toggle
2013-08-06 17:28:02 -07:00
Mark Otto
85f0abf837
Merge pull request #9171 from twbs/bs3_winph8_ie10_bug_town_usa_omgwtfbbq
...
Fixes #9162 : add mention of Windows Phone 8 and IE10 bugs with responsive foo
2013-08-06 16:45:16 -07:00
Mark Otto
223e032150
Fix #9174 : pad bottom of navbar collapsed content and clear floated contents
2013-08-06 16:39:18 -07:00
Mark Otto
f3bf32ffc5
add third party support section to the docs
2013-08-06 16:30:28 -07:00
Mark Otto
6da346527b
grunt dist on previous commit
2013-08-06 16:02:07 -07:00
Mark Otto
726bc02885
For @cvrebert
2013-08-06 15:52:06 -07:00
Mark Otto
7ae7aa6676
Merge pull request #8731 from nrw/patch-1
...
Format multiple badges in list-group-item
2013-08-06 15:41:50 -07:00
Mark Otto
287fdf8381
fixes #9162 : add mention of Windows Phone 8 and IE10 bugs with responsive foo
2013-08-06 15:21:26 -07:00
Mark Otto
06949d6a18
grunt dist on spacing change
2013-08-06 14:57:14 -07:00
Chris Rebert
187e6641a8
Merge pull request #9169 from bwhitty/3.0.0-wip
...
Fix spacing after '=' in popover.js
2013-08-06 14:25:17 -07:00
Braden Whitten
f816a18f79
Fix spacing after '='
...
Just added a space after a function definition to tidy up the code.
2013-08-06 17:02:57 -04:00
Chris Rebert
521f852744
update phantomjs link
2013-08-06 14:01:10 -07:00
Chris Rebert
8b8bf91825
Merge pull request #9165 from twbs/browserstack
...
Browserstack testing integration (rebased, squashed, tweaked)
2013-08-06 13:17:20 -07:00
Chris Rebert
cdc92e8139
only run browserstack tests in Travis
2013-08-06 12:25:26 -07:00
Rohan Jain
093cda244a
Integrate testing with browserstack
2013-08-06 12:24:14 -07:00
Chris Rebert
b976956432
Fix #9132 , but in the correct branch
...
People, don't PR against `gh-pages` please!
2013-08-06 12:09:44 -07:00
Chris Rebert
91b3935b6c
Merge pull request #9132 from davewasmer/patch-1
...
Fixed responsive navbar docs typo
2013-08-06 12:02:19 -07:00
Mark Otto
f16214a746
updated dist zip
2013-08-06 11:57:03 -07:00
Mark Otto
a57b93ee93
Merge branch '3.0.0-wip' into gh-pages
2013-08-06 11:56:24 -07:00
Mark Otto
c731961f9d
fixes #9140 : use correct var in tables
2013-08-06 11:40:02 -07:00
Mark Otto
2f1fcca6c5
Fixes #9145 : Fix tooltip opacity
...
Update tooltips to not use RGBa colors so IE8 can have tooltips, too
(means we're now using `opacity`).
2013-08-06 11:18:53 -07:00
Mark Otto
f266595092
Fixes #9150 : Hide popover titles in IE8
...
Properly hides popover titles in IE8 because apparently it doesn't
accept the `:empty` selector. /cc @fat @cvrebert
2013-08-06 11:18:12 -07:00
Mark Otto
440d8f5318
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-06 09:46:58 -07:00
Chris Rebert
4350c66253
Merge pull request #9157 from alienlebarge/3.0.0-wip
...
Add links to Recess, Uglify-js & PhantomJS in README
2013-08-06 09:28:04 -07:00
Cédric Aellen
4599eb69a4
Link to phantomjs
2013-08-06 15:06:25 +02:00
Cédric Aellen
3fb41d2400
link to Uglify-js repo
2013-08-06 15:04:52 +02:00
Cédric Aellen
3e3e6f13aa
links to Recess repo
2013-08-06 14:57:34 +02:00
Florian Weber
e70d146b20
Update javascript.html
2013-08-06 11:44:55 +02:00
Jesse Hu
a24319eb44
Added url paths to navbar navbar-static-top and navbar-fixed-top
2013-08-06 03:00:40 -04:00
Jesse Hu
da249b55c4
Changed nav-header to dropdown-header in navbar navbar-fixed-top and navbar-static-top as mentioned in Docs
2013-08-06 02:47:58 -04:00
Jesse Hu
6739522d6c
Added jquery.js and bootstrap.js tags to navbar and navbar-fixed top
2013-08-06 02:46:08 -04:00
Jesse Hu
97a5c3613c
Added glyphicons to index.html
2013-08-06 02:34:36 -04:00
Mark Otto
db45a60cc8
Scope tablet classes to tablets range only
...
Fixes #9128
2013-08-05 20:55:30 -07:00
Chris Rebert
5db9a10138
Merge pull request #9134 from neilhem/3.0.0-wip
...
remove repeated 'pagination' class in code example
2013-08-05 20:32:07 -07:00
Rakhat Jabagin
b29b8acd28
remove repeated 'pagination' class in code example
2013-08-06 09:19:07 +06:00
Dave Wasmer
587cd6c0d6
Fixed responsive navbar docs typo
...
The example given contradicts itself. The comments in the code claim `.navbar-collapse` will be hidden until 768px+ wide, but the line beneath uses `.nav-collapse`. The latter seems to actually work with the collapse plugin.
2013-08-05 23:02:15 -04:00
Mark Otto
1d1e21aff6
Merge pull request #9123 from twbs/bs3_alerts_default_class
...
Update labels to include a base class (fixes #8752 )
2013-08-05 20:01:45 -07:00
Mark Otto
219f0fe7c5
Merge branch '3.0.0-wip' into bs3_alerts_default_class
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-05 20:00:23 -07:00
Mark Otto
ac3cb6974a
Merge pull request #9130 from twbs/straight-up-wrong
...
Fix pixel values in Responsive Utilities docs to match the actual code
2013-08-05 19:36:19 -07:00
Chris Rebert
668bc5f458
Fix pixel values in Responsive Utilities docs to match the actual code
2013-08-05 17:43:29 -07:00
Mark Otto
f3bd6dbf03
fixes #8647 : remove focus outline on :focus of buttons in button groups
2013-08-05 16:16:58 -07:00
Mark Otto
ab090a29fb
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-05 16:15:43 -07:00
Mark Otto
98df9495cc
remove dupe border-box
2013-08-05 16:15:36 -07:00
Mark Otto
2354cd1ae8
Merge pull request #9124 from geedmo/3.0.0-wip
...
Fix Issue #8175 - .input-group-addon broken in Firefox
2013-08-05 16:14:48 -07:00
Mark Otto
04dc221037
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip
...
Conflicts:
customize.html
less/alerts.less
less/badges.less
less/button-groups.less
less/buttons.less
less/carousel.less
2013-08-05 16:03:10 -07:00
geedmo
c2737771b4
Fix Issue #8175 - remove lh for input-lg|sm
2013-08-05 19:58:38 -03:00
geedmo
7bc817bcba
Fix Issue #8175
2013-08-05 19:43:39 -03:00
Mark Otto
9bbe8a020a
Merge pull request #9121 from Flydiverny/alerts
...
Added padding variable for alerts and changed customize.html
2013-08-05 15:40:22 -07:00
Mark Otto
0faf42b4bc
Remove dupe hover background color
2013-08-05 15:35:16 -07:00
Mark Otto
c4281f3919
Update labels to include a base class
...
* Builds on the new button styles by requiring a `.btn-default` for the
regular, gray labels
* Updates components examples to show new stuff
2013-08-05 15:30:28 -07:00
Markus Maga
9123163b8f
Comma for clarification
2013-08-06 00:29:19 +02:00
Markus Maga
9108ab9fb8
Added padding variable for alerts and changed customize.html Warning state (which doesn't exist anymore)
2013-08-06 00:06:57 +02:00
Mark Otto
844df9e001
Fixes #8732 : unfucks disabled fieldset form example with form groups
2013-08-05 14:45:00 -07:00
Florian Weber
f3fd67772e
fix scrollSpy instructions for JS call
...
Don't really know if this is correct, but at least it only worked for me that way...
2013-08-05 23:37:08 +02:00
Mark Otto
bfe76273a0
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-05 14:20:46 -07:00
Mark Otto
c15f5a89a0
Enable scrollable responsive nav bar
...
Fixes #9007 in a hopefully decent way
2013-08-05 14:19:32 -07:00
Chris Rebert
c321adf289
carousel.less: copyedit explanatory comment
2013-08-05 13:13:54 -07:00
Mark Otto
96136dbb56
Merge branch 'pullright' of https://github.com/liuyl/bootstrap into liuyl-pullright
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-05 12:20:52 -07:00
Mark Otto
e23906faca
Fixes #8150 : add .static-form-control for vertical alignment of static form text
...
- Also fixes the vertical alignment of labels in horizontal layouts on
account of the recent button and input padding changes
- Also changes the vertical alignment of the checkboxes and radios in
horizontal forms
2013-08-05 12:17:09 -07:00
Mark Otto
bac9e80a46
Fixes #8872 : widen the carousel indicators to prevent wrapping
2013-08-05 11:59:32 -07:00
Mark Otto
a82ca0f9e1
Fixes #8795 , a reoccurence of #1969
2013-08-05 11:47:12 -07:00
Mark Otto
d0d8ab8364
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-05 11:30:59 -07:00
Mark Otto
01c46bfc0f
More button updates
...
- Fixes #9113 (caret colors in dropdown buttons)
- Darken borders around buttons for contrast in button groups
2013-08-05 11:30:50 -07:00
Chris Rebert
7fe1c1d78d
Merge pull request #9110 from chrisseaton/help-block-fix
...
Update css.html
2013-08-05 10:50:23 -07:00
Chris Seaton
ea17069f6e
Update css.html
...
.help-block talks about being 'longer', but with .help-inline gone, it's not longer than anything and the comparison is confusing.
2013-08-05 18:48:51 +01:00
Mark Otto
6af693d160
Fixes #8770 : mobile-first (stacked by default) horizontal dls
2013-08-05 09:10:52 -07:00
Mark Otto
41eef69e6f
Fixes #8786 (part 2): new default button styles
...
Also relevant: http://www.youtube.com/watch?v=Ldyx3KHOFXw
2013-08-05 09:02:59 -07:00
Mark Otto
2ee9bea890
Fixes #8786 (part 1): darken hover states on buttons
2013-08-05 08:52:22 -07:00
Mark Otto
e85b8f315f
Fixes #9049 : switch order of gradient mixin params to avoid problems for upgraders
2013-08-05 08:45:51 -07:00
Mark Otto
d87745d94d
fix broke 2.3.2 docs urls
2013-08-05 08:37:53 -07:00
Mark Otto
250ee7fc10
Merge branch '3.0.0-wip' into gh-pages
2013-08-05 08:34:09 -07:00
Mark Otto
550493a87e
Fixes #9073 : add note to homepage about download differences
2013-08-05 08:33:15 -07:00
Mark Otto
cb430701cc
new dist zip
2013-08-05 08:25:03 -07:00
Mark Otto
d771b549e3
Merge branch '3.0.0-wip' into gh-pages
2013-08-05 08:24:02 -07:00
Mark Otto
38a0eb6f77
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-05 08:23:39 -07:00
Mark Otto
e92518aec2
more docs changes
2013-08-05 08:17:41 -07:00
Mark Otto
233eef6861
update modals demo code
2013-08-05 08:13:44 -07:00
Mark Otto
d6ed590e83
Clean up mixins, fix #9100 (no ms-keyframes)
...
- Spacing tweaks in the general mixins
- Add comments to transform mixins about IE support
- Remove `-ms-keyframes` because only IE10+ supports it, and without
prefix
2013-08-05 08:11:13 -07:00
Mark Otto
7a98af5ec8
typo
2013-08-05 08:01:33 -07:00
Chris Rebert
2dcc9db6a3
Merge pull request #9097 from trevorah/patch-1
...
fixed small typo
2013-08-05 03:02:34 -07:00
Andy Trevorah
5e9af6578c
fixed small typo
...
its => belonging to it
it's => it is / it has
2013-08-05 10:50:31 +01:00
Chris Rebert
39e1261de1
Merge pull request #9091 from liuyl/docs
...
remove image description from docs
2013-08-05 02:41:45 -07:00
liuyl
e444baa22f
remove image description
2013-08-05 17:01:44 +08:00
Mark Otto
d2389ec7c4
fixes #8832 and #8823 : remove max-width from .navbar-brand when not mobile
2013-08-05 00:50:40 -07:00
Mark Otto
11e46845b2
fixes #9063 : add var for navbar border radius
2013-08-05 00:47:23 -07:00
Mark Otto
52266cfdcd
run grunt dist
2013-08-05 00:39:03 -07:00
Mark Otto
42e78c322b
update docs nav to use new stuff
2013-08-05 00:38:18 -07:00
Mark Otto
2a2acb6bf2
Merge branch 'patch-1' of https://github.com/jholl/bootstrap into jholl-patch-1
2013-08-05 00:07:19 -07:00
Mark Otto
7f632ef5b4
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-05 00:03:24 -07:00
Jason Diamond
fb57eda268
use quotes to allow dots in data-parent
2013-08-04 23:59:57 -07:00
Jason Diamond
700e742a9c
failing test for dot in data-parent
2013-08-04 23:59:30 -07:00
Chris Rebert
88652f745f
Merge pull request #9087 from eratzlaff/3.0.0-wip
...
Update documentation on offset for small medium and large devices.
2013-08-04 23:45:03 -07:00
Mark Otto
a2823d0f5e
Fixes #9061 : Panel titles should inherit color when linked
2013-08-04 23:44:02 -07:00
Mark Otto
d95ff9da81
fixes #8805 : ensure .active buttons in button groups behave like :active buttons
2013-08-04 23:27:15 -07:00
Mark Otto
f62ea2afe2
fixes #8793 : remove padding-right from inputs with state changes
2013-08-04 23:20:55 -07:00
Elvis Ratzlaff
9c14fe6044
Update documentation on offset for small medium and large devices. "Grid options"
2013-08-05 02:19:14 -04:00
Mark Otto
222ea8cb71
Merge pull request #9081 from vsn4ik/rem_type_attr
...
Remove type attribute of tag "script".
2013-08-04 23:16:06 -07:00
Mark Otto
73c048578d
Enable input focus state customization
...
- Add new mixin to generate and customize focus state as needed
- Adds variable to set default color
- Include clear disclaimer about customizing this—it's about users', so
don't go making everything bright red and expect them not to be
confused or alarmed.
Relevant issues: #2742 , #4185 , #7942 , #8171 , #8610 , #9044
2013-08-04 23:05:54 -07:00
Mark Otto
2641fed73f
Fixes #8723 : allow modals to not need the .fade class /cc @fat
2013-08-04 22:30:09 -07:00
Mark Otto
5e637313b7
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-04 22:25:58 -07:00
Mark Otto
6bebecfb28
Merge pull request #9079 from liuyl/buttongroups
...
Fix #7108 : btn group styling
2013-08-04 22:16:41 -07:00
Mark Otto
300a9e7b5a
run grunt dist
2013-08-04 21:09:05 -07:00
vsn4ik
efc7514f9f
Remove type attribute of tag "script".
...
In HTML5 in tag script, the type attribute is no longer required. The default value is "text/javascript".
http://www.w3.org/TR/html5/scripting-1.html#attr-script-type
2013-08-05 05:40:25 +04:00
Chris Rebert
180034a4b4
tooltip.js: add missing space
2013-08-04 17:36:08 -07:00
liuyl
584759eac0
btngroups
2013-08-05 08:29:01 +08:00
fat
2b6ec38987
fixes #8880
2013-08-04 17:22:49 -07:00
fat
f22a077f6e
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-04 15:45:51 -07:00
fat
b1d21731ad
remove js anchor interference
2013-08-04 15:45:27 -07:00
Chris Rebert
b6390d298a
trivial docs grammar improvements
2013-08-04 00:06:56 -07:00
Chris Rebert
509ffe110e
Merge pull request #9059 from twbs/nested-btn-groups-docs
...
adjust description & give source for nested `.btn-group`s example
2013-08-03 23:45:08 -07:00
Chris Rebert
19e8342c7a
adjust description & give source for nested .btn-groups example
2013-08-03 23:34:27 -07:00
Chris Rebert
a84e07b272
components.html: rm disconnected sentence fragment
2013-08-03 23:23:40 -07:00
Chris Rebert
899c147cd5
streamline $().dropdown('toggle') description
2013-08-03 23:16:09 -07:00
Chris Rebert
eed4844fd2
JS docs: capitalize Bootstrap
2013-08-03 23:01:05 -07:00
Mark Otto
c45edbe6b5
Merge pull request #9056 from twbs/large-to-lg-etc
...
Greater standardization of sizing terminology
2013-08-03 22:44:44 -07:00
Chris Rebert
cabcd36019
add missing ref to .btn-xs in button sizes docs
2013-08-03 21:59:30 -07:00
Chris Rebert
b9c572184f
add .btn-xs to .btn-group example
2013-08-03 21:59:01 -07:00
Chris Rebert
7a04e95b71
rm stray space in components.html
2013-08-03 21:58:31 -07:00
Chris Rebert
23ef8c0c20
Greater standardization of sizing terminology
...
In class names:
* large => lg
* small => sm
* mini => xs ("Extra small")
In screen size categories:
* Tiny => Extra small
2013-08-03 21:39:57 -07:00
Mark Otto
30a01e0a33
Merge pull request #9052 from liuyl/inputgroups
...
fix #9051
2013-08-03 20:44:41 -07:00
liuyl
4bbbf774a4
add line-height
2013-08-04 09:27:23 +08:00
Mark Otto
4582eb704f
Merge pull request #9036 from eratzlaff/3.0.0-wip
...
Change value with variables for btn-large, btn-small and pagination
2013-08-03 16:50:08 -07:00
Mark Otto
5fb0d69ee2
Merge pull request #9050 from jonschlinkert/3.0.0-wip
...
organizes the Gruntfile a bit and makes better use of Grunt conventions
2013-08-03 16:25:12 -07:00
Jon Schlinkert
55df26ae20
This pull request organizes the Gruntfile, makes better use of Grunt conventions and placates my OCD.
...
Changes in the Gruntfile:
* Use two spaces for consistency with the rest of the codebase.
* Tasks are now organize based on task type. since lodash templates are used across tasks/targets, this makes it easier to follow.
* Use `src-dest` files format when only src-dest pairing is necessary. This saves a line over the files-object format, but more importantly it allows use the src or dest in lodash templates (e.g. `<%= concat.bootstrap.src %>`), which isn't possible in the files-object or files-array formats.
* Make the explicit order of the javascript files more obvious in concat task , maybe just a tiny bit more usable and easier to customize - but really just OCD
* Use `<%= pkg.name %>` variable for dest CSS, both for consistency with how javascript targets are defined, and to make it just little easier for devs to customize bootstrap.
ran the build to test, everything seems good.
2013-08-03 19:03:38 -04:00
Mark Otto
98b50abed3
Merge pull request #9045 from naneau/3.0.0-wip
...
using @line-height-computed in .navbar-nav link
2013-08-03 16:01:52 -07:00
Maurice Fonk
bf0f3c7c1c
using @line-height-computed in .navbar-nav link
...
When a user changed the @line-height-base/@line-height-computed var, the
nav-bar items would not scale appropriately.
2013-08-03 15:09:56 -04:00
James Holland
744b79a666
Update .navbar-toggle to match other navbar el
...
In place of commit #9040 , fix #8844
And sizing .navbar-toggle more like .btn elem
+ change `position:absolute` to `position:relative`
+ remove `right: 10px` in favor of `float:right`
+ change to `height: 34px`
+ remove `top:` in favor of `.navbar-vertical-align` basis new height
+ change `padding:` to match `.btn` el
2013-08-03 10:28:17 -04:00
Chris Rebert
fce2e89b7d
JS docs: put transitionEnd within <code>
2013-08-03 02:24:31 -07:00
Chris Rebert
364fdf7fa1
JavaScript docs: fix caps of "JS"
2013-08-03 02:22:55 -07:00
Chris Rebert
3a96ff9a0a
JS docs: fix caps of "CSS" acronym
2013-08-03 02:21:29 -07:00
Elvis Ratzlaff
e06b6ba7ba
Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip
2013-08-03 04:52:09 -04:00
Chris Rebert
5b66a1608e
Merge pull request #9037 from ChrisRiddell/horizontal-form-fix
...
Fix Horizontal form docs
2013-08-03 01:27:20 -07:00
ChrisRiddell
602e0c0ba0
fix Horizontal form docs
2013-08-03 17:48:15 +09:30
Elvis Ratzlaff
777ae911b6
Change value for padding on pagination to variables
2013-08-03 03:59:37 -04:00
Elvis Ratzlaff
2fd8689b08
Change line-height value with variable for btn-large and btn-small
2013-08-03 03:56:06 -04:00
Mark Otto
4bac2c567a
Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-02 20:19:20 -07:00
Mark Otto
05a8efccca
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into gh-pages
2013-08-02 20:01:32 -07:00
Mark Otto
a1c29c1e72
fixes #8950 by updating links to new repo
2013-08-02 20:01:21 -07:00
Mark Otto
a0c44329e3
Merge pull request #8939 from frabrunelle/3.0.0-wip
...
add nav to media object and thumbnails
2013-08-02 19:58:17 -07:00
Mark Otto
3581c99afd
update dist for v3
2013-08-02 19:47:01 -07:00
Mark Otto
5abdcb3e71
Merge branch '3.0.0-wip' into gh-pages
2013-08-02 19:45:57 -07:00
Mark Otto
a3be713f8f
Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-02 19:30:03 -07:00
Mark Otto
e8145ac939
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-02 19:05:49 -07:00
Mark Otto
b5dcbf5045
Merge pull request #8934 from twbs/generalize-horiz-form-example
...
use separate `form-group`s in horiz form example for greater generality
2013-08-02 18:59:06 -07:00
Mark Otto
9435991ff0
move form layouts from input groups back to forms (messed this up in b281ad6409)
2013-08-02 18:48:44 -07:00
Mark Otto
6b850132d0
Remove requirement of .list-group-flush when list groups are in panels
...
Fixes #8900
2013-08-02 17:57:19 -07:00
Mark Otto
0a7b185224
Merge pull request #36 from ggam/patch-1
...
Included required JavaScript in navbar-static-top
2013-08-02 17:17:28 -07:00
Chris Rebert
0fefbbe659
fix typo in comment
2013-08-02 16:36:54 -07:00
fat
f6cec812a6
fixes #8957
2013-08-02 15:13:12 -07:00
fat
e969d2ff18
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-02 15:10:47 -07:00
fat
69f9920132
fixes #8955
2013-08-02 15:10:14 -07:00
Mark Otto
173dac4e54
Tighten up buttons and form controls
...
* Smaller padding on buttons and large buttons
* Same with inputs and large inputs
* Remove about 10px from height of large inputs/buttons and 4px from
regular ones
Fixes #8707 and #8700 .
(Also relevant: #8711 )
2013-08-02 15:09:48 -07:00
Mark Otto
7cd54e52f2
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-02 14:08:58 -07:00
Mark Otto
d46e645a0f
fixes #9015 : bold links not semibold in alerts
2013-08-02 14:07:26 -07:00
Mark Otto
b86cac65b6
Merge pull request #9018 from adamwoodbeck/3.0.0-wip
...
Added ".col-sm-*" to the grid example per the description above the
2013-08-02 14:04:16 -07:00
Mark Otto
83eea13e63
Merge branch '3.0.0-wip-fixed-grid-push-pull-offset' of https://github.com/jtickle/fp-bootstrap into jtickle-3.0.0-wip-fixed-grid-push-pull-offset
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-02 13:58:06 -07:00
Adam Woodbeck
cfacd228eb
Added ".col-sm-*" to the grid example per the description above the
...
example.
2013-08-02 16:30:13 -04:00
Mark Otto
e23b7ec20e
Merge pull request #9017 from jonschlinkert/3.0.0-wip
...
updates mixins to consistently use semicolons as argument separator.
2013-08-02 12:48:39 -07:00
Jon Schlinkert
c017e19ed2
Resolves https://github.com/twbs/bootstrap/issues/9014 . updates mixins to consistently use semicolons as argument separator. Rebuild to confirm, no diff in compiled CSS.
2013-08-02 15:33:03 -04:00
Mark Otto
08ce3ef9e1
run grunt dist for #8967
2013-08-02 10:11:39 -07:00
Mark Otto
dfd6c23527
Merge pull request #8967 from bassjobsen/patch-2
...
Update input-groups.less
2013-08-02 10:11:06 -07:00
Mark Otto
e4b113934d
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-02 10:02:46 -07:00
Mark Otto
696e619fd9
Merge pull request #8979 from ggam/patch-6
...
Add dropdown class
2013-08-02 09:44:32 -07:00
Mark Otto
048e19b892
Fixes #8996 : shift placement of justified CSS for nav component
2013-08-02 09:42:50 -07:00
Mark Otto
34e5c7542b
whitespace in js file?
2013-08-02 09:33:12 -07:00
Mark Otto
d0b94ead9a
Fix #9008 : consolidate .alert-block styles into .alert
2013-08-02 09:32:58 -07:00
Mark Otto
21be3efad3
Merge pull request #9011 from Rycul/patch-1
...
Added short instruction for obtaining respond.js in example HTML code (see description).
2013-08-02 09:27:03 -07:00
Mark Otto
6467009572
Merge pull request #8980 from ggam/patch-7
...
Removed data-toggle class when it wasn't been applied
2013-08-02 09:26:19 -07:00
Bryan Keiren
f4b983ed11
Added short instruction for obtaining respond.js
...
The Getting-Started page only lists the actual instructions for respond.js (its purpose and source) *after* listing a piece of example HTML code for the user to copy and paste. It would probably be more clear if that piece of HTML code actually lists where the user can obtain respond.js. Otherwise the user has to scroll down and read 1 specific line on the rest of the page (under the 'IE 8 and 9' compatibility section), in order to know that respond.js can be obtained from a GitHub page (and that it is in fact NOT part of the downloadable Bootstrap file that's provided earlier on the page, even though the use of response.js in the example HTML code seems to suggest that it *is* part of the Bootstrap download).
It's a minor issue but this fix should make it just a little bit more clear to a user how the example HTML code works (lest they copy/paste it and find out the browser can't find respond.js).
2013-08-02 18:07:31 +02:00
Guillermo González de Agüero
ee6db98136
Included required JavaScript in navbar-static-top
2013-08-02 11:53:25 +02:00
Chris Rebert
9546fc9cf0
fix typo in CSS docs; fixes #8992
...
"from" => "form"
2013-08-01 17:05:23 -07:00
Guillermo González de Agüero
655e84c532
Removed data-toggle class when it wasn't been applied
2013-08-01 20:13:08 +02:00
Guillermo González de Agüero
824d5d5de4
Fix #8944
2013-08-01 20:07:34 +02:00
Chris Rebert
cbd0b7a505
Merge pull request #8965 from leonardovcid/patch-1
...
Correct comment which is showing a wrong mixin call example (mixins.less)
2013-08-01 09:33:09 -07:00
Jeff Tickle
1583dd55e9
Added classes for lg-pull, lg-push, lg-offset, sm-pull, sm-push, sm-offset
2013-08-01 12:16:20 -04:00
Bass Jobsen
a5641b0cca
Update input-groups.less
...
align inline radio and checkbox groups with their label for horizontal forms, see http://stackoverflow.com/q/17990310/1596547 (Question 2)
2013-08-01 16:05:07 +02:00
leonardovcid
15b98a0bb1
Correct comment which is showing a wrong mixin call example (mixins.less)
...
I was copy-pasting the example and it wasn't working. Then I found that the example in the comment was a typo.
Thanks
2013-08-01 14:39:28 +01:00
Jacob Thornton
7a3c61ee33
fixes #8892
2013-07-31 22:57:00 -07:00
Jacob Thornton
ccd4c9d7b5
fixes #8864
2013-07-31 22:28:05 -07:00
liuyl
56aedcb713
add table-layout
2013-08-01 11:26:12 +08:00
Francis Brunelle
521ff5c8a7
add nav to media object and thumbnails
2013-07-31 22:37:36 -04:00
Mark Otto
e9413315b5
fixes #8937 : align the dropdown menus in input groups
2013-07-31 18:06:20 -07:00
Mark Otto
3cdb07fab3
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-07-31 18:02:49 -07:00
Mark Otto
7e19b6b02c
add the theme file derp
2013-07-31 18:02:41 -07:00
Mark Otto
3c39bc0d96
start on navbar
2013-07-31 18:02:12 -07:00
Mark Otto
60e1f5e0e8
start with buttons
2013-07-31 17:48:22 -07:00
Mark Otto
4c27f3ce80
Run make on prev work
2013-07-31 17:07:55 -07:00
Mark Otto
afef74d03d
Updated homepage more
2013-07-31 17:05:06 -07:00
Chris Rebert
e660963689
use separate form-groups in horiz form example for greater generality; fixes #8925
2013-07-31 16:47:22 -07:00
Chris Rebert
f62fb27b04
Merge pull request #8911 from codejet/patch-1
...
title attr, not tag, in tooltip/popover docs
2013-07-31 12:18:09 -07:00
Oliver Schmidt
f5f171f0ed
Update javascript.html
2013-07-31 20:51:37 +02:00
Mark Otto
f43fa23ae0
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-07-31 10:27:52 -07:00
Mark Otto
29b36bf962
dat purple homepage-- http://www.youtube.com/watch?v=k2C5TjS2sh4
2013-07-31 10:27:43 -07:00
Mark Otto
d7d0f226f9
Merge pull request #8915 from diowa/whitespaces-tabs-etc
...
Removed trailing whitespaces and hard tabs
2013-07-31 10:24:20 -07:00
Mark Otto
ba05b7a63c
Merge pull request #8908 from bbeng89/3.0.0-wip
...
Small fix to justified button groups docs
2013-07-31 09:48:33 -07:00
Mark Otto
daed9378ca
Merge pull request #8899 from englishtown/twbs-pullrequest
...
Miss one 'div' close tag under components page
2013-07-31 09:44:27 -07:00
Cesidio Di Landa
3696530aaf
Removed trailing whitespaces
...
Changed hard tabs to soft tabs
2013-07-31 18:11:11 +02:00
Oliver Schmidt
034fb3bc87
Update javascript.html
2013-07-31 16:14:27 +02:00
Blake Bengtson
2433faa528
Small fix to justified button groups docs
2013-07-31 08:39:07 -05:00
faceach
a538c8dfb3
miss one 'div' close tag under components page
2013-07-31 18:57:39 +08:00
Chris Rebert
55e1fcef60
Merge pull request #8885 from mikefrancis/patch-1
...
Added attribute whitespace
2013-07-31 01:33:18 -07:00
Mike Francis
873f884327
Added attribute whitespace
2013-07-31 09:26:45 +01:00
Archan Luhar
b9f59428f9
Removed background color from #gradient mixins to support transparent gradients
2013-07-30 19:30:24 -07:00
Mark Otto
031ed98c8b
Merge pull request #22 from Dev-Ad/patch-1
...
.navbar-wrapper need higher z-index to be on top of the carousel
2013-07-30 17:43:55 -07:00
Mark Otto
2a4aacc037
Merge pull request #9 from ssorallen/carousel-img-height-js-path
...
Carousel image height and JS path
2013-07-30 17:43:39 -07:00
Mark Otto
26053b94e5
Merge pull request #7 from sprice/update_scripts
...
Update scripts
2013-07-30 17:43:18 -07:00
Mark Otto
1edaabb250
Merge pull request #18 from p8952/local-jquery
...
use the local copy of jquery
2013-07-30 17:42:46 -07:00
Mark Otto
aa90811fb0
Merge pull request #13 from hph/master
...
Fix relative links to examples and links to docs
2013-07-30 17:42:33 -07:00
Mark Otto
a9830a0bab
Merge pull request #10 from ssorallen/sigin-input-block
...
Replace 'input-block-level' with 'form-control'
2013-07-30 17:42:10 -07:00
Mark Otto
6c2db4bbbe
Merge pull request #16 from ssorallen/starter-template-js
...
Add jQuery + Bootstrap JS to starter template
2013-07-30 17:41:57 -07:00
Mark Otto
4a060881d7
Merge pull request #11 from ssorallen/jumbotron-js-inputs
...
Jumbotron JS + "form-control"
2013-07-30 17:41:43 -07:00
Mark Otto
0f23f514ab
Merge pull request #24 from ssorallen/sticky-footer-js
...
Sticky footer example JS and navbar dropdown style
2013-07-30 17:37:21 -07:00
Mark Otto
46a424fc93
edit modal docs code to fix #8769
2013-07-30 15:14:38 -07:00
Mark Otto
e6ac348bfc
Merge pull request #8726 from andreypopp/3.0.0-wip
...
Fix out of order variable declaration order
2013-07-30 14:14:51 -07:00
Mark Otto
96eef43dee
Merge pull request #8852 from briannelsondesign/label_baselines
...
Adjusts vertical alignment of labels and badges
2013-07-30 14:07:00 -07:00
fat
fc8f4f0465
fixes #8216
2013-07-30 13:41:24 -07:00
fat
c54b8adb85
fixes #8814
2013-07-30 13:33:56 -07:00
fat
5ee2a221ca
fixes #8816
2013-07-30 13:31:57 -07:00
Chris Rebert
da98c5c2c3
trivial spacing fix
2013-07-30 12:35:39 -07:00
Mark Otto
c5d3e1421f
updated v3 wip dist zip--holy crap that's a messed up commit message
2013-07-30 11:11:16 -07:00
Mark Otto
0d30dabade
Merge branch '3.0.0-wip' into gh-pages
2013-07-30 11:08:08 -07:00
Ross Allen
ad01dd8ce8
Use correct class for header in jumbotron dropdown nav
2013-07-30 10:33:48 -07:00
Ross Allen
6a8f76f020
Enable dropdown in sticky-footer with Bootstrap JS
...
The sticky-footer example uses a drop down in its navbar, and dropdowns
require Bootstrap's JS to work.
Use the minified version of Bootstrap since this example is about the
CSS and not about the JS.
2013-07-30 10:10:34 -07:00
Ross Allen
934cf4f683
Use correct dropdown header class in sticky-footer
...
"nav-header" does not exist in Bootstrap. The class used for headers
in dropdowns is "dropdown-header".
2013-07-30 10:09:30 -07:00
Mark Otto
d9266f95c4
Merge pull request #8846 from ggam/patch-5
...
Fix grid sizes documentation
2013-07-30 09:40:01 -07:00
Brian Nelson
dcbf1e51c4
Compiles changes to CSS
2013-07-30 11:35:13 -04:00
Brian Nelson
220fee80bf
Improves label and badge alignment so text aligns with baseline
2013-07-30 11:23:25 -04:00
Guillermo González de Agüero
3d54fe180c
Fix #8658
2013-07-30 16:34:13 +02:00
Gerhard
a9144b50ea
.navbar-wrapper need higher z-index to be on top of the carousel
2013-07-30 16:23:34 +02:00
Chris Rebert
5ef1fe160e
Merge pull request #8821 from twbs/twbs-license-faq-tweak
...
tweak part of license FAQ to reflect Twitter->twbs change
2013-07-29 22:11:37 -07:00
Chris Rebert
652f056556
tweak part of license FAQ to reflect Twitter->twbs change
2013-07-29 22:10:53 -07:00
liuyl
7cfcfdfe64
make navbar-text float left
2013-07-30 09:30:21 +08:00
Mark Otto
8b5e41d900
Refactor .input-* sizing a bit by not chaining to .form-control ( fixes #8672 )
2013-07-29 17:30:36 -07:00
Mark Otto
09edfcf8c2
fixes #8670 : move list group bg color to individual items for mo betta rendering
2013-07-29 17:23:08 -07:00
Mark Otto
87c98478d2
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-07-29 17:21:31 -07:00
Mark Otto
ddafa9a0bb
Attempts to fix #8645 : add code comments to grid example to clarify behavior
2013-07-29 17:21:22 -07:00
Chris Rebert
7ae32074a0
Remove hack/workaround for jshint/grunt bug that's now fixed
...
See https://github.com/gruntjs/grunt-contrib-jshint/issues/86
2013-07-29 17:17:52 -07:00
Mark Otto
fa854a58bd
Merge pull request #8818 from twbs/firefox-input-btn-docs-note
...
make it clearer than <input> buttons are slightly broken on Firefox
2013-07-29 17:16:02 -07:00
Mark Otto
5716355cda
Restore mini button ( fixes #8644 )
2013-07-29 17:08:04 -07:00
Mark Otto
2dcfa00e56
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-07-29 17:03:40 -07:00
Mark Otto
09fff764ed
fixes #8687 : correct docs typo on radio inputs
2013-07-29 17:03:00 -07:00
Chris Rebert
dfd10efd80
make it clearer than <input> buttons are slightly broken on Firefox
2013-07-29 16:57:30 -07:00
Andrey Popp
e0395b425d
reorder nav-justified classes
2013-07-30 03:27:32 +04:00
Mark Otto
d9c9afa6d1
add focus to button group active button behavior
2013-07-29 14:53:55 -07:00
Chris Rebert
1e0c0b8f94
Add .fade to div.modal in "Live demo" modal example code; fixes #8723
2013-07-29 13:26:00 -07:00
Peter Wilmott
c2b7e2ca27
use the local copy of jquery
2013-07-29 21:23:19 +01:00
Mark Otto
d08d9a63c3
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-07-29 12:29:22 -07:00
Mark Otto
7b42b8b0fe
fixes #8797 : only expand submenu docs links at >768px
2013-07-29 12:28:54 -07:00
Mark Otto
a954f04a02
Merge pull request #8800 from brenocalazans/3.0.0-wip
...
Update bower.json
2013-07-29 12:25:57 -07:00
Breno Calazans
47a56f5451
Update bower.json
2013-07-29 16:11:28 -03:00
Chris Rebert
db051288c5
Merge pull request #8791 from acmetech/3.0.0-wip
...
Update the code example for <select> multiple
2013-07-29 11:34:13 -07:00
Ross Allen
07dd62ed7c
Add jQuery + Bootstrap JS to starter template
...
The starter template uses the Collapse component[1], which requires
Bootstrap's JavaScript.
Fixes #15
[1] http://twitter.github.io/bootstrap/javascript/#collapse
2013-07-29 11:24:40 -07:00
Jacob
9c2ae98a4e
Merge pull request #8774 from liuyl/transition
...
fix transition end
2013-07-29 11:23:29 -07:00
Chris Rebert
33a61baf38
fix the download link to 3.0.0-wip
2013-07-29 11:20:41 -07:00
Tom Pietschker
13406c240a
update code example for <select> multiple
2013-07-29 14:15:17 -04:00
Mark Otto
2acb0f40c0
Merge pull request #8718 from ggam/patch-4
...
Deleted unnecessary ID from modals example
2013-07-29 10:00:35 -07:00
Mark Otto
0bf5443ad7
Merge pull request #8717 from ggam/patch-3
...
Deleted "show-grid" class from examples
2013-07-29 10:00:10 -07:00
Mark Otto
08cd3072fc
Merge pull request #8747 from liuyl/buttons
...
disable user-select for buttons
2013-07-29 09:58:54 -07:00
Mark Otto
6c44246dc9
fix broken focus state on download button ( fixes #8782 )
2013-07-29 09:42:50 -07:00
liuyl
270316f140
fix transition end
2013-07-29 20:23:01 +08:00
Chris Rebert
b1a1210f07
fix #8694 : apply tooltip demo ordering change from #8730 to popovers too
2013-07-29 03:35:45 -07:00
Chris Rebert
be0974802d
update composer.json to reflect org change
2013-07-29 00:21:18 -07:00
Chris Rebert
3a50ce3596
fix #8745 : fix html5shiv & respond.js script links in docs
2013-07-28 23:13:43 -07:00
liuyl
e77d134481
buttons
2013-07-29 14:09:41 +08:00
Mark Otto
f3cff49d6d
Merge pull request #8738 from twbs/clarify-width-vs-height-size-classes
...
form input docs: clarify height-related vs. width-related classes
2013-07-28 22:29:05 -07:00
Chris Rebert
061535019c
avoid ambiguous term "relative sizing"; clarify width vs. height control classes
2013-07-28 22:24:49 -07:00
Jacob Thornton
8eb42d9b20
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-28 22:23:56 -07:00
Jacob Thornton
edaeb33816
fixed #8715
2013-07-28 22:23:20 -07:00
Mark Otto
eb56f7e4f4
Merge pull request #8737 from twbs/docs-html5-style-select-multiple
...
CSS docs page: Use simpler HTML5 style for `multiple` <select> attribute
2013-07-28 22:22:10 -07:00
Mark Otto
e74a25a3b8
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-07-28 22:21:27 -07:00
Mark Otto
774f173a18
expand grid system options table to include column widths, gutter widths, large desktop media query, and container widths ( fixes #8733 )
2013-07-28 22:21:16 -07:00
Chris Rebert
70bd9b936f
CSS docs page: Use simpler HTML5 style for multiple boolean attribute of <select>
2013-07-28 22:17:08 -07:00
Jacob Thornton
a31c5cea42
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-28 22:16:17 -07:00
Jacob Thornton
e5a7af36d5
fixes #8703
2013-07-28 22:14:43 -07:00
Chris Rebert
c9c2418a47
Merge pull request #8736 from twbs/css-docs-code
...
CSS docs page: apply <code> in a few places
2013-07-28 22:14:24 -07:00
Chris Rebert
7bcee1acd2
apply <code> in a few places
2013-07-28 22:09:01 -07:00
Chris Rebert
4ebb29e5bd
Merge pull request #8735 from twbs/docs-edits
...
minor CSS docs edits
2013-07-28 22:07:46 -07:00
Chris Rebert
d0a2a62cd7
expand out IE for consistency w/ the rest of the page
2013-07-28 22:04:38 -07:00
Chris Rebert
e9b1422e86
add commas in a couple places
2013-07-28 22:04:21 -07:00
Mark Otto
bcc6fe5b2b
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-07-28 22:00:55 -07:00
Mark Otto
b0225c073a
add responsive images section to docs ( fixes #8734 )
2013-07-28 22:00:49 -07:00
Mark Otto
af90282858
Merge pull request #8730 from eluttner/3.0.0-wip
...
Javascript - tooltips directions - easier visualization
2013-07-28 21:50:06 -07:00
Chris Rebert
59ad7a9cf4
docs.css: Remove border-color that's missing a value
...
/cc @mdo to fix this properly later
/cc @rcotrina94 from e1bb94c383
2013-07-28 20:53:59 -07:00
Nicholas Westlake
8858ef4dae
Format multiple badges in list-group-item
2013-07-28 21:25:16 -05:00
eduardo luttner
6652e2684d
Javascript - tooltips directions - easier visualization
...
Changed the order of the visualization. It is not the css order, however it is easier to see the tooltips
2013-07-28 22:46:16 -03:00
Andrey Popp
0d7940d950
get rid of out of order variable declaration
2013-07-29 03:04:12 +04:00
Guillermo González de Agüero
7dba45bae7
Deleted unnecessary ID from modals example
2013-07-28 19:46:15 +02:00
Guillermo González de Agüero
c649a04286
Deleted "show-grid" class from examples
2013-07-28 19:40:50 +02:00
Mark Otto
e1180daca0
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-07-28 09:42:56 -07:00
Mark Otto
67e89ea2bf
Merge pull request #8712 from claydiffrient/3.0.0-wip
...
Fix wording in 'hidden on...' to be in line with 3.0 wording.
2013-07-28 09:38:12 -07:00
Mark Otto
111dc1492f
fixes #8714 : correct stacked pills nav
2013-07-28 09:37:10 -07:00
Haukur Páll Hallvarðsson
582787342e
Fix relative links to examples and links to docs
2013-07-28 15:37:53 +00:00
Clay Diffrient
98a24cbd25
Fix wording in 'hidden on...' to be in line with 3.0 wording.
2013-07-28 08:57:10 -06:00
syed
1aedb7862c
move things around
...
Moved alerts, badges, button groups, buttons, carousel, close to
variables.less and customize.html
2013-07-28 17:32:08 +05:00
Chris Rebert
c947ab1c9a
fix #8701 : IE 10+ supports <fieldset disabled>
...
*golf clap*
2013-07-28 03:48:40 -07:00
Chris Rebert
89746174b7
Safari handles <fieldset disabled> just fine; fixes #8698
...
This makes me wonder whether recent IE might actually support this too.
If not, your move IE Team.
2013-07-28 02:05:38 -07:00
Mark Otto
2e9ca57781
Merge branch '3.0.0-wip' into gh-pages
2013-07-28 00:09:05 -07:00
Mark Otto
b9ff423443
derp, no s on that url
2013-07-28 00:08:55 -07:00
Mark Otto
f319ec1f2a
add new zip
2013-07-28 00:04:09 -07:00
Mark Otto
92bd778f45
Merge branch '3.0.0-wip' into gh-pages
2013-07-28 00:03:33 -07:00
Mark Otto
c6aedfb877
point to different download urls
2013-07-28 00:03:24 -07:00
Mark Otto
841711f2f6
Merge branch '3.0.0-wip' into gh-pages
2013-07-27 23:53:23 -07:00
Mark Otto
4f793752c5
temporarily undo @fat's scrollspy enhancement since it fucks firefox and ie
2013-07-27 23:53:09 -07:00
Mark Otto
939c9590e5
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-07-27 23:45:11 -07:00
Mark Otto
3d06ee3fa8
restore 2.3.2 zip
2013-07-27 23:40:39 -07:00
Chris Rebert
908f4c342b
Merge pull request #8696 from twbs/jshintrc
...
get jshint close to passing by updating .jshintrc settings
2013-07-27 23:12:00 -07:00
liuyl
efac0bf8d6
make pull-right !important
2013-07-28 14:05:47 +08:00
Chris Rebert
9c672c6b20
get jshint close to passing by updating .jshintrc settings
...
I don't agree with these personally, but they jive with BS/@fat's JS code style.
The remaining jshint complaints are things that really actually should get fixed.
2013-07-27 21:56:44 -07:00
Chris Rebert
c25bf6ba46
Merge pull request #8695 from twbs/fix-grunt-jshint
...
Fix grunt jshint
2013-07-27 21:43:27 -07:00
Chris Rebert
03b2866b9e
tweak Gruntfile.js so it passes jshint
2013-07-27 21:39:11 -07:00
Chris Rebert
ba62cfeffe
workaround possible bug in grunt-contrib-jshint
2013-07-27 21:38:59 -07:00
Chris Rebert
880f43221d
tweak Gruntfile.js so it passes jshint
2013-07-27 21:33:41 -07:00
Chris Rebert
8a430b3698
workaround possible bug in grunt-contrib-jshint
2013-07-27 21:33:11 -07:00
Ross Allen
d149f651f2
Add Bootstrap JS to make collapsible nav work
...
This example uses the collapsible nav for smaller screen sizes, and it
requires Bootstrap JS to get that functionality.
2013-07-27 20:40:24 -07:00
Ross Allen
cee5f6fbdf
Add new 'form-control' class to style header inputs
2013-07-27 20:39:24 -07:00
Ross Allen
1a1bc33406
Replace 'input-block-level' with 'form-control'
...
'input-block-level' was replaced with 'form-control' in v3. To get
block-level inputs, the 'form-control' class is now needed.
2013-07-27 20:24:28 -07:00
Ross Allen
ce1fdc5ded
Update carousel example JS path
...
'bootstrap.min.js' lives in '../bootstrap/js' now. Switch to the
minified version for a smaller download since this example is focused
on CSS changes, not JavaScript ones.
2013-07-27 20:17:53 -07:00
Ross Allen
c834b4027c
Match .carousel-inner specificity to beat styles
...
'.carousel ing' was replaced with '.carousel-inner > .item > img' in
3.0 and now loses the specificity war. To make carousel images 500px
tall, match specificity to make carousel.css win.
2013-07-27 20:14:49 -07:00
Mark Otto
7b6f85c179
Remove back to top link from docs
2013-07-27 19:50:33 -07:00
Mark Otto
ce57378705
fixes #8665 : have modals use auto margin on sides and widen it instead of positioning and negative margin
2013-07-27 19:38:05 -07:00
Mark Otto
5aad25b34b
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-07-27 18:56:52 -07:00
Mark Otto
b281ad6409
Input groups overhaul
...
* Moves input groups CSS into separate file
* Moves input groups docs into the Components page
* Add support for radios and checkboxes in input groups to fix #8679
2013-07-27 18:56:31 -07:00
Chris Rebert
2f39259d9b
Merge pull request #8685 from jouve/3.0.0-wip
...
fix README.md
2013-07-27 18:13:54 -07:00
Cyril Jouve
b4f5687c05
fix README.md
2013-07-28 02:52:39 +02:00
Mark Otto
e953c23019
fixes #8659 : remove lingering .nav-header
2013-07-27 16:51:04 -07:00
Mark Otto
8cb1b766f8
fixes #8642 : use .pull-right to keep dropdowns aligned in example
2013-07-27 16:41:02 -07:00
Mark Otto
14f688c7fc
fixes #8675 : align horizontal form label and input
2013-07-27 16:37:45 -07:00
Mark Otto
51515e6791
Merge pull request #8676 from sprice/update-editorconfig
...
Remove Makefile section from .editorconfig
2013-07-27 14:56:29 -07:00
Shawn Price
d8b477f273
Use local copy of jquery instead of hotlinking
2013-07-27 14:30:38 -07:00
Shawn Price
dfa71726a9
Fix path to bootstrap javascript
2013-07-27 14:28:13 -07:00
Shawn Price
d14c72f334
Remove Makefile section from .editorconfig
2013-07-27 14:04:46 -07:00
Mark Otto
57bc65f7f8
Merge pull request #8650 from loic/3.0.0-wip
...
Fixed minor typos in css.html
2013-07-27 11:26:28 -07:00
Mark Otto
1fb1c40aba
Merge pull request #8657 from Micronax/3.0.0-wip
...
Added rel="stylesheet" to CDN-Examples
2013-07-27 11:25:17 -07:00
Mark Otto
1ca5c2bdb9
Merge pull request #8663 from mekishizufu/fix-typo
...
Fix typo in css.html
2013-07-27 11:24:32 -07:00
Loic Bistuer
273a388995
Fixed minor typos in javascript.html
2013-07-28 00:57:12 +07:00
Jiri Pospisil
f670282b40
Fix typo in css.html
2013-07-27 18:40:35 +02:00
Fabian Golle
9eef7e0b1d
Update getting-started.html
2013-07-27 17:30:44 +02:00
Loic Bistuer
7f6c089e45
Fixed minor typos in css.html
2013-07-27 19:27:45 +07:00
Mark Otto
2572f6fcd7
Merge branch '3.0.0-wip' into gh-pages
2013-07-27 01:09:35 -07:00
Mark Otto
866353ea4f
Merge branch '3.0.0-wip' into gh-pages
2013-07-27 00:47:18 -07:00
Mark Otto
8c7b0785f4
restore ads
2013-07-27 00:43:20 -07:00
Mark Otto
05ed37fbeb
Merge branch '3.0.0-wip' into gh-pages
2013-07-27 00:35:38 -07:00
Mark Otto
2e9d3a69fd
Merge branch '3.0.0-wip' into gh-pages
2013-07-27 00:28:39 -07:00
Mark Otto
77cfe6f4b2
Merge branch '3.0.0-wip' into gh-pages
2013-07-27 00:18:27 -07:00
Mark Otto
dde6c2ae45
adding 2.3.2 dir
2013-07-26 23:55:46 -07:00
Mark Otto
2998929b39
fix up carousel holder and navbar probs
2013-07-26 20:48:10 -07:00
Mark Otto
c3e6626411
Merge branch 'example-named-files'
...
Conflicts:
.gitignore
2013-07-26 20:43:22 -07:00
Mark Otto
9c13af8cb1
massive update, including new index page
2013-07-26 20:42:47 -07:00
Mark Otto
4b849e5fd7
Merge branch 'master' of github.com:twbs/bootstrap-examples
2013-07-26 20:26:53 -07:00
Nicole
6d269c2ed7
add git ignore
2013-07-20 23:30:08 -07:00
Nicole
bf51e24700
change file names to example names
2013-07-20 23:17:01 -07:00
Mark Otto
36c2a34c1e
Merge pull request #2 from ssorallen/master
...
Let .navbar-wrapper flow in Carousel example
2013-07-18 15:41:11 -07:00
Ross Allen
1a2ef331fd
Let .navbar-wrapper flow in Carousel example
...
A .navbar-wrapper followed by a .carousel works well in this example,
but when the navbar is not followed by a carousel, content flows
underneath the navbar because it is absolutely positioned.
Letting .navbar-wrapper be part of the flow and moving the negative
margin to the .carousel to bring it underneath the navbar makes these
example styles suitable for pages without carousels.
2013-07-18 14:57:27 -07:00
Mark Otto
838bc93724
Merge branch 'master' of github.com:twbs/bootstrap-examples
2013-06-23 20:34:38 -07:00
Mark Otto
0dffb03c0b
add gitignore and editorconfig
2013-06-23 20:33:37 -07:00
Nicole
0a1c46a12c
Merge branch 'master' of https://github.com/twbs/bootstrap-examples
2013-06-23 17:17:20 -07:00
Nicole
8e50e7a8f2
Update remaining templates to match starter template
2013-06-23 17:17:08 -07:00
Mark Otto
eec86051a4
move readme to root
2013-06-23 13:21:40 -07:00
Mark Otto
471c409a12
Add basic readme
2013-06-22 18:29:13 -07:00
Mark Otto
5226490115
Create CNAME
2013-06-22 16:35:58 -06:00
Mark Otto
14273cd53d
add example screenshots dir
2013-06-19 23:17:17 -07:00
Mark Otto
a550ea5113
minify latest bs3
2013-06-19 23:16:34 -07:00
Mark Otto
f91559d85d
update starter template to use new format; include latest BS3 CSS
2013-06-19 23:16:00 -07:00
Mark Otto
9f73fef30a
Offcanvas example update
...
* Remove plugin file and put JS inline
* Update grid layout to use tablet columns
* Switch from LESS to CSS for transition
* Pad footer sides for better mobile rendering
* Spacing cleanup
2013-06-19 20:31:03 -07:00
Mark Otto
84b6847c75
Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumbitta-offcanvas-example
2013-06-19 19:13:38 -07:00
Mark Otto
993efebe4f
Redo grid documentation
...
* Update example sections to include basic, mobile-desktop, and mobile-tablet-desktop implementations
* Add more examples to the grid example page
* Red columns instead of gray for more Bootstrapy aesthetic
2013-06-09 23:43:43 -07:00
Mark Otto
37cd7b8596
nuke the .col
2013-06-03 21:57:51 -07:00
Robert Burns
afe0ab13dd
Fix navbar toggles
2013-06-02 17:51:36 -04:00
Mark Otto
9ecde4aab7
Better grid template; link color change in docs navbar
2013-05-16 22:11:31 -07:00
Mark Otto
551d729083
More row change ups:
...
* No more negative side margins
* However, keep the negative margin for nested rows
2013-05-16 21:03:56 -07:00
Robert Burns
4910e779ab
Fix buttons within examples
2013-05-12 22:04:22 -04:00
Robert Burns
71377771fe
Fix form in navbar
2013-05-09 07:21:22 -04:00
William Ghelfi
94c067e76f
Merge branch 'offcanvas-example' of github.com:trumbitta/bootstrap into offcanvas-example
2013-05-08 14:26:55 +02:00
William Ghelfi
5e033dcc20
add offcanvas layout example based on bradfrost/this-is-responsive
2013-05-08 14:25:37 +02:00
William Ghelfi
18be5f6d42
add offcanvas layout example based on bradfrost/this-is-responsive
2013-05-06 15:58:18 +02:00
Mark Otto
17713a6d39
correct right nav in navbar examples
2013-05-04 15:00:59 -07:00
Mark Otto
a0d02368a3
Update justified nav CSS for proper selectors
2013-05-03 15:18:27 -07:00
Mark Otto
1bce9b295d
Merge pull request #7769 from holic/3.0.0-sticky-footer
...
Use padding instead of #push with box-sizing: border-box
2013-05-03 14:29:11 -07:00
Kevin Ingersoll
a0aaa222a6
Use padding instead of #push with box-sizing: border-box
2013-05-03 15:23:10 +12:00
Seth Lilly
c8daf15985
Corrected typo in carousel.html
...
Changed text from "First featurette headling" to "First featurette heading" in the first `h2.featurette-heading` tag.
2013-05-02 14:03:54 -03:00
Robert Burns
f76c222089
Update examples after grid changes
2013-04-28 22:22:33 -04:00
Robert Burns
7f0f731d6d
Update examples after overhaul of navbar navs
2013-04-28 09:10:01 -04:00
Mark Otto
b78dfb5a4c
refactor some of the carousel caption stuff to center it and tighten styles up; update carousel template to start to redo mobile first
2013-04-02 16:17:04 -07:00
Fabien
8093426e40
Improve responsiveness for tablet and below of navbar in carousel example
...
- Remove margin-top of navbar-wrapper
- Remove border radius of navbar
- Space out the carousel
2013-04-02 13:39:04 +02:00
Fabien
6e6820b388
Replace png img by holder.js in carousel example
2013-04-02 13:30:13 +02:00
Fabien
fb94710d9a
Fix corss link for sticky footer
2013-04-02 13:26:35 +02:00
Fabien
ed54b6dcf7
Fix link to navbar doc
2013-04-02 13:22:31 +02:00
Mark Otto
8454d07372
Merge branch '3.0.0-wip-carousel' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-carousel
2013-04-01 13:17:31 -07:00
Mark Otto
a1d64950a9
only negative indent nested grid rows; add new grid example
2013-04-01 12:55:48 -07:00
Robert Burns
7991062f93
Additional cleanup to responsive navbar
2013-04-01 12:58:40 -04:00
Robert Burns
994e36806c
Add carousel indicators to example
2013-04-01 09:29:43 -04:00
Robert Burns
ff363323e6
Update carousel-caption btn styles
2013-04-01 09:27:49 -04:00
Robert Burns
ccb9ecfe44
Fix image paths and carousel controls for carousel example
2013-03-31 21:47:02 -04:00
Mark Otto
4df128264b
add some container padding for examples
2013-03-31 11:24:31 -07:00
Mark Otto
85cd847e47
actually readd the padding and set it to smaller amount for narrow viewports
2013-03-30 22:54:31 -07:00
Mark Otto
f8d78eba5c
remove padding form sign in form example
2013-03-30 22:53:35 -07:00
Mark Otto
9a0ee742f6
drop .muted for .text-muted
2013-03-30 00:11:38 -07:00
Mark Otto
2d47cb699e
Remove grid example; update grid classes in examples
2013-03-26 17:17:39 -07:00
Mark Otto
64946ce93b
remove .navbar-inner from starter template
2013-03-26 12:31:03 -07:00
Mark Otto
37ba2824bf
Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0.0-wip
...
Conflicts:
less/tests/navbar-fixed-top.html
less/tests/navbar-static-top.html
less/tests/navbar.html
2013-03-26 12:28:00 -07:00
mo
597d9e8965
Fixed the navbar toggle in example templates by changing all the ".btn .btn-navbar" to ".navbar-toggle"
2013-03-25 18:13:13 -07:00
mo
110c5b70a1
Fixed all the .brand in navbar to .navbar-brand
2013-03-25 17:46:44 -07:00
Mark Otto
044b094b22
nuke remaining less/tests/ files and move grid over to examples dir
2013-02-26 00:49:21 -08:00
Mark Otto
61174c3c1d
moved examples added
2013-02-26 00:42:24 -08:00
Mark Otto
42488cbb45
more narrow jumbotron example fixes in the mobile first arena
2013-02-17 19:04:38 -08:00
Mark Otto
9f279c6077
Refactor some common classes from docs css and examples, then prevent examples from using docs.css
2013-02-17 18:58:40 -08:00
Mark Otto
c65063271a
revamp narrow jumbotron to avoid conflicts with docs .masthead
2013-02-17 18:48:00 -08:00
Mark Otto
34ca3d645a
Nuke the fluid example since it's no longer applicable
2013-02-16 01:43:23 -08:00
Mark Otto
c4b2bb5bcd
fix spelling as pointed out by @jodytate that got nuked in the merge
2013-02-14 23:51:35 -08:00
Mark Otto
87a317f42f
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
docs/examples/sticky-footer-navbar.html
docs/examples/sticky-footer.html
2013-02-14 23:44:50 -08:00
Mark Otto
0765ea43dd
Make example pages use Jekyll; add sticky footer navbar image to examples
2013-02-14 23:38:00 -08:00
jody tate
b9291929bf
Update docs/examples/sticky-footer.html
...
again, "it's" to "its" for grammar fun!
2013-02-14 13:30:22 -08:00
jody tate
83f55eab5b
Update docs/examples/sticky-footer-navbar.html
...
contraction "it's" to possessive "its", aka pedantic grammar fix
2013-02-14 13:26:52 -08:00
Mark Otto
407e935c9c
rearrange jekyll and docs
2013-02-12 12:44:41 -08:00
Mark Otto
eb02887bc3
nuke what we don't need for jekyll
2013-02-12 12:25:05 -08:00
Mark Otto
3db1b902c8
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/examples/hero.html
less/buttons.less
less/carousel.less
less/close.less
less/dropdowns.less
less/labels-badges.less
less/mixins.less
less/navbar.less
less/navs.less
less/pagination.less
less/responsive-navbar.less
less/scaffolding.less
less/sprites.less
less/thumbnails.less
less/type.less
2013-02-05 19:53:44 -08:00
Mark Otto
0a8d834af6
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
2013-02-05 19:39:49 -08:00
Mark Otto
e4aa1fcef4
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/examples/hero.html
docs/examples/sticky-footer-navbar.html
2013-02-01 10:34:25 -08:00
Mark Otto
cc58a65fa1
Use button element instead of a for responsive navbar buttons
2013-02-01 10:33:36 -08:00
Mark Otto
ce497ae730
start to refactor justified nav example
2013-02-01 10:32:08 -08:00
Mark Otto
b1088a2d49
button element instead of href-less a tag for navbar button
2013-02-01 10:30:48 -08:00
Mark Otto
7c55cf0660
Refactor jumbotron-narrow.html example
...
* Make it mobile-first
* Add a handful of comments to explain CSS
* Instead of an <hr> between custom header and jumbotron, use border for a tighter mobile layout
2013-01-31 18:34:12 -08:00
Mark Otto
c3fefca1be
Rename marketing-narrow to jumbotron-narrow for mo betta naming schemes
2013-01-31 18:25:44 -08:00
Mark Otto
c16aee941f
Refactor jumbotron example:
...
* Add hella CSS comments
* Reduce padding on body to height of navbar, then set top margin on jumbotron at +768px
* Wrap marketing copy and footer in an extra div so we can set some padding for ideal responsive views
2013-01-31 18:22:47 -08:00
Mark Otto
bd265daa82
Update starter template to include left/right padding on inner container; also include body padding
2013-01-31 18:06:56 -08:00
Mark Otto
5762b67a9f
remove .navbar-inner from sticky footer navbar
2013-01-19 09:40:26 -08:00
Mark Otto
57a66ee7cd
mo betta links between sticky footer examples
2013-01-19 09:39:56 -08:00
Mark Otto
4e938ff018
update sticky footer templates
2013-01-19 09:34:08 -08:00
Mark Otto
e405a22301
unified and simplified sign in form example
2013-01-18 01:52:16 -08:00
Mark Otto
07543a9403
cleanup more examples
2013-01-18 01:37:31 -08:00
Mark Otto
a4ad96b848
mo betta justified nav
2013-01-18 01:33:55 -08:00
Mark Otto
8713fa1edf
overhaul justified nav example
2013-01-17 21:05:23 -08:00
Mark Otto
70fca06f25
Remove docs and prettify css from examples thus far; update narrow page
2013-01-17 20:39:38 -08:00
Mark Otto
56f8b735a5
fix up jumbotron example
2013-01-17 20:35:59 -08:00
Mark Otto
0f1af68e69
Rename hero.html to jumbotron.html
2013-01-17 20:32:07 -08:00
Mark Otto
0050688fec
finish updating starter template
2013-01-17 20:30:19 -08:00
Mark Otto
dd58217712
comment tweaks and updating starter template
2013-01-17 20:28:05 -08:00
Mark Otto
68475f8707
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/css.html
docs/customize.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
less/navbar.less
2013-01-17 20:23:33 -08:00
Mark Otto
0f9073c5cd
Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing
2013-01-14 00:11:55 -08:00
Mark Otto
cecabeadec
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json
2013-01-13 04:26:52 -08:00
Mark Otto
d034ec74c4
fix username navbar text in fluid example for responsive variations
2013-01-12 00:20:13 -08:00
Mark Otto
07a5563a0b
Comment fix
2013-01-11 20:30:56 -08:00
Mark Otto
99649aad71
Remove navbar links from sticky footer navbar example
2013-01-11 11:00:45 -08:00
Mark Otto
98b0d4946f
Merge branch 'wilfra-patch-2' into 2.3.0-wip
2013-01-11 10:58:17 -08:00
William Franceschine
e7a13a9416
Update docs/examples/marketing-narrow.html
...
Updated copyright to 2013
2013-01-10 02:14:14 -08:00
William Franceschine
d05006349e
Update docs/examples/marketing-alternate.html
...
Updated copyright to 2013
2013-01-10 02:13:57 -08:00
William Franceschine
82eeba11b1
Update docs/examples/hero.html
...
Updated copyright to 2013
2013-01-10 02:13:43 -08:00
William Franceschine
69cc97dd34
Update docs/examples/carousel.html
...
Updated copyright to 2013
2013-01-10 02:13:26 -08:00
William Franceschine
ebd17141e8
Update docs/examples/fluid.html
...
Updated copyright to 2013
2013-01-10 02:10:52 -08:00
Mark Otto
a2854c8307
Merge branch 'Justin-John-master' into 2.3.0-wip
2013-01-09 21:35:50 -08:00
Mark Otto
ee9cd0180d
add sticky footer with navbar
2013-01-09 19:53:42 -08:00
Justin John Mathews
7b4971e4d1
Corrected carousel arrows to active.#6494, #6489
...
Corrected the carousel arrows to active on resizing the browser window.
2013-01-09 15:53:17 +05:30
Patrick H. Lauke
034155ec21
Basic keyboard accessibility CSS tweaks
...
Mostly doubling-up :hover styles to also cover :focus, as a first step
to making the framework more keyboard-friendly.
Additionally, fixed two small markup issues in the docs/examples to
make the "Learn more" large primary button-styled links
keyboard-focusable (as without href they're treated as non-tabable
anchors).
2013-01-02 22:39:21 +00:00
Mark Otto
4fa4d5254d
Fixes #6189 : Add holder.js to carousel example
2012-12-21 19:10:05 -08:00
Mark Otto
b7f2a382b6
Update new example name and links
2012-12-20 20:27:07 -08:00
Mark Otto
0f9490bf3e
Fixes #6352 : marketing-alternate broken nav in FF17
2012-12-20 14:40:39 -08:00
Mark Otto
3e64d03731
Merge branch '2.2.3' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
less/type.less
package.json
2012-12-20 00:02:52 -08:00
Nathan Bridgewater
312509e1c0
lowered carousel beneath the nav
2012-12-09 22:10:38 -06:00
Mark Otto
cb67366206
Merge branch '2.2.2-wip' into 3.0.0-wip
...
Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less
2012-12-05 11:05:10 -08:00
Mark Otto
5cf2e8a1cb
Once more, update all the favicons to retina
2012-12-03 13:25:56 -08:00
Mark Otto
d37d269230
Improve rendering of carousel example for IE10
2012-12-03 13:01:27 -08:00
Mark Otto
145ed23ac5
Remove more fluid grid stuff
...
* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page
2012-11-30 16:18:40 -08:00
Mark Otto
4bfab509df
add holder and replace placehold.it
2012-11-29 20:59:14 -08:00
Mark Otto
8db7111a63
add in latest carousel example, reorg examples on getting started
2012-10-16 12:50:10 -05:00
Mark Otto
814f9f17f9
improve spacing in carousel example
2012-10-15 13:57:09 -05:00
Mark Otto
e83a974afe
compress images and add new carousel example for .net magazine article
2012-10-10 17:58:22 -07:00
Mark Otto
9a25a10ba6
comments in template
2012-10-08 18:59:44 -07:00
Mark Otto
01a7f17579
adding another template for same-width nav links using 'display: table-cell;'
2012-10-08 18:58:35 -07:00
Mark Otto
cfc032fd41
add sticky footer example per martin bean's suggestion, using the implementation by ryan fait
2012-09-30 22:09:51 -07:00
Mark Otto
6cfabf5e22
add link to examples on index page; add back narrow marketing page and signin page examples
2012-09-30 21:28:20 -07:00
Mark Otto
f12b0239bc
nuke new examples for now
2012-09-17 08:53:13 -07:00
Mark Otto
2fd17aa6a8
more carouself example work
2012-09-16 21:54:06 -07:00
Mark Otto
fe4a2d2c96
way cooler carousel example, along with updated screenshots for examples
2012-09-14 15:55:46 -07:00
Mark Otto
7ea4783df8
tweak copy on each template, add sign in template
2012-09-14 15:21:44 -07:00
Mark Otto
8d97ae98d2
adding new examples
2012-09-14 15:17:46 -07:00
Mark Otto
f6271da47b
navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946
2012-08-14 16:24:58 -07:00
Mark Otto
2b31caae2d
fix navbar form alignment, and update examples to show these cases
2012-07-30 12:15:08 -07:00
Mark Otto
47d66e0a3f
fix examples collapse classes, rename navbar-redux to navbar and delete the old one
2012-07-30 10:08:27 -07:00
Mark Otto
b3b04ec3ff
fixes #4210 : indenting on hero example
2012-07-29 12:07:18 -07:00
Mark Otto
1e2fdd0b7c
move navbar and update paths so it sits in tests
2012-05-15 09:45:53 -07:00
Mark Otto
d8ff335cfd
move forms test to less/tests
2012-05-14 23:45:25 -07:00
Mark Otto
a25e78f9c9
add forms test page for all html5 input types and refactor selectors
2012-05-14 23:40:06 -07:00
Mark Otto
d03abac628
adding navbar example, for fixed and static navbars
2012-05-14 08:57:24 -07:00
Bryan Petty
d23a146d77
Restrict collapsed items in Navbar to only those in .nav-collapse, and buttons in Navbar.
2012-04-02 02:52:06 -06:00
Mark Otto
13ae2b0fe6
introduce .navbar-link to resolve issue with buttons in .navbar-text
2012-03-25 01:21:47 -07:00
Mark Otto
582f4789ea
adding 144x144 ipad touch icon
2012-03-25 00:46:03 -07:00
Mark Otto
a3bc40c4cd
fix apple touch icons in examples
2012-03-12 00:21:52 -07:00
Mark Otto
d4a48c9618
Merge branch 'meleyal-patch-1' into 2.0.2-wip
2012-02-27 19:50:44 -08:00
Mark Otto
1fbe0bb290
really add protocol to examples
2012-02-27 18:48:28 -08:00
meleyal
f17658b02d
Fix broken links to fav and touch icons in examples, fixes #2244
2012-02-24 23:06:02 +01:00
Jacob Thornton
d743b4b881
Merge branch 'master' of https://github.com/twitter/bootstrap into 2.0.1-wip
2012-02-07 22:05:17 -08:00
John Wright
93aa5c869e
some (android) devices need this viewport meta tag for responsive design to work
2012-02-07 11:06:08 -08:00
John Wright
2f63576538
some (android) devices need this viewport meta tag for responsive design to work.
2012-02-07 11:05:13 -08:00
John Wright
68a92876bc
Some devices need this for responsive design to work
2012-02-07 10:58:01 -08:00
Mark Otto
73db806660
fix meta tag for viewport in examples and shims
2012-02-04 23:53:24 -08:00
Mark Otto
0c475b8e4c
Merge branch 'master' of github.com:twitter/bootstrap
2012-02-01 22:13:26 -08:00
ejain
d66eb91437
Import the responsive css *after* setting the body padding to fix the issue described in #1570 .
2012-02-01 21:17:04 -08:00
Mark Otto
cc15d0f766
remove twitter widgets js from examples
2012-02-01 18:00:40 -08:00
Mark Otto
d90e519486
fix icon-bar class in exampless
2012-02-01 17:57:39 -08:00
Mark Otto
b6886bd543
fixing jquery links in examples
2012-02-01 17:41:24 -08:00
Jacob Thornton
4bb7653f67
move examples into docs...
2012-01-31 17:35:23 -08:00