2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00
Commit Graph

6346 Commits

Author SHA1 Message Date
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 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
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
Chris Rebert af75dca908 update grunt-html-validation output file ignores 2013-08-19 14:23:07 -07:00
fat e8a1df5f06 remove dumb validation reports v3.0.0 2013-08-19 14:18:20 -07:00
fat b6ddaf63d6 fix customizer 2013-08-19 14:16:52 -07:00
Mark Otto f95ab89fb1 really do the raw liquid tag 2013-08-19 13:58:29 -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