0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-05 17:24:20 +01:00
Commit Graph

2390 Commits

Author SHA1 Message Date
Mark Otto
bf6cdff88a vertical align middle on images, run make to rebuild 2012-03-11 13:48:47 -07:00
Mark Otto
ffbed0980c Merge branch 'Gavrisimo-patch-1' into 2.0.2-wip 2012-03-11 13:48:30 -07:00
Mark Otto
ad1e9697ae update grid system mixins in less docs for new grid 2012-03-11 13:48:04 -07:00
Mark Otto
e8ef7d5e7b tweak button sizes on homepage 2012-03-11 00:06:48 -08:00
Mark Otto
349bdc12a7 ensure right align dropdown example doesn't go all the way off page 2012-03-10 18:15:28 -08:00
Mark Otto
635ee36e11 fix gradient mixins by escaping them, add notes on progress bars 2012-03-10 18:03:59 -08:00
Mark Otto
6e72760de5 fix js typo per #2471 2012-03-10 17:38:09 -08:00
Mark Otto
6a2c519152 Merge pull request #2503 from maxbublik/patch-1
ignore Apple Double files
2012-03-10 16:23:52 -08:00
Mark Otto
5de8b277c6 add vars for navbar search 2012-03-10 16:21:34 -08:00
Mark Otto
a3e9fc547c clean up search form in navbar, add new variable for placeholder text color 2012-03-10 16:15:54 -08:00
Mark Otto
f4ac080f9e fix #2510, docs typo 2012-03-10 16:06:56 -08:00
Mark Otto
1dbb942d5b massive update to customize page to include all the new variables (and ensure they're being used in the .less files) 2012-03-10 16:01:06 -08:00
Mark Otto
95a3cd8732 simplify notes around using button dropdowns 2012-03-10 15:41:41 -08:00
Mark Otto
cecfe72060 remove unused images, update examples to include soundready 2012-03-10 15:37:28 -08:00
Mark Otto
145a36323c add new example site thumbnail 2012-03-10 15:15:13 -08:00
Mark Otto
9c1d8e032b change title attr to re-include twitter 2012-03-10 15:14:54 -08:00
Mark Otto
700457c62a remove unused example diagrams 2012-03-10 15:09:35 -08:00
Mark Otto
67aa00d0bb make pre font-size a percentage of @baseFontSize 2012-03-10 14:36:58 -08:00
Mark Otto
aef230d40a fix typo per #2494 2012-03-10 14:20:46 -08:00
Mark Otto
f7d4fb61ce Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-10 14:12:29 -08:00
Mark Otto
dd5cffc308 add button sizes to docs for button dropdowns, clean up styles for them 2012-03-10 13:40:58 -08:00
Mark Otto
c7eb1ab49a make nav padding and negative margins the same 2012-03-10 13:24:46 -08:00
Jacob Thornton
a07851d6af stop doing oldschool escape substitution 2012-03-10 13:01:17 -08:00
Jacob Thornton
04851652db rebuild with latest grid changes - need 1.3 to build! 2012-03-10 12:45:09 -08:00
Jacob Thornton
1fd5e55881 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
2012-03-10 12:42:39 -08:00
Jacob Thornton
1a8d7576e0 Merge branch 'new_grid' into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	less/mixins.less
2012-03-10 12:41:41 -08:00
Maxim Pshenichnikov
922b5fba53 ignore Apple Double files 2012-03-11 00:11:03 +04:00
Mark Otto
9ebc6b4c97 simplify buttons docs section by changing a buttons to button elements 2012-03-10 11:37:34 -08:00
Mark Otto
5d961eaeb3 rebold headings 2012-03-10 11:29:57 -08:00
Mark Otto
f4e879a936 fix the font-family var by using inherit instead of empty string, fix font-weight in docs for jumbotron 2012-03-10 11:27:07 -08:00
Mark Otto
c414e57dcc Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-10 11:23:47 -08:00
Mark Otto
305374ab1a clear up nav variables 2012-03-10 11:23:05 -08:00
Jacob Thornton
b410eeb6dd Merge pull request #2480 from jonathanmaron/master
fat
2012-03-09 11:12:45 -08:00
Milos Gavrilovic
3ff78d138a Add vertical-align: middle; to img elements
More info: h5bp.com/i/440
2012-03-09 14:52:50 +01:00
Jonathan Maron
aa8e6b081c Fixed double copy action in Makefile. 2012-03-09 07:38:14 +01:00
Luke Thomas
1cc1852a9a added ability to set custom colors for popover arrow mixin 2012-03-08 19:02:29 -06:00
Jacob Thornton
1562381114 remove non existent dist dir from phony makefil 2012-03-08 11:42:12 -08:00
Jacob Thornton
af1dbf6581 rebuild 2012-03-08 11:39:50 -08:00
Jacob Thornton
d3721c504e Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-03-08 11:39:33 -08:00
Jacob Thornton
bcef12dfcc add version to min js 2012-03-08 11:39:00 -08:00
Jacob Thornton
26e683f1d0 Merge pull request #2177 from phopkins/typeahead_friendly
[2.0.2-wip] Typeahead friendly
2012-03-08 11:14:56 -08:00
Jacob Thornton
426feeef6a give pages custom titles based on names 2012-03-08 11:09:33 -08:00
Mark Otto
203d75770c Merge pull request #2449 from burningTyger/master
Examples typo
2012-03-07 11:02:15 -08:00
burningTyger
d0120c94a0 fix for typo 2012-03-07 15:38:12 +01:00
Mark Otto
933136d382 Merge pull request #2443 from tarsis/master
uglify-js install information in compiling section at less.html. Improve issue #1756 in 2.0.2 wip
2012-03-06 21:44:34 -08:00
Mark Otto
a613a8ebd0 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-03-06 21:16:57 -08:00
Mark Otto
27c3d5a90b Merge pull request #2436 from gruvii/2.0.2-wip
Add new headings vars to type.less
2012-03-06 21:16:40 -08:00
Mark Otto
69e4522a4e set font-family for inputs and such via basefontfamily 2012-03-06 21:13:29 -08:00
Mark Otto
6b9f70797d adding well sizes 2012-03-06 21:12:43 -08:00
Mark Figueredo
03bdf82ca2 Added use of new headings variables. 2012-03-06 16:45:43 -05:00