clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-27 05:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,428 Commits 116 Branches 89 Tags 631 MiB
0d49920e0d
Commit Graph

3696 Commits

Author SHA1 Message Date
Mark Otto
0d49920e0d Fixes #12610: Better and more consistent prefixing of docs CSS with .bs-docs- 2014-02-08 23:24:38 -08:00
Mark Otto
769339ed18 grunt dist 2014-02-08 17:30:40 -08:00
Mark Otto
44bb7b20c7 Fixes #12625: Only remove first list group item's top and last list group item's bottom borders when the list group is first or last 2014-02-08 17:29:10 -08:00
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
7f88009394 grunt 2014-02-08 16:43:58 -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