Mark Otto
13b4e7a1a8
Mention limitation of form validation feedback icons with input groups
2014-02-08 17:19:45 -08:00
Mark Otto
e9199718d6
Merge branch 'master' into fix-12154
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-02-08 16:52:22 -08:00
Mark Otto
b36d19c3c6
grunt
2014-02-08 16:46:12 -08:00
Mark Otto
7f88009394
grunt
2014-02-08 16:43:58 -08:00
Mark Otto
3fc7a4cffa
grunt with new mixins
2014-02-08 16:31:42 -08:00
Mark Otto
26e2d7cdc9
grunt
2014-02-08 16:13:30 -08:00
Mark Otto
e3cfd5821d
Merge branch 'master' into pr/12462
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-02-08 16:01:56 -08:00
Mark Otto
842af44fcc
Merge branch 'pr/12579'
2014-02-08 15:53:18 -08:00
Mark Otto
866c52b928
grunt
2014-02-08 15:51:38 -08:00
XhmikosR
5d8491ac9f
Merge pull request #12655 from twbs/holder.js
...
Update holder.js to v2.3.1.
2014-02-09 01:48:13 +02:00
Mark Otto
06e6affa4a
Merge pull request #12645 from ZDroid/docs-js-semicolons
...
Omit semicolons consistently in docs
2014-02-08 15:46:51 -08:00
Mark Otto
b683433f67
grunt
2014-02-08 15:44:13 -08:00
Mark Otto
c8315edd73
Merge branch 'master' into pr/12639
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-02-08 15:37:35 -08:00
Zlatan Vasović
938779ca93
Move jade files to docs/jade/
2014-02-08 22:29:06 +01:00
XhmikosR
c3cb63b69f
Update holder.js to v2.3.1.
...
Fix #12653 .
2014-02-08 18:19:39 +02:00
Mark Otto
06f1293acf
Merge branch 'master' into panels_and_tables
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-02-07 18:36:27 -08:00
Mark Otto
a2f08158d0
Nuke shit I added in 4d7b2ddba9
that shouldn't come until v4
2014-02-07 15:44:50 -08:00
Julian Thilo
b61d12ff17
Fix wrong id
2014-02-07 23:21:32 +01:00
Zlatan Vasović
bdf9ce4c45
Omit semicolons consistently in docs
2014-02-07 19:31:08 +01:00
Chris Rebert
532f1d9097
Merge pull request #12636 from ZDroid/grunt-jshintrc
...
Avoid setting `jshint node: true` in every Grunt JS file
2014-02-07 09:36:39 -08:00
Bas Bosman
a0052b5a37
Drop -o-user-select
2014-02-07 14:14:32 +01:00
Zlatan Vasović
6db1a3f909
Fix .text-truncate() typo
2014-02-07 13:40:32 +01:00
Zlatan Vasović
aead10fafa
Avoid setting jshint node: true
in every Grunt JS file
2014-02-07 13:34:17 +01:00
Mark Otto
4d7b2ddba9
Fixes #12486 : Restore full width inputs for input groups in inline forms and navbars
2014-02-07 02:58:10 -08:00
Mark Otto
cae76171d0
Follow up to 1bdd59b18c2d1b2409d0422a60e8c007053202df, to better position the sidebar so the potential scrollbar doesn't get hidden by the navbar
2014-02-07 02:44:04 -08:00
Mark Otto
d91d9b0ade
Fixes #12447 : Properly reset borders on table cells in panels
2014-02-07 02:38:01 -08:00
Mark Otto
3ccc16cad0
grunt for days
2014-02-07 02:24:37 -08:00
Mark Otto
c399bfb015
Fixes #12477 : Clarify IE support in docs
2014-02-07 01:49:12 -08:00
Mark Otto
a9b964b9c3
Merge branch 'master' of github.com:twbs/bootstrap
2014-02-07 01:41:46 -08:00
Mark Otto
2865fde67f
Fixes #12590 : Add Korean translation link
2014-02-07 01:41:04 -08:00
Mark Otto
b4aaf04b3f
Merge pull request #12319 from twbs/address-12007
...
Clarify target of dropdown events
2014-02-07 01:39:00 -08:00
Mark Otto
16bbcd7aff
clarify comment
2014-02-07 01:33:27 -08:00
Mark Otto
4f9cdefab7
consistency
2014-02-07 01:31:42 -08:00
Mark Otto
f83b201007
Fixes #12526 : Add scrollbars when necessary to the Dashboard example's sidebar
2014-02-07 01:27:07 -08:00
Mark Otto
228d4e59fc
Fixes #12555 : Rearrange variables to place grids and containers closer
2014-02-07 01:22:30 -08:00
Mark Otto
3b4b9a7fe5
Fixes #12614 : Add progress bar example with visible label
2014-02-07 01:16:34 -08:00
Mark Otto
ebd132ce68
Fixes #12611 : Mention limitation of one plugin's data attributes per element
2014-02-07 01:10:21 -08:00
Mark Otto
77d160151f
Merge pull request #12497 from twbs/container-fluid-is-now-a-thing
...
rm DIY full-width callout now that there's .container-fluid
2014-02-07 00:48:25 -08:00
Mark Otto
91595d38f3
property order because @zdroid <3
2014-02-06 19:34:46 -08:00
Mark Otto
ace0abfdb6
Merge branch 'master' into thumbnail-extend
...
Conflicts:
dist/css/bootstrap.css
2014-02-06 18:52:03 -08:00
XhmikosR
aae64a9eba
Update jzip to v2.1.0.
2014-02-06 23:10:37 +02:00
Supergibbs
08ff305ed7
Added border radiuses to table when in a panel. Fixes #12461
2014-02-05 14:29:23 -08:00
Mark Otto
7eb532262f
Merge pull request #12465 from XhmikosR/docs-img
...
Docs: losslessly compress images.
2014-02-05 14:11:46 -08:00
Mark Otto
f16a2376c1
add basic back to top link to docs sidenavs, fixes #12589
2014-02-05 13:46:24 -08:00
Mark Otto
00cb50a41a
grunt dist--includes changes from #12025 and decimal changes, likely from a change in dependencies
2014-02-04 19:27:25 -08:00
Mark Otto
28f5f6ecf3
Merge pull request #12512 from ZDroid/placeholder-img-fix
...
Improve alignment of the dashboard placeholder images
2014-02-04 16:21:23 -08:00
Chris Rebert
46f9d27142
reorganize all grunt tasks into one directory
...
also fixes #12581
2014-02-04 13:18:54 -08:00
Panayiotis Lipiridis
40e1a3bd9f
Sticky footers without any wrappers
2014-02-04 13:56:42 +01:00
Mark Otto
ef3c560a06
Reorder grunt dist tasks to ensure JS gets copied over
2014-02-04 02:04:23 -08:00
Mark Otto
07098d1bb7
Fixes #12470 : Scope large modal styles to minimum viewport width
2014-02-04 02:01:31 -08:00
XhmikosR
2deb5f9f91
Compress examples screenshots with kraken.io.
...
Before: 1,12 MB (1.174.728 bytes)
After: 1,11 MB (1.173.614 bytes)
2014-02-04 11:33:28 +02:00
XhmikosR
7dd51beb42
Docs: losslessly compress images.
...
Before: 25,1 KB (25.773 bytes)
After: 23,7 KB (24.352 bytes)
2014-02-04 11:33:28 +02:00
XhmikosR
ec050fa0ab
Update less.js to v1.6.2.
2014-02-04 11:11:40 +02:00
XhmikosR
2576fecf95
Update jszip to the latest git ( 202003821d
).
2014-02-04 11:08:12 +02:00
XhmikosR
389e574aaa
Update Filesaver.js to the latest git (2014-01-24).
2014-02-04 11:08:12 +02:00
Chris Rebert
9cf9f6c099
Merge pull request #12499 from twbs/move-responsive-imgs-sect
...
move .img-responsive docs from Overview to Images section
2014-02-04 01:00:32 -08:00
XhmikosR
3ab2324df0
Remove double semicolon.
2014-02-04 10:39:02 +02:00
XhmikosR
9f668a5573
Add examples/**/*.css in csscomb task.
2014-02-04 10:39:02 +02:00
Mark Otto
9ba49426e9
Merge pull request #12466 from XhmikosR/12457
...
Add examples/css in the csslint task.
2014-02-04 00:27:12 -08:00
Mark Otto
ec6c9d2824
Don't offset customizer alert, grunt dist
2014-02-04 00:18:34 -08:00
Chris Rebert
819b19e39c
fix #12494 in the migration docs
2014-02-03 23:05:51 -08:00
XhmikosR
48118576f1
Examples: fix csslint errors.
2014-02-04 09:04:40 +02:00
Chris Rebert
8ee208e9c1
fix #12566
2014-02-03 12:19:50 -08:00
Chris Rebert
d675284cf6
Safari's justified nav bug is still present as of Safari v7.0.1; fixes #12454
2014-02-03 02:38:18 -08:00
Chris Rebert
e958008048
fix #12541
2014-02-03 02:11:25 -08:00
Chris Rebert
d8bb6c2987
Merge pull request #12545 from twbs/arrivederci-help-inline
...
add removal of .help-inline to the migration guide
2014-02-03 02:05:31 -08:00
Chris Rebert
d5558621b2
add removal of .help-inline to the migration guide; fixes #12539
2014-02-03 02:04:21 -08:00
Chris Rebert
69af98e6bb
add .btn-inverse removal to migration guide; fixes #12538
2014-02-03 01:57:45 -08:00
Chris Rebert
a2ff16c3ce
fix #12540
2014-02-03 01:51:32 -08:00
Chris Rebert
27e080df4b
fix #12527
2014-02-02 22:51:19 -08:00
Chris Rebert
e9212e8ab7
update docs about destination of remote modal content; fixes #12494
2014-02-02 22:11:18 -08:00
Chris Rebert
880a38e1a4
add StackOverflow to Community section of Getting Started docs
2014-02-02 21:44:09 -08:00
Zlatan Vasović
09f62f6a7a
Improve alignment of the dashboard placeholder images
...
Fixes #12435
2014-02-01 22:46:55 +01:00
Chris Rebert
d6f25e13ec
mv .img-responsive docs from Overview to Images section
2014-02-01 00:26:46 -08:00
Chris Rebert
813467ddaf
rm callout about creating .container-fluid-alikes now that .container-fluid has been added
2014-02-01 00:11:23 -08:00
Mark Otto
58bf3f9432
grunt after last commits
2014-01-31 13:40:32 -08:00
Mark Otto
1802cedbc1
Use scss option instead of css for better highlighting
2014-01-31 13:12:31 -08:00
Chris Rebert
4b194471b0
fix #12484
2014-01-31 10:32:32 -08:00
XhmikosR
7b9c0a38a7
Downgrade holder.js to v2.2.0.
...
Fixes #12440 .
2014-01-31 09:32:55 +02:00
Chris Rebert
2c6b099f91
fix "pading-right" [sic] typo in dashboard.css; fixes #12455
2014-01-30 20:39:12 -08:00
Chris Rebert
e430675d14
use correct+newer name for retina mixin in docs; fixes #12450
2014-01-30 14:46:58 -08:00
Chris Rebert
c86c8de4f2
rm duplicate warning callouts in Input Groups docs
2014-01-30 12:25:02 -08:00
Chris Rebert
c1a5e1443f
Merge pull request #12436 from XhmikosR/jquery
...
Update jQuery to v1.11.0.
2014-01-30 11:12:40 -08:00
XhmikosR
8939268a33
Update jQuery to v1.11.0.
...
Also, use Google's CDN per #11369 .
2014-01-30 20:50:17 +02: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
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
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
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
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
Quy Ton
5c1852fb74
Change positioning reference from left to right in affix's example.
2014-01-27 09:17:57 -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
86a5846ada
Merge pull request #12378 from andrewdisley/patch-1
...
Fix #10348 : Customizer dependencies
2014-01-25 16:30:02 -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
Quy Ton
da86f6fbbb
Remove Twitter from tweet button
2014-01-24 10:37:12 -08: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
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
b9d1ae092f
add ID to "Box sizing" section of Getting Started docs
2014-01-23 17:01:43 -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
Chris Rebert
bc9335650c
fix #12007 by clarifying target of dropdown events
2014-01-20 18:39:13 -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
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
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
Chris Rebert
f59573db0d
docs: use relative URLs instead of site.baseurl
2014-01-19 22:50:09 -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
Quy Ton
0d153fa643
Replace page.base_url with relative url
2014-01-19 21:03:17 -08:00
Chris Rebert
937e067a27
grunt build-customizer-vars-form
2014-01-19 15:28:30 -08:00
Quy Ton
3e9ba3f671
More "LESS" to "Less" changes
2014-01-19 13:27:51 -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
Chris Rebert
6d08763136
add docs note to address #12078
2014-01-22 17:28:00 -08:00
Julian Thilo
494014babe
No more lists.
2014-01-22 19:04:19 +01:00
Julian Thilo
2022e15aa8
Gone, gone.
2014-01-22 17:00:09 +01: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
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
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
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
79487ba499
fix #12298
2014-01-19 23:07:32 -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
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
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
Quy Ton
9e8afcc661
Add table's .info variant to migration guide
2014-01-18 16:08:39 -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
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
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
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
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
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
380019ccb2
Split box-sizing reset for faster rendering
2014-01-16 20:00:28 -08:00
Mark Otto
d07e8fece4
grunt
2014-01-16 15:03:34 -08:00
fat
3b2418e688
remove flaky pos bottom test which is effect by unit scroll pos
2014-01-16 13:44:08 -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
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
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
Mark Otto
14975e4ee9
indentation and page header changes
2014-01-15 13:24:34 -08: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
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
46b0874ef5
add copyright notice to raw-files.js
2014-01-14 13:27:50 -08:00
Zlatan Vasović
c11f78d7eb
Link the blog post instead of main blog page
2014-01-14 14:40:27 +01: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
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
Mark Otto
f4dd6221d4
Merge branch 'responsive-embed' of https://github.com/boulox/bootstrap into boulox-responsive-embed
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
2014-01-13 20:01:54 -08:00
Chris Rebert
b9216a292c
update to Holder.js 5b79144fa
2014-01-13 17:50:17 -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
Chris Rebert
4787a69efb
fix #12154
2014-01-12 13:51:03 -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
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
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
Chris Rebert
fc62379e61
grunt dist
2014-01-09 11:11:13 -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
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
1736bcb05c
Merge pull request #12150 from twbs/extract-from-gruntfile
...
cleanup Gruntfile by extracting executable code
2014-01-08 11:01:03 -08: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
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
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
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
Julian Thilo
8d903fbd02
duh, missed one more file
...
X-Ref: 7fcfe61f4d
2014-01-07 01:27:49 +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
juniorconte
7722ab5566
notes from .input-block-level
2014-01-06 11:41:15 -02: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
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
Quy Ton
c613143638
Delete reference to a non-existent class
2014-01-05 20:08:37 -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
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
Quy Ton
3e92ab0149
Fix typos
2014-01-05 08:38:32 -08:00
Quy Ton
82ed81fddf
Fix typo
2014-01-04 21:35:06 -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
Chris Rebert
84c33a822d
Replace lingering page.url instance with site.baseurl
...
Refs #12083 & #12037
2014-01-03 16:19:20 -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
Quy Ton
63df2ced6e
Update source code download structure
2014-01-03 11:42:27 -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
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
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
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
0df96d8c32
Merge branch 'master' into docs_dir
2013-12-31 10:38:31 -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
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
Mark Otto
a8005b3d0b
flatten docs dir back into root
2013-07-18 17:41:30 -07:00
Mark Otto
36188d0884
change download button label
2013-07-18 14:08:40 -07:00
Mark Otto
63f070096b
copy change to css page subheading
2013-07-18 14:06:13 -07:00
Mark Otto
5cb0d64686
relative url
2013-07-18 13:51:08 -07:00
Mark Otto
3abfe029ea
vertically center ad
2013-07-18 13:35:55 -07:00
Mark Otto
a34470ac5d
Merge branch 'bs3_old_docs_callout' into bs3_rc1
2013-07-18 13:07:49 -07:00
Mark Otto
9425382376
Merge branch 'bs3_add_ads' into bs3_rc1
2013-07-18 13:07:17 -07:00
Mark Otto
cc63096118
clarify IE support and rearrange getting started docs a bit
2013-07-18 13:05:53 -07:00
Mark Otto
64efa86036
for some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed dimensions
2013-07-18 02:19:13 -07:00
Mark Otto
3ed05f60fd
Quick pass at new touch and favicons
2013-07-18 02:05:41 -07:00
Mark Otto
6e04925328
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-18 01:25:28 -07:00
Mark Otto
e72b524d41
Fixes #8374 : ensure navbar is always at least 50px
2013-07-18 01:25:08 -07:00
fat
6ec8a1e44f
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-07-18 01:08:19 -07:00
fat
4b40ee692d
cleaner way of preventing double click events + clean up tests for jshint
2013-07-18 01:07:11 -07:00
Mark Otto
181b276774
Fixes #8397 : better navbar padding with grid gutter stuff
2013-07-18 01:04:54 -07:00
fat
37e899d766
get button js working with actual form elements p cooll
2013-07-18 00:59:31 -07:00
Mark Otto
f757cf4cf3
run make on mixin changes from #8380
2013-07-18 00:50:57 -07:00
Mark Otto
8dc7807dcd
change characters
2013-07-18 00:48:02 -07:00
Mark Otto
1363ffa473
Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip
2013-07-18 00:43:48 -07:00
Mark Otto
79a10feb7a
Fixes #8452 : adds .active
to table classes
2013-07-18 00:10:22 -07:00
Mark Otto
87adbf7aa4
make on collapse changes
2013-07-17 23:56:38 -07:00
Mark Otto
bc79f8a399
Bump tooltips to use @font-size-small
(11px to 12px)
2013-07-17 23:55:58 -07:00
Mark Otto
e57758cbb4
Drop .nav-header
for .dropdown-header
...
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
2013-07-17 23:54:09 -07:00
Mark Otto
4d73aa60f9
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-07-17 23:34:31 -07:00
Mark Otto
d3a139622e
fixes #8491 : add vars for table padding
2013-07-17 23:34:04 -07:00
Mark Otto
ba0c6cd57c
make on prev js changes
2013-07-17 23:33:34 -07:00
fat
8cf04911db
fixes #7776
2013-07-17 23:25:26 -07:00
Mark Otto
d7d1c2a767
add ads to v3 docs
2013-07-17 23:22:28 -07:00
Mark Otto
3ad0cf9e94
add callouts for bootstrap 2.3.2 docs and 3.0 rc1 post
2013-07-17 22:58:49 -07:00
Mark Otto
9efba239b6
Merge pull request #8511 from twitter/bs3_remove_examples
...
BS3: Move examples to @twbs/bootstrap-examples
2013-07-17 22:17:30 -07:00
fat
18d23b892c
rebuild js + fixes #7583
2013-07-17 21:35:28 -07:00
fat
2cccc0889f
make sure triggering element is visible before focusing #7521
2013-07-17 21:30:38 -07:00
fat
102df4ff33
Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-07-17 21:14:02 -07:00
fat
bf38241f0d
remove duh ugly
2013-07-17 21:10:33 -07:00
fat
eb3333a612
fix #7000
2013-07-17 21:08:50 -07:00
Mark Otto
0df791d1ac
fix link to grid example
2013-07-17 21:04:27 -07:00
Mark Otto
6be1f9d00f
remove colophon include because there's only one layout using it now
2013-07-17 21:02:50 -07:00
Mark Otto
97cdb4215a
link order
2013-07-17 20:44:55 -07:00
Mark Otto
f0d0718322
Merge branch '3.0.0-wip' into bs3_remove_examples
...
Conflicts:
docs/_includes/nav-getting-started.html
docs/examples/navbar-fixed-top.html
docs/examples/navbar-static-top.html
docs/examples/navbar.html
docs/getting-started.html
2013-07-17 20:44:27 -07:00
fat
0f64c21049
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-17 20:30:09 -07:00
fat
392bf0c9c9
fixes #6691
2013-07-17 20:29:41 -07:00
Mark Otto
bfebf0e490
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-17 20:18:03 -07:00
Mark Otto
7cc34ea547
fix broken docs callouts
2013-07-17 20:17:56 -07:00
fat
5396c40877
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-17 19:33:49 -07:00
Mark Otto
542e03ae3a
Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam
...
Conflicts:
docs/components.html
docs/css.html
docs/customize.html
2013-07-17 19:33:30 -07:00
fat
f97dd5af49
rebuild doe
2013-07-17 19:33:21 -07:00
Mark Otto
06d47b0082
Fixes #8360 : Add mention of IE compatibility mode to docs
2013-07-17 19:26:37 -07:00
Mark Otto
f4b9938d8c
Move license FAQs to the docs, add link to side nav
2013-07-17 19:20:08 -07:00
Mark Otto
aa49c919c6
Fixes #8356 : Move browser compatibility from wiki into real docs
2013-07-17 19:08:08 -07:00
Mark Otto
5967ef64a3
remove margin from left side of navs since it's no longer being set
2013-07-16 11:49:04 -07:00
Mark Otto
522004e67a
remove webkit-overflow-scrolling from modal for now /cc #8495
2013-07-16 11:26:48 -07:00
Mark Otto
ced641b107
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-15 12:00:10 -07:00
Mark Otto
6aec8f36fc
fix broken scrollspy example
2013-07-15 12:00:01 -07:00
Julian Thilo
aab4c95cd2
Update customizer
...
Add all the new things to customizer:
* `@headings-font-family`
* `@container-*`
* darker `@btn-default-bg`
2013-07-14 12:50:14 +02:00
Chris Rebert
5d9f51d496
rm .control-group from docs since it's no longer in the LESS
2013-07-11 12:57:44 -07:00
Mark Otto
606d6e81d4
Merge pull request #8426 from liuyl/simplify-type
...
simplify type.less
2013-07-09 12:43:15 -07:00
Julian Thilo
88d76e386f
Dustin the docs again
...
* Fix alllll the links!
* Change all `*.js` in JS plugin docs (no mo `bootstrap-`)
* Fully remove `tr.info`
* Bring nav includes up to date
2013-07-09 15:32:28 +02:00
liuyl
0d5c3c2ecf
simplify type.less
2013-07-09 09:22:36 +08:00
Mark Otto
1045226544
Merge pull request #8415 from cvrebert/code.less-cleanup
...
code.less: cleanup styles that get immediately overriden later in the file
2013-07-08 06:57:37 -07:00
Mark Otto
e0d1b83e25
Merge pull request #8412 from cvrebert/pagination-nesting
...
use nesting more in pagination.less
2013-07-08 06:55:50 -07:00
Mark Otto
46378c7ba3
Merge pull request #8411 from cvrebert/navbar-LESS-nesting
...
more nesting in navbar.less
2013-07-08 06:55:16 -07:00
Chris Rebert
e40aee9c9e
code.less: cleanup styles that get immediately overriden later in the file
2013-07-07 20:03:52 -07:00
Chris Rebert
6bda16f6be
use nesting more in pagination.less
2013-07-07 19:30:51 -07:00
Chris Rebert
d9cd5e4e0c
more nesting in navbar.less
2013-07-07 19:22:18 -07:00
Chris Rebert
6e03639af2
more nesting in buttons.less
2013-07-07 19:16:38 -07:00
Maurice Wahba
8a84da6341
Carousel no longer dependent on glyphicons
...
Used laquo/raquo for control buttons
Updated docs
2013-07-06 22:26:40 +04:00
Mark Otto
95655e7275
Remove more Glyphicons
2013-07-05 14:27:54 -05:00
Mark Otto
fffb37ecea
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-05 14:24:40 -05:00
Mark Otto
3279181f42
Merge pull request #8378 from liuyl/aftertosibling
...
optimize breadcrumb
2013-07-05 12:23:14 -07:00
Mark Otto
30c138c4bf
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-05 14:22:46 -05:00
Mark Otto
61823dbff1
Move hr
to scaffolding.less (out of type.less) and simplify styles
2013-07-05 14:21:05 -05:00
Mark Otto
88a266b800
Add tfoot back (addresses more than #8387 )
2013-07-05 14:15:00 -05:00
Mark Otto
14056409c3
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-05 14:13:24 -05:00
Mark Otto
817972724a
Remove further mentions of Glyphicons
2013-07-05 14:11:12 -05:00
liuyl
e6529e9588
delete typeahead style
2013-07-05 15:09:16 +08:00
liuyl
5b69d34053
use sibling selector instead of pseudo selector
2013-07-03 20:37:36 +08:00
Chris Rebert
da072fff21
refactor tables.less to use nesting more
2013-07-02 11:42:37 -07:00
Mark Otto
749dc35328
comma for the guardian angel /cc @cvrebert
2013-07-01 20:18:44 -07:00
Mark Otto
a049dcb7f6
Merge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-responsive-tables
...
Conflicts:
less/mixins.less
2013-07-01 20:06:16 -07:00
Mark Otto
5b2d933524
Fixes #8350 : unfuck Chrome number input element cursor /cc @cvrebert @eintnohick
2013-07-01 19:49:29 -07:00
Mark Otto
08b3515fd7
fixes #8345 : use inline-block on .img-responsive
2013-07-01 19:42:43 -07:00
Mark Otto
9da90adb4c
fixes #8068 : add .help-block to form field state mixin
2013-07-01 18:21:19 -07:00
Mark Otto
c9df1db502
fixes #7367 : slightly larger carousel indicators
2013-07-01 18:16:59 -07:00
Mark Otto
7ad9fbef8b
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-01 17:32:14 -07:00
Mark Otto
a27ecfccf3
Make more components mixin-friendly
2013-07-01 17:32:07 -07:00
Julian Thilo
fea69df80c
Fix responsive utilities for table elements
...
This change prevents situations where specificity causes some rules to
be overridden by the ones intended for mobile.
* Added mixin `responsive-invisibility()`
* Swapped out `display: none !important;` for new mixin
2013-07-01 21:13:57 +02:00
Mark Otto
534eac5242
Merge pull request #8340 from JohnONolan/Fix-Broken-Docs-Links
...
Docs: Fix broken links to navbar component in examples pages
2013-06-29 17:29:19 -07:00
Mark Otto
eeaa70ab4a
Merge pull request #8341 from Quy/3.0.0-wip
...
Remove references to fonts
2013-06-29 17:29:01 -07:00
Francis Brunelle
6a20810ca4
reset left padding for .media-list, .pagination and .pager
2013-06-29 16:06:14 -04:00
Quy Ton
02351c0589
Remove references to fonts
2013-06-29 07:37:53 -07:00
John O'Nolan
4252dff850
Fixes broken links to navbar component in docs.
2013-06-29 13:21:16 +02:00
Mark Otto
0a92efce0c
Nuke hella things
...
* Any mentions of .btn-mini
* Old docs page that somehow found it's way back
2013-06-28 09:24:46 -07:00
Mu-An Chiou
55fa1acbd6
Tooltip: apply position class before positioning
2013-06-28 11:05:38 +01:00
Mark Otto
09cdee2f03
Overall responsive img
styles
...
`img`s are no longer responsive by default. Instead, use
`.img-responsive` as a class or mixin. Existing `.thumbnail > img` and
`.img-thumbnail` classes now make use of this as a mixin as well.
2013-06-28 00:09:10 -07:00
Mark Otto
1a09eada35
Run make on JS
2013-06-28 00:08:19 -07:00
Mark Otto
8e6d5be8e4
update close button example display
2013-06-27 23:26:04 -07:00
Mark Otto
88ece4fc59
fixes #7961 a bit: adds css for extra tooltip placement options. /cc @fat you just need dat js prolly
2013-06-27 20:50:21 -07:00
Mark Otto
bf3c5e070e
remove submenus. for more context: http://www.youtube.com/watch?v=ggWyUEuGcWY&feature=youtu.be&t=48s
2013-06-27 20:49:29 -07:00
Mark Otto
89117ec6b2
run make on last commit
2013-06-27 20:18:16 -07:00
Mark Otto
d9a662ed1d
fixes #7977 : prevent some table bullshit on input groups
2013-06-27 20:15:44 -07:00
Mark Otto
ca8ca2177f
fixes #4852 : popover carets fully functional in ie8 holy carp wtfbqq huge shoutout to @PumaOmaR
2013-06-27 19:36:56 -07:00
Mark Otto
6a2858f7bf
make on js i guess? /cc @fat
2013-06-27 19:36:35 -07:00
Mark Otto
81b5e74057
remove glyphicons from compiled css
2013-06-27 19:36:09 -07:00
Mark Otto
416cc6b2ee
fix broke js markup
2013-06-27 19:33:26 -07:00
Mark Otto
2af67238a4
Merge pull request #8332 from twitter/bs3_remove_icons
...
BS3: Remove Glyphicons
2013-06-27 19:23:55 -07:00
Mark Otto
8cd5d0be71
add docs callout for glyphicons on homepage and CSS page
2013-06-27 19:22:11 -07:00
fat
b06ec345ce
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-27 19:19:57 -07:00
Mark Otto
2981f0089f
remove glyphicons from demo component
2013-06-27 18:51:06 -07:00
Mark Otto
879d517cb3
delete icons in assets
2013-06-27 18:49:59 -07:00
Mark Otto
e5a9a1f5ff
remove icons from sidenav
2013-06-27 18:49:37 -07:00
Mark Otto
62f76ad33f
Merge branch '3.0.0-wip' into bs3_remove_icons
...
Conflicts:
docs/components.html
2013-06-27 18:49:05 -07:00
fat
94761c2216
use collapse in dropdown js example
2013-06-27 18:47:35 -07:00
Mark Otto
cb29ed0751
Merge pull request #8307 from cvrebert/8287-docs-patch
...
Fix #8287
2013-06-27 18:38:34 -07:00
Mark Otto
296b9d7293
Merge pull request #8313 from jholl/patch-1
...
typo: match doc text and example
2013-06-26 11:42:04 -07:00
Mark Otto
68792fc1f9
Merge pull request #8306 from cvrebert/styling-n-typo
...
Docs: fix 1 typo; use <code> in 1 place
2013-06-26 11:20:14 -07:00
Julian Thilo
b4e0e4fee6
Adjust info callout, add callouts to docs
...
* Adjust the background-color of bs-callout-info to match danger and
warning in tone
* Convert all the callouts
* Change some callouts to info/warning
* Add new callout
2013-06-26 15:59:33 +02:00
James Holland
2471b9d725
typo: match doc text and example
2013-06-26 08:27:12 -04:00
Chris Rebert
242d92e09c
Fix #8287
2013-06-25 20:18:30 -07:00
Chris Rebert
274a342657
Docs: fix 1 typo; use <code> in 1 place
2013-06-25 19:50:37 -07:00
Chris Rebert
694c650f8e
copyedit JS docs
2013-06-25 19:32:17 -07:00
Chris Rebert
266bdfcaaa
rm :invalid styling from docs
...
It was removed from the code in 90d4343f66
:-/
2013-06-25 16:31:12 -07:00
Julian Thilo
f00c885d4c
Docs: create new callout classes
2013-06-25 23:12:36 +02:00
Mark Otto
6ac063430f
Merge pull request #8290 from juthilo/3.0.0-docs-nothird
...
Add new callouts to docs
2013-06-25 13:34:03 -07:00
Mark Otto
534ba060be
Merge pull request #8292 from cvrebert/patch-1
...
fix "Data attributes" link in JS docs sidenav
2013-06-25 13:32:41 -07:00
Julian Thilo
fe25ebc2af
Recess welcome
2013-06-25 22:22:23 +02:00
Chris Rebert
e46e63463a
fix ID of Normalize heading in docs so that the sidenav can find it
2013-06-25 14:16:39 -06:00
Chris Rebert
4be21c422a
fix "Data attributes" link in JS docs sidenav
...
`#js-data-attributes` => `#js-data-attrs`
2013-06-25 14:09:24 -06:00
Julian Thilo
a87ea9345b
Add IDs, adjust text
2013-06-25 21:59:34 +02:00
Julian Thilo
0f0e7fc376
Add a link to the mailing list for JS help
2013-06-25 21:19:19 +02:00
Julian Thilo
30e5e89fac
Add callout to docs: LESS compiler support
2013-06-25 21:01:13 +02:00
Julian Thilo
abb112173e
Add callout to docs: 3rd-party libs not supported
2013-06-25 20:52:49 +02:00
Luis Hdez
9ed5b5e653
Fix line breaks on add-ons with spaces
2013-06-25 14:34:57 +02:00
Kyle
c455d92f9e
Replaced <i> with <span> for glyphicon
2013-06-24 11:27:05 +08:00
Mark Otto
55120d124c
Merge pull request #8268 from luishdez/hotfix/sidebar-overlap
...
Fix overlap sidebar for Tablets and up in docs
2013-06-23 15:16:25 -07:00
Mark Otto
573a197417
Move grid offsets to desktop only ( fixes #8229 )
2013-06-23 15:15:42 -07:00
Mark Otto
164e88781b
Make on previous commits
2013-06-23 15:05:58 -07:00
Luis Hdez
5af22ab89f
Fix overlap sidebar for Tablets and up in docs
2013-06-23 23:15:32 +02:00
Mark Otto
976322b2a6
run make on previous merge
2013-06-22 18:56:55 -07:00
Mark Otto
b0e943399d
Improve alignment of navbar brand and fix up left padding on list groups
2013-06-21 17:21:44 -07:00
Mark Otto
eba9b4de6c
Reset padding on homepage links
2013-06-21 11:56:47 -07:00
Tom Pietschker
9d43fbb57e
Remove the offcanvas js from the footer
...
This was moved inline in 65ad52060e
2013-06-21 10:03:28 -04:00
Tom Pietschker
8ef3df418f
Rename class name in placeholder
...
applies 2535e060a4
to css.html. Wasn't
docs.html removed a while ago?
2013-06-21 09:59:34 -04:00
Quy Ton
ac1058e435
Rename class name in placeholder
2013-06-20 18:44:19 -07:00
Mark Otto
ef8e5853cb
Fixes #8154 : enforce full width .navbar-nav.pull-right
in mobile
...
Prevents an odd alignment issue in mobile views by forcing the nav
links to be full width without undoing the float.
2013-06-20 17:15:09 -07:00
Mark Otto
82f9de9459
Fixes #8159 : Be more specific about disabled inputs to avoid iOS bug
...
Attached disabled styles to the exact input types rather than all
inputs and reseting the checkbox/radios. If setting `background-color:
transparent;`, iOS renders no background on the disabled control.
2013-06-20 17:02:10 -07:00
Mark Otto
90d4343f66
Fixes #8093 : Removes invalid focus styles on inputs
2013-06-20 16:42:05 -07:00
Mark Otto
4db90244c4
run make on previous commit
2013-06-20 16:27:39 -07:00
Mark Otto
2aec6dae59
Fixes #7730 : Better hiding of empty titles in popovers
...
If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.
/cc @fat becaue I probably did this wrong <3
2013-06-20 16:02:05 -07:00
Mark Otto
2fccf927c5
Run make on last commit
2013-06-20 16:02:05 -07:00
Mark Otto
f64fe29003
Move Glyphicons into their own repo
...
Removes the icon fonts and associated docs and LESS code from the core
repo and into twbs/bootstrap-glyphicons.
2013-06-20 15:40:37 -07:00
Mark Otto
c5fb401a62
Move examples out of the main repo to twbs/bootstrap-examples
...
While examples are phenomenally useful and awesome for folks getting
started with Bootstrap, they don't really shine as well being buried in
the main docs. Moreover, having anything that's not core HTML, CSS, JS,
or documentation in the main repo seems to just get in the way.
Therefore, examples gets its own repo.
Specifically, we're doing the following:
* Deletes all example screenshots
* Deletes example layout
* Deletes example files
* Updates Getting Started docs to include only the template and a link
to the new examples project
All the examples and their history will be preserved in the switch.
2013-06-20 12:36:27 -07:00
Mark Otto
8383209521
run make on @nextgenthemes last commit
2013-06-20 09:58:21 -07:00
Mark Otto
65ad52060e
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
b0bece66f2
Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumbitta-offcanvas-example
2013-06-19 19:13:38 -07:00
Mark Otto
5fcdf1229d
Fixes #8001 : add IDs for example inputs
2013-06-19 19:02:29 -07:00
Kurt MacDonald
98a8eaffc0
Add missing property to form-horizontal docs
2013-06-19 17:08:14 -06:00
Mark Otto
546d40a143
Add support for tr
, th
, and td
to responsive utilities
2013-06-18 19:16:50 -07:00
Mark Otto
112dabb3c2
run make on last commit
2013-06-18 19:16:50 -07:00
Chris Rebert
7b60d04f0c
docs/javascript.html: backticks -> <code>
2013-06-18 14:35:37 -07:00
Mark Otto
bcc3af4b2a
Fixes #7599 : Improved print styles for a few key components
...
* Updates `.table` to always enforce a solid white background
* Update button groups and dropdowns to always use black carets
* Add a 1px solid black border to labels (in the future we should add a
border to these perhaps for better printing)
2013-06-17 20:56:02 -07:00
Mark Otto
37f4a25be4
Better clearing on .dl-horizontal
for empty dd
elements
...
Instead of clearing the entire `.dl-horizontal`, we've moved the
clearfix mixin to the `dd` level to solve two problems in one: empty
`dd`s mid-list, and empty `dd` as the last child.
Addresses a few old issues, including #2824 , #3819 , #3821 , #4062 ,
#6707 , and #7180 .
Sorry that took so long :D.
2013-06-17 14:21:16 -07:00
Mark Otto
4436e727ed
Properly unstyle the .list-unstyled
class by switching from margin
to padding
...
Also add better comments
2013-06-17 14:21:16 -07:00
Mark Otto
84c0dc13ba
Remove explicit, unncessary line-height
on li
elements
2013-06-17 14:21:16 -07:00
Mark Otto
731cbb302e
Better base ul
and ol
styles
...
Turns out we were nixing the default browser spacing for bullets and
numbers, so this reverts that and instead just twerks the top/bottom
`margin`.
2013-06-17 14:21:16 -07:00
Mark Otto
5f3f73c620
Merge pull request #8184 from FLOKER/3.0.0-wip
...
redundant lines removed
2013-06-16 20:48:27 -07:00
Chris Rebert
5c63883062
components docs: backticks ==> <code>
2013-06-16 21:40:50 -06:00
Mark Otto
1555992e35
Merge pull request #8187 from imsky/3.0.0-wip
...
upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers
2013-06-16 20:39:11 -07:00
Chris Rebert
50df5de14f
CSS docs page: backticks ==> <code>
2013-06-16 21:36:56 -06:00
Ivan Malopinsky
c1655e6cbd
upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers
2013-06-16 23:16:56 -04:00
FLOKER
125e472d6f
redundant lines removed
2013-06-16 22:18:46 +02:00
Mark Otto
ac3521fef4
Remove WebKit overflow scrolling for now
2013-06-16 10:56:30 -07:00
Mark Otto
6ce154c7ed
Fixes #8175 : Update input min-height vars to fix FF21 input rendering
2013-06-15 11:46:13 -07:00
Mark Otto
258e1d62fb
Fix up broken input group example layouts
2013-06-15 11:37:59 -07:00
Mark Otto
ecf9b020dd
Merge pull request #8168 from marsuboss/patch-2
...
Duplicate ID navbar-example
2013-06-13 13:41:23 -07:00
Mark Otto
c14f23192a
Merge pull request #8167 from marsuboss/patch-1
...
Duplicate ID drop5
2013-06-13 13:40:40 -07:00
marsuboss
1421a0e9bb
Fix
2013-06-13 15:50:06 +03:00
marsuboss
436cffdaaf
Duplicate ID navbar-example
2013-06-13 15:36:52 +03:00
marsuboss
c6f51d0919
Duplicate ID drop5
2013-06-13 14:29:34 +02:00
Mark Otto
949c7cca00
Merge pull request #8156 from baer/toggle-button-fix
...
Docs Customize toggle button used incorrect selectors
2013-06-12 16:59:40 -07:00
Mark Otto
47f8ba98f3
Merge pull request #8158 from baer/download-button-fix-proper
...
Docs "Customize and Download" button didn't send the correct parameters
2013-06-12 16:59:22 -07:00
Eric Baer
6771be1ced
Docs Customize "Customize and Download" button not working properly
2013-06-12 14:01:59 -06:00
Eric Baer
7f8703ef86
Docs Customize toggle button used incorrect selectors
2013-06-12 12:51:10 -06:00
Mark Otto
d74a9634b0
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-09 23:45:23 -07:00
Mark Otto
9fac2c0467
Update docs JS to prevent clicks on links with hash hrefs
2013-06-09 23:45:14 -07:00
Mark Otto
9ba11ba60a
No more need for grid column highlighting, so nuke that
2013-06-09 23:44:14 -07:00
Mark Otto
0a18d33d2c
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
8b136f5b66
Merge pull request #8080 from mladenplavsic/patch-2
...
Update css.html
2013-06-08 20:53:37 -07:00
Mark Otto
eb21410cc8
add new grid subnav link
2013-06-08 18:36:29 -02:30
Mark Otto
441bbe1998
Another grid update
...
* Update docs to include table of grid levels and behaviors
* Change from .col-md to .col-sm to match existing size variables we use elsewhere
* Keep .col-lg as-is though for simplicity as we won't likely add a fourth level of the grid
* Combine responsive .container breakpoints with grid breakpoints in grid.less
* Other misc docs updates
2013-06-08 18:34:16 -02:30
William Ghelfi
df5ddeb7cc
Set validation states also for addons
2013-06-06 21:00:32 -04:00
Mladen Plavsic
232c03dc2f
Update css.html
...
Missing word "in" in "Someone famous in Source Title"
2013-06-05 13:59:13 +03:00
Mark Otto
b1cc11cd98
reverse order of grid column examples for dual grid section
2013-06-04 21:55:59 -07:00
Mark Otto
567b8b5631
fix docs highlighting of grid
2013-06-03 21:58:58 -07:00
Mark Otto
245ebda651
nuke the .col
2013-06-03 21:57:51 -07:00
Mark Otto
45c5b4e45c
restore .col-*-12 classes for now
2013-06-03 21:51:35 -07:00
Mark Otto
a05f6d4cea
fixes #8066 : add missing % functions to grid less code
2013-06-03 11:58:38 -07:00
Mark Otto
1b8cd2d8eb
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-02 15:51:35 -07:00
Mark Otto
21441f1292
Move the grid offset, push, and pull classes to be tablets-up instead of desktop-up
2013-06-02 15:33:42 -07:00
Robert Burns
97e6e5f150
Fix navbar toggles
2013-06-02 17:51:36 -04:00
Mark Otto
bd170e8366
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-02 14:08:50 -07:00
Mark Otto
ddf95c91db
Merge pull request #8057 from burnsra/3.0.0-wip-getting-started
...
Fix layout for examples in getting-started
2013-06-02 14:08:21 -07:00
Mark Otto
b5095d3e8a
Merge pull request #8046 from burnsra/3.0.0-wip-carousel
...
Fix for carousel indicators
2013-06-02 13:48:18 -07:00
Mark Otto
19d0726609
Grid updates
...
- Removed mixins for generating grid classes
- Thus, we manually declare every grid class, from 1-11 (12th unit is
excluded as that's the same as no grid columns)
- No more need for `.col` base class (yay!)
- Negative indent the rows at tablets and above once again (ugh, still
working through this part)
- Add support for `.col-md` for tablet-specific grid columns
- Still need to figure out offsets, pushes, and pulls on other
devices—right now only available on desktop
2013-06-02 13:38:45 -07:00
Robert Burns
19ce707a00
Fix layout for examples in getting-started
2013-06-02 15:52:51 -04:00
Mark Otto
75db70a6c2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-02 11:57:28 -07:00
Robert Burns
cc684750e5
Fix for carousel indicators
2013-06-01 08:15:40 -04:00
fat
f5ce66177b
fix event binding in modal.js
2013-05-29 11:24:00 -04:00
Mark Otto
8899c30f16
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-27 19:23:17 -07:00
fat
a7a87c8e8c
rebuild
2013-05-27 12:48:16 -07:00
fat
9257bdc097
fixes #7163
2013-05-27 12:45:13 -07:00
Mark Otto
60575dfb46
Gradients refactor
...
* Add start and end support to the horizontal gradient as well
* Change all variables from camelCase to use-dashes
* Better comments in the gradients mixins area
* Update current uses of gradients in dropdowns and carousel to specify only two values by direct assignment of variables
2013-05-25 13:16:15 -07:00
Jacob Thornton
e424b3879c
fixes #4781
2013-05-24 23:53:44 -07:00
Jacob Thornton
f3e45c3778
add show/shown hide/hidden events to dropdown + update dropdown links for testing + catch a few missed namespace things
2013-05-24 23:15:04 -07:00
Robert Burns
79666385f7
Use base padding for input-group-addon class
2013-05-24 08:14:11 -04:00
Mark Otto
3160bd872e
rearrange customizer content
2013-05-23 21:34:32 -07:00
Mark Otto
371d14e217
Remove commented out code and properly nest CSS again for .collapse
2013-05-23 21:06:02 -07:00
Mark Otto
a3cba92edd
rejigger the customizer layout
2013-05-22 23:45:12 -07:00
Mark Otto
acc0875259
fix up customizer js and classes; turn buttons into real buttons
2013-05-22 23:34:28 -07:00
Mark Otto
9868d9403c
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-22 21:51:54 -07:00
Mark Otto
cdcc3e8768
delete customize layout since it's no longer in use
2013-05-22 21:50:25 -07:00
Julian Thilo
52a348aa3f
Bring the customizer up to speed
...
I reworked the customizer to match the new docs layout and include all
newly added variables, etc.
Would be glad to keep an eye on Customize and update it as v3 changes.
Help blocks in my new version need some more work, too, so this is just
a basis.
2013-05-23 02:30:58 +02:00
fat
e7b4fedee8
remove 3rd arg from $.each call
2013-05-22 15:18:30 -07:00
Jacob Thornton
7cbec6e89a
remove jszip files
2013-05-21 19:33:57 -07:00
Jacob Thornton
ccfa989898
upgrade jshint to 2.1.2 for anton <3
2013-05-21 19:31:51 -07:00
AJ Acevedo
9a2218dd38
Fixed broken Customizer link for docs
2013-05-21 02:23:19 -04:00
Mark Otto
0c167a1d9d
Fixes #7474 : Use @input-height-base
in .navbar-vertical-align()
for .navbar-form
2013-05-19 22:12:48 -07:00
Mark Otto
35573db810
Fixes #7611 : fix optgroup formatting for Firefox
2013-05-19 22:06:10 -07:00
Mark Otto
5f7352a6fe
Better grid template; link color change in docs navbar
2013-05-16 22:11:31 -07:00
Mark Otto
5fbb9e9f5d
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
Mark Otto
e94e5e8b40
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 20:54:14 -07:00
Mark Otto
c0f5a0775d
Run make on latest JS
2013-05-16 20:54:06 -07:00
Mark Otto
9762f95bde
Change up link alerts
...
* No more children selectors to set all links in alerts as a special color because buttons and more wrongly inherited color
* Adds .alert-link for easy styling in any alert
2013-05-16 20:53:59 -07:00
fat
abc49c729b
update js docs
2013-05-16 20:42:31 -07:00
Mark Otto
0f4b4acce1
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 20:32:37 -07:00
Mark Otto
8a3e982305
Fix broke dropdown navbar example
2013-05-16 20:29:50 -07:00
fat
2433a076ac
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 20:20:27 -07:00
fat
140ef2320b
change namespace back to dot notation and someother js shizzle
2013-05-16 20:19:51 -07:00
Mark Otto
1983ca03ec
Form validation and horizontal row update
...
* changed .row-label to .control-label as used elsewhere already
* changed .formFieldState mixin to .form-field-validation
2013-05-16 20:17:42 -07:00
Mark Otto
55a1416789
remove prettyprint js mention
2013-05-16 20:07:48 -07:00
Mark Otto
af0b9cb41a
Simple responsive utilities test css
2013-05-16 20:07:41 -07:00
Mark Otto
e5d6a40a77
Redo the responsive utilities stuff
...
* Update docs language
* Enforce display: block; on all utilities for now
* Fix up docs CSS for the tests
2013-05-16 19:13:58 -07:00
Mark Otto
bdd5022833
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 18:46:19 -07:00
Mark Otto
c73588b313
Drop .form-actions
2013-05-16 18:46:12 -07:00
fat
5ab72f7687
fix tooltip defaults
2013-05-16 18:45:53 -07:00
fat
e74110bf4a
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 18:35:18 -07:00
fat
c072b6b2fc
remove dumb assets update makefile wassup
2013-05-16 18:34:51 -07:00
Mark Otto
d8b749a4d3
Fix z-index of carousel indicators
2013-05-16 18:29:53 -07:00
fat
b239542a5e
carousel bug with data
2013-05-16 18:21:42 -07:00
fat
f37b351288
only overlay dropdowns for mobile
2013-05-16 18:15:34 -07:00
fat
a72d0d6e3a
fix tests
2013-05-16 17:44:50 -07:00
Mark Otto
53bc93282f
nuke that docs _site folder
2013-05-16 13:46:12 -07:00
fat
92245e8bc7
change dropdown strategy to use an overlay - fixes mobile click anywhere + allows for firefox middle click
2013-05-16 12:50:06 -07:00
fat
a4c16155a2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
Makefile
docs/_site/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.min.js
docs/customize.html
docs/docs.html
2013-05-16 11:08:46 -07:00
fat
14651035de
a bunch javascript junk
2013-05-16 11:06:30 -07:00
Mark Otto
f3d8577734
Run make on previous commit; twerk box shadow back to commented out version
2013-05-15 10:16:11 -07:00
Mark Otto
6307dc40d7
Fixes #7898 : ensure button type
...
Sets `type="button"` on all buttons in the docs
2013-05-15 10:01:09 -07:00
Mark Otto
31dcb91189
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
docs/assets/css/docs.css
2013-05-14 23:28:09 -07:00
Mark Otto
57856e6cfb
Merge pull request #7877 from burnsra/3.0.0-wip-form-inline
...
Cleanup form-inline examples in docs
2013-05-14 23:26:35 -07:00
Mark Otto
fcb7c9da6f
Fixes #7878 : .col-span-* mentions to .col-lg-*
2013-05-14 23:24:29 -07:00
Mark Otto
28a081cb20
Overhaul form control and button sizing, and some type styles
...
* New padding approach with separate horizontal and vertical padding
variables
* Improved sizing in large and small buttons and form controls
* Dropped the `.btn-mini` (since we have no `.input-mini` to match, and
holy fuck those were small buttons)
* Dropped the `.pagination-mini` as well because once again, to hell
with such small components
* Changed `@line-height-headings` to `@headings-line-height`
* Removed the `@headings-font-family` because it was honestly kind of
useless
2013-05-14 23:21:30 -07:00
Mark Otto
a41d566d5e
margin on bottom of navbar nav by default, also round links in mobile views (unround in desktop)
2013-05-14 22:08:56 -07:00
Mark Otto
e56c809492
refined navbar styles in docs
2013-05-14 22:08:32 -07:00
Mark Otto
7e674efa22
outdent the file list
2013-05-14 22:00:08 -07:00
Mark Otto
0ac1af13d3
Merge pull request #7882 from juthilo/3.0.0-wip
...
Cleaning the navbar docs
2013-05-14 19:43:59 -07:00
Mark Otto
e23f661f3f
Fixes #7885 and #7886 : only right align horizontal form labels when above 768px
2013-05-14 18:59:13 -07:00
Mark Otto
1d8ff36afa
Add .panel-footer
2013-05-14 18:55:37 -07:00
Julian Thilo
cd2d7b5d17
add detail to navbar component alignment section
...
* The search form has been deprecated.
* Using pull-* on a list item won't have any effect.
2013-05-14 22:42:06 +02:00
Julian Thilo
9af88380c4
.navbar docs: update -fixed-* callouts, fix -link
...
* The navbar is now always 50px high, so no need for that nasty padding
code block anymore.
* The new proposed body padding value also reflects the default navbar's
margin-bottom.
* Fixed the navbar-link example positioning (missing .navbar-text).
2013-05-14 22:31:15 +02:00