root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
8,981 Commits 112 Branches 92 Tags 672 MiB
Commit Graph

3976 Commits

Author SHA1 Message Date
Mark Otto b4f4c7b16f Fixes #13037: add text-align: left; to prevent alignment change in dropdowns 2014-03-24 20:02:56 -07:00
Mark Otto 6951b48e65 grunt 2014-03-24 20:01:46 -07:00
Mark Otto bc250fb1e7 grunt 2014-03-24 19:41:20 -07:00
Mark Otto ce013440e7 grunt 2014-03-24 19:31:12 -07:00
Mark Otto 6f6bce5944 Fixes #13141: Add a max-width: 100%; to label elements so IE8 wraps text 2014-03-24 19:26:41 -07:00
Mark Otto 5c2a9fc9c3 Fixes #13158: add link to nonresponsive docs in the example 2014-03-24 19:13:29 -07:00
Mark Otto c6648d58f0 grunt 2014-03-24 19:09:30 -07:00
Mark Otto 8198bbad2a Merge branch 'master' of github.com:twbs/bootstrap 2014-03-24 19:08:17 -07:00
Mark Otto 21084192b6 Fixes #13079: Scope .open class in button variant mixin to immediate children 2014-03-24 19:08:05 -07:00
Zlatan Vasović 8ae48183b2 Fix #13138: use underscore prefix to ignore directories 2014-03-24 21:47:59 +01:00
XhmikosR 4f9270cc20 Switch to `icon` instead of `shortcut icon` to fix the HTML validation tests. 2014-03-24 09:28:40 +02:00
Mark Otto 2b27006c71 Merge pull request #12328 from benogle/bo-tooltip-adjust 
Add tooltip `viewport` option, respect bounds of the viewport
 2014-03-23 11:41:28 -07:00
XhmikosR 4fb1fdbf74 Update JSZip to v2.2.0. 2014-03-23 08:10:00 +02:00
Ben Ogle 8534e12523 Add tooltip `viewport` option, respect bounds of the viewport 2014-03-21 11:28:13 -07:00
Chris Rebert a7bc66fc20 Merge pull request #13101 from twbs/ie8-responsive-file-warning 
Move ie8-responsive-file-warning.js one dir up.
 2014-03-20 01:22:53 -07:00
Chris Rebert 0dc88edeb9 grunt dist 2014-03-20 01:16:01 -07:00
Mark Otto dc2b24e626 Merge pull request #13095 from twbs/translation_data 
Generate Translations list from YAML
 2014-03-18 15:55:09 -07:00
Lewis Cowper 4e2b92f310 [trivial] Updated dates 2014-03-18 00:18:01 +00:00
Julian Thilo 1b15cefa5c Generate Translations list from YAML 2014-03-17 21:55:39 +01:00
XhmikosR 1e41df6b69 Move ie8-responsive-file-warning.js one dir up. 
This is a regression of d08bbdc6ec.
 2014-03-17 17:49:27 +02:00
Julian Thilo d52ad3ee3b Separate JS includes for alerts and popovers 
/cc @mdo
 2014-03-17 15:58:03 +01:00
Chris Rebert 4df96c768f fix description of <mark> 
#12956 errata
 2014-03-17 03:15:27 -07:00
Chris Rebert eea9eabb83 fix <mark> raw source to match live example 
#12956 errata
 2014-03-17 03:12:03 -07:00
Chris Rebert 4d859d177a copyedit responsive-embed.html 2014-03-17 03:04:37 -07:00
Chris Rebert cb3f3926d7 Mozilla is trying to fix the <input> line-height bug; Yay! 
See https://bugzilla.mozilla.org/show_bug.cgi?id=697451#c43
 2014-03-17 01:53:20 -07:00
Chris Rebert e87c272ab4 more precise description of browser bug 2014-03-17 01:49:32 -07:00
Chris Rebert 910ff24b4b regenerate customize.min.js 2014-03-16 22:37:32 -07:00
Chris Rebert 1ff6d33aa8 use @ssorallen's blob support test in customizer; fixes #12617 2014-03-16 22:37:31 -07:00
Mark Otto b3f30bb70e grunt 2014-03-16 20:46:00 -07:00
Mark Otto 43cf003f9a Update gruntfile to point to new customizer nav, run grunt 2014-03-16 20:40:30 -07:00
Mark Otto b004c9ac39 Rename and organize nav partials for cleaner file structure 2014-03-16 19:32:08 -07:00
Mark Otto b7ab799824 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/js/bootstrap.min.js
	docs/dist/js/bootstrap.min.js
 2014-03-16 19:06:17 -07:00
