0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Commit Graph

6939 Commits

Author SHA1 Message Date
Chris Rebert
b80f58b336 run grunt dist 2013-09-23 22:34:36 -07:00
Mark Otto
9ce142ca12 Merge pull request #10768 from twbs/polaroid-thumbnail-docs
fix #10767; current .img-thumbnail is equivalent to old .img-polaroid
2013-09-23 19:10:38 -07:00
Mark Otto
62c9199dc5 Merge pull request #10770 from twbs/rename-assets
move /assets/ to /docs-assets/ ; fixes #10715
2013-09-23 19:08:50 -07:00
Mark Otto
5911d95d69 Merge pull request #10769 from twbs/deprecate-hide
deprecate .hide; fixes #10446
2013-09-23 19:08:01 -07:00
Chris Rebert
f503efc490 avoid using the term "assets" due to potential confusion 2013-09-23 13:02:33 -07:00
Chris Rebert
8aa5181126 move /assets/ to /docs-assets/ ; fixes #10715 2013-09-23 13:02:26 -07:00
Chris Rebert
c4e7e3c933 deprecate .hide; fixes #10446 2013-09-23 12:46:57 -07:00
Chris Rebert
29935e4e26 fix #10767; current .img-thumbnail is equivalent to old .img-polaroid 2013-09-23 12:06:33 -07:00
Chris Rebert
229469e059 Merge pull request #10763 from XhmikosR/html5shiv
Update html5shiv to v3.7.0.
2013-09-23 09:03:16 -07:00
XhmikosR
d675e82e50 Update html5shiv to v3.7.0. 2013-09-23 16:51:49 +03:00
Mark Otto
8a181a1388 Merge pull request #10695 from FredericoC/fix-nav-active-caret
Fixed issue where caret wouldn't inherit "active" li style on nav-pills
2013-09-22 16:53:01 -07:00
Mark Otto
5b12736fb7 Merge pull request #10741 from ZDroid/patch-1
Avoid LESS nesting if isn't needed
2013-09-22 07:25:33 -07:00
Mark Otto
ed44a3255c Merge branch 'master' of github.com:twbs/bootstrap 2013-09-22 09:20:15 -05:00
Mark Otto
000b445a04 Fixes #10755: Don't remove quotes around q element by default 2013-09-22 09:19:37 -05:00
Chris Rebert
88854a83d1 Merge pull request #10749 from ZDroid/patch-2
@headingsColor → @headings-color
2013-09-21 14:19:21 -07:00
Zlatan Vasović
dc3d16648c @headingsColor → @headings-color 2013-09-21 14:19:11 +02:00
Mark Otto
86ec05793a Merge pull request #10693 from twbs/include-docs-license
include a copy of the CC-BY 3.0 License that the docs are under
2013-09-20 22:14:57 -07:00
Chris Rebert
68c6deebda fix #10737 2013-09-20 11:49:32 -07:00
Chris Rebert
d8ba5989cd Merge pull request #10743 from hnrch02/patch-1
Fix a silly typo
2013-09-20 10:49:13 -07:00
Heinrich Fenkart
c938c4438f Fix a silly typo 2013-09-20 19:43:47 +02:00
Zlatan Vasović
2304ba6a25 Avoid LESS nesting if isn't needed 2013-09-20 18:06:48 +02:00
Mark Otto
e148923f27 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.min.css
2013-09-19 22:57:11 -05:00
Mark Otto
ef636bd62d Fixes #10694: Remove unnecessary content property from .caret 2013-09-19 22:56:17 -05:00
Mark Otto
22d308b2c1 Merge pull request #10724 from ZDroid/patch-1
white → #fff
2013-09-19 17:20:47 -07:00
Chris Rebert
607b802d2f fix #10732 2013-09-19 15:49:53 -07:00
Zlatan Vasović
73403b78cc white → #fff 2013-09-19 16:41:06 +02:00
Chris Rebert
abad169f4b Merge pull request #10710 from XhmikosR/patch-2
Patch 2
2013-09-18 23:44:56 -07:00
XhmikosR
0379c2056d Update jszip.js to the latest git. 2013-09-19 09:27:09 +03:00
XhmikosR
b741608964 Show minification report for uglify-js. 2013-09-19 08:33:52 +03:00
Chris Rebert
5deee652f9 Merge pull request #10703 from XhmikosR/sort
Sort by name.
2013-09-18 13:15:18 -07:00
XhmikosR
3c0489102e Sort by name. 2013-09-18 20:36:17 +03:00
Chris Rebert
68099ec275 Merge pull request #10682 from gordonwoodhull/master
Suggest documenting changes to plugin classes
2013-09-18 09:54:41 -07:00
Chris Rebert
1882d15db8 Merge pull request #10680 from XhmikosR/master
Update normalize to v2.1.3.
2013-09-18 09:38:14 -07:00
Gordon Woodhull
40d3e4c48b merge plugin changes into main table 2013-09-18 07:44:56 -04:00
XhmikosR
45b6c6de46 Run grunt dist. 2013-09-18 08:14:39 +03:00
XhmikosR
60afea85b4 less/mixins.less: tabs to spaces. 2013-09-18 08:14:19 +03:00
XhmikosR
0cd6d35058 Update normalize to v2.1.3. 2013-09-18 08:05:34 +03:00
Frederico Carvalho
29f24f746c corrected caret colour when a nav dropdown is open 2013-09-18 14:45:56 +10:00
Frederico Carvalho
b1208f380a fixed issue where caret wouldn't inherit "active" li style on nav-pills, which caused the caret to stay blue 2013-09-18 14:31:52 +10:00
Chris Rebert
0de96b8f35 include a copy of the CC-BY 3.0 License that the docs are under
downloaded from http://creativecommons.org/licenses/by/3.0/legalcode.txt
2013-09-17 18:58:15 -07:00
Chris Rebert
4e962c572e fix #10692 2013-09-17 17:41:58 -07:00
Gordon Woodhull
abee1cdf9d a start at documenting plugin class changes 2013-09-17 12:03:02 -04:00
Mark Otto
f2750dd6bc Merge pull request #10626 from buob/variablize-nav-pill-border-radius
Variablize nav pill border radius
2013-09-16 22:00:39 -07:00
Mark Otto
21486ffad8 Merge pull request #10641 from ggam/remove-accordion
Removed unneeded 'accordion-toggle' class from collapse examples
2013-09-16 21:53:27 -07:00
Mark Otto
02423caa85 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-16 21:49:12 -07:00
Mark Otto
bf47968d9c Merge pull request #10655 from Soben713/master
Remove unnecessary semicolons
2013-09-16 21:49:01 -07:00
Mark Otto
63d1d09ebd run grunt 2013-09-16 21:43:55 -07:00
Mark Otto
8f43820fff Merge branch 'master' of github.com:twbs/bootstrap 2013-09-16 21:42:43 -07:00
Mark Otto
515e11da32 Merge pull request #10663 from lipis/patch-1
Changed the border-color of .navbar-form to @navbar-default-border
2013-09-16 20:36:04 -07:00
Mark Otto
c14fe7904a Merge branch 'master' of github.com:twbs/bootstrap 2013-09-16 18:59:06 -07:00