Mark Otto
61ac20ebb5
Merge branch '3.0.0-wip' of https://github.com/salman-javed-confiz/bootstrap into salman-javed-confiz-3.0.0-wip
2013-07-24 16:42:13 -07:00
Mark Otto
a36f444c25
Merge pull request #8583 from liuyl/disabled
...
set cursor to not-allowed for disabled elements
2013-07-24 16:32:25 -07:00
Mark Otto
c63489def3
run make on prev commits
2013-07-24 16:28:34 -07:00
liuyl
7e9532dabe
set cursor to not-allowed for disabled elements
2013-07-24 17:10:27 +08:00
Salman Javed
0caab585f5
issues fixed for nav-justified on pills on android default browser.
2013-07-24 13:39:16 +05:00
Jacob Thornton
930c75e5dd
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-23 23:51:18 -07:00
Jacob Thornton
217eb988b8
add placement auto for tooltips + tests… kinda sad about this doe
2013-07-23 23:50:23 -07:00
Mark Otto
8540515eeb
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-23 23:48:32 -07:00
Mark Otto
18157e9f39
Run make on prev commits
2013-07-23 23:48:17 -07:00
Jacob Thornton
3cfa1c8a30
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
dist/js/bootstrap.min.js
2013-07-23 22:59:33 -07:00
Jacob Thornton
6841c50968
fixes #7814
2013-07-23 22:59:09 -07:00
Mark Otto
1d1bd62598
Fixes #8571 : allow table classes in thead and tfoot
2013-07-23 22:27:49 -07:00
Mark Otto
a346ea2a1a
make on prev commit
2013-07-23 21:23:13 -07:00
Jacob Thornton
faa00629c4
add additional carousel test
2013-07-23 18:56:00 -07:00
Jacob Thornton
f1009c19b3
revert collapse change + add emulateTransitionEvent to catch dead css transitions
2013-07-23 18:44:08 -07:00
Jacob Thornton
7b12a0dcbc
fixes #7970
2013-07-23 17:23:02 -07:00
Mark Otto
4cec956e0c
Drop rounded corners on .table-bordered
...
* Cuts close to 100 lines of CSS from the table CSS
* File size aside, this drastically simplifies CSS for folks looking to
build on top of the `.table-bordered` option as a starting point
2013-07-23 10:48:30 -07:00
Mark Otto
b5f2482a58
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
dist/css/bootstrap.min.css
2013-07-23 10:19:04 -07:00
Mark Otto
8aa3c375f0
No more left margin on dd elements, fixes #8567
2013-07-23 10:18:34 -07:00
Francis Brunelle
4b9cacae91
@badge-bg should be @gray-light not #f5f5f5
2013-07-23 00:05:45 -04:00
Mark Otto
12468c6103
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
dist/css/bootstrap.min.css
2013-07-21 08:52:25 -07:00
liuyl
be2693369d
remove useless display:inline-block
2013-07-21 19:44:30 +08:00
Mark Otto
a63db4d2f9
Update file input to remove height and line-height
...
This particular form control is wildly inaccurate across browsers, so
we're removing the `height` and `line-height`, but adding `display:
block` so it renders similarly to our other inputs.
2013-07-20 21:09:03 -07:00
Mark Otto
732e4196fb
Remove commented out CSS
2013-07-20 19:31:56 -07:00
Mark Otto
4b7f63a3a2
Update vars for badges, breadcrumbs; update customize page
2013-07-20 00:03:08 -07:00
Mark Otto
b6238c5f20
Fixes #8385 : update carousel captions
...
* No longer hidden by default--up to users to figure that part out with
longer content
* Cleaned up styles and spacing
2013-07-19 17:36:03 -07:00
Mark Otto
95b9f44190
Fixes #8278 : fix on print
2013-07-19 16:49:38 -07:00
Mark Otto
4b0fa356f3
Variables reorganization and breadcrumbs update
...
* Place component vars alongside the rest of the component vars
* Redo some of the breadcrumbs code to add a var and remove
`text-shadow`
2013-07-19 11:44:35 -07:00
Mark Otto
e440ff4b3f
<input> and <select> sizing update
...
Restores `font-size` and more to the `<select>` element while also
changing from `min-height` to `height` for input sizing.
Fixes #8520 as opened by @ShaunR (would've merged that PR but I moved
everything around right before).
2013-07-18 19:53:32 -07:00
Mark Otto
0a3722112c
Add minified CSS to dist folder
2013-07-18 18:33:20 -07:00
Mark Otto
f771bf140d
Merge branch 'bs3_rc1' into 3.0.0-wip
2013-07-18 18:16:50 -07:00
Mark Otto
7bb8817947
finish flattening repo structure; add dist folder of compiled css/js
2013-07-18 18:14:49 -07:00