Mark Otto 2a43e7e78a Break up docs into includes 2014-03-16 19:03:53 -07:00
fat dd7cab84f6 build 2014-03-16 18:44:58 -07:00
Mark Otto bdb70fa471 Fixes #13055: Mention outdenting more 2014-03-16 15:54:28 -07:00
Mark Otto 96344acb31 Merge branch 'master' of github.com:twbs/bootstrap 2014-03-16 15:42:25 -07:00
Zlatan Vasović 17812b450c Add missing blank line 2014-03-15 22:40:51 +01:00
Mark Otto d787cffc5a relative not absolute 2014-03-15 14:39:56 -07:00
Mark Otto acd8ba5816 Merge pull request #13039 from twbs/dropdown-pull-right-deprec 
comply with .dropdown-menu.pull-right deprecation in docs
 2014-03-12 15:58:19 -07:00
XhmikosR d4a4bbb729 Update dependencies. 2014-03-12 20:22:22 +02:00
Chris Rebert 4c76c79213 comply with .dropdown-menu.pull-right deprecation in docs 2014-03-12 10:19:52 -07:00
Mark Otto b136d42ba5 Merge pull request #13024 from twbs/role-alert 
add role="alert" to Alert examples, to improve accessibility
 2014-03-12 10:18:07 -07:00
Chris Rebert 08f470ea68 rework docs copy: inputs-without-labels are likely the more common case 2014-03-12 10:11:02 -07:00
Chris Rebert 4277ba62d3 add role="alert" to Alert examples, to improve accessibility 
Per d8fcbcd3fe/README.md (alert)
 2014-03-11 19:41:54 -07:00
XhmikosR f750f7e448 Run usebanner before cssmin. 2014-03-11 19:49:11 +02:00
ORiON- 3ea69a16f9 Fixed typo at docs/examples/rtl/index.php 
The filename generated at dist/css/ called 'bootstrap-rtl.min.css'.
 2014-03-11 18:42:49 +02:00
Mark Otto 6f13a14e4b moar grunt 2014-03-10 16:51:53 -07:00
Mark Otto 74c391b9ad Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/customize.min.js
	docs/dist/css/bootstrap.css.map
 2014-03-10 16:43:01 -07:00
Mark Otto a83ca38713 Fixes #13003: Move padding on radio and checkbox options from the surrounding div to the label to remove the no-click deadzone caused by negative margin 2014-03-10 16:41:56 -07:00
Mark Otto 552f170e3c even more grunt 2014-03-10 13:31:34 -07:00
Mark Otto 3fb5d0bbac Merge branch 'master' into modular-the-mixins 2014-03-10 13:21:56 -07:00
Julian Thilo 6234ba561a Merge pull request #13002 from ZDroid/hash 
Add missing customizer comment
 2014-03-10 11:08:56 +01:00
Zlatan Vasović 1a417357ad Add missing customizer comment 2014-03-10 08:35:50 +01:00
Mark Otto a36643dd33 Merge branch 'master' into modular-the-mixins 
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
 2014-03-10 00:08:29 -07:00
Mark Otto 564b79ca87 grunt 2014-03-09 23:58:29 -07:00
mrmrs 38d0908aff Add recompiled assets after nuking toc in mixins.less. 2014-03-09 23:51:38 -07:00
mrmrs b0bc9ef815 Add consistent newline at end of files in less/mixins 2014-03-09 23:44:11 -07:00
mrmrs 2f380a9683 Merge branch 'master' into modular-the-mixins 
* master:
  Replace some images on the Carousel example with some base64 encoded 1x1 gifs
  ugh grunt
  moar grunt
  mo copy
  http://www.youtube.com/watch?v=AJWtLf4-WWs
  grunt
  Copy change
  fix grammar in comment in forms.less
  Fixes #12759
  Fixes #12738
  replace .visible-{size} with .visible-{size}-{display} ; fixes #8869

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	less/mixins.less
 2014-03-09 23:28:08 -07:00
mrmrs 348b7de7f7 Break mixins.less up into smaller modules. 
Move all deprecated vendor prefix mixins to less/mixins/vendor-prefixes.less
Create mixins directory and move partials to that directory.

FIXES #12994
 2014-03-09 23:18:48 -07:00
Mark Otto e727973d8c Merge pull request #12204 from twbs/fix-8869 
replace .visible-{size} with .visible-{size}-{display}
 2014-03-09 22:48:57 -07:00
Mark Otto 309ef72ef4 Replace some images on the Carousel example with some base64 encoded 1x1 gifs 2014-03-09 22:38:13 -07:00
Mark Otto a7b0fa7ebf ugh grunt 2014-03-09 22:28:29 -07:00
Mark Otto 213860408e moar grunt 2014-03-09 22:19:02 -07:00
Mark Otto 72837b11e3 mo copy 2014-03-09 22:10:58 -07:00
Mark Otto 7bef778c48 http://www.youtube.com/watch?v=AJWtLf4-WWs 2014-03-09 22:06:51 -07:00
Mark Otto 30deb5697c grunt 2014-03-09 22:06:14 -07:00
Mark Otto 76883ff9b4 Copy change 2014-03-09 22:06:12 -07:00
Mark Otto ccb17f110d Merge branch 'master' into fix-8869 2014-03-09 22:01:38 -07:00
Mark Otto a15c24410b Fixes #12759 
Ensures proper sizing and alignment of input groups within inline and
navbar forms.

* Uses `inline-table` on the input group
* Nukes the widths to `width: auto`—without this, the parent input
group doesn’t size correctly and functions as `display: table;` or
`block`
 2014-03-09 21:25:51 -07:00
Mark Otto b4d66b7f6b Fixes #12738 
* Removes default max-height from .navbar-collapse (so not every navbar
will get a max-height collapse section)
* Scopes regular 340px max-height to fixed top and bottom navbars only
(those are the only ones that really need a max-height to enable
scrolling)
* Adds a landscape media query for phones to cap the max-height at
200px for fixed navbars"
 2014-03-09 20:45:32 -07:00
Mark Otto 1a5fb4ef24 Fixes #12843: Scope label styles for horizontal forms to a media query so their narrow viewport display looks just like a normal form 2014-03-09 17:22:52 -07:00
Mark Otto 2f955907f9 Fixes #12669: Properly reset line-height on date inputs for all sizes; Fix IE8+'s misaslignment of text within date inputs 2014-03-09 17:12:39 -07:00
Mark Otto b69e4d636a Reorganize mixins and G R U N T 2014-03-09 16:50:30 -07:00
mrmrs 0b415c6099 Merge branch 'master' into mixin-table-of-contents 
* master:
  Fix bad grunt merge and then G R U N T
  Reorder the Gruntfile a bit
  Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube
  Remove unneeded quotes.
  Rename generateRawFilesJs to generateRawFiles
  Remove redundant parens

Conflicts:
	docs/assets/js/raw-files.min.js
	test-infra/npm-shrinkwrap.canonical.json
 2014-03-09 16:40:40 -07:00
mrmrs 71e9902d9a Adjusts some section titles to be more explicit. 
FIXES #12992
 2014-03-09 16:25:27 -07:00
Mark Otto 4883605624 Fix bad grunt merge and then G R U N T 2014-03-09 16:15:53 -07:00
mrmrs fc74ee5f67 Changes compiled assets after changing mixins.less 2014-03-09 16:15:35 -07:00
XhmikosR 68b3e3f3be Merge pull request #12986 from twbs/unneeded-quotes 
Remove unneeded quotes.
 2014-03-10 01:07:14 +02:00
Mark Otto aacafb2d5c Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube 2014-03-09 16:03:46 -07:00
Mark Otto 15d4494038 Moves IE8 justified button border mention to docs section, not the browser bugs page /cc @cvrebert 2014-03-09 15:32:36 -07:00
Mark Otto 4d870af2aa Fixes #12487: Document required use of position relative for scrollspy 2014-03-09 15:19:26 -07:00
Mark Otto ce634a0ba7 Document shitty situation of multiple .navbar-right classes in #12951 2014-03-09 14:49:52 -07:00
Mark Otto 9920251ca8 Document #12476 bug in the wall of bugs 2014-03-09 14:17:18 -07:00
Mark Otto 27da9728bc grunt 2014-03-09 13:50:55 -07:00
Mark Otto d8bc65b9d0 Merge branch 'master' into sr-only-focusable 2014-03-09 12:32:13 -07:00
XhmikosR 9d027d2bee Remove unneeded quotes. 2014-03-09 11:10:52 +02:00
Mark Otto 54b35d00a4 document position relative firefox bug; cleanup some stuff in the browser bugs page 2014-03-08 20:53:16 -08:00
Mark Otto ef5d8e98e2 Merge branch 'master' into sr-only-focusable 
Conflicts:
	dist/css/bootstrap.css
 2014-03-08 20:34:29 -08:00
Mark Otto b8ab0c66ac grunt 2014-03-08 20:03:31 -08:00
fat 4d96e69a55 fixes #9836 2014-03-08 19:45:38 -08:00
Mark Otto 74aab91671 grunt 2014-03-08 19:32:40 -08:00
fat e9cced72fd fix #9342 2014-03-08 19:20:47 -08:00
Mark Otto 4b6e1b6754 grunt dist 2014-03-08 17:40:58 -08:00
Mark Otto 7c3881086f Fix comment 2014-03-08 17:11:48 -08:00
Mark Otto bcfb27b962 grunt 2014-03-08 16:11:24 -08:00
Mark Otto 03701b8d4b Fixes #12966: Ensure icon font vars are loaded into Customizer 2014-03-08 15:32:24 -08:00
Mark Otto 67c747a109 grunt 2014-03-08 15:30:18 -08:00
Mark Otto 30bbab06d8 Merge pull request #12962 from BBosman/transitions-count 
Add transition-timing-function mixin to docs
 2014-03-07 14:52:41 -08:00
Chris Rebert 0d0cbb87ee rm #1969 from browser bugs list per outcome of investigation 2014-03-07 11:08:05 -08:00
Zlatan Vasović d08bbdc6ec Reorganize docs assets 2014-03-07 17:37:23 +01:00