Mark Otto
|
490eb1bd16
|
fix #3068: compile after changing comment
|
2012-04-14 20:56:50 -07:00 |
|
Mark Otto
|
3bc7553f66
|
Merge branch 'au-phiware-patch-1' into 2.0.3-wip
|
2012-04-14 20:56:13 -07:00 |
|
au-phiware
|
16855b920e
|
Silence comment (just like the others)
|
2012-04-15 12:31:07 +10:00 |
|
Mark Otto
|
fc7ae48c95
|
fix #1823: styles of tabs within other tabs resolved
|
2012-04-14 18:47:27 -07:00 |
|
Mark Otto
|
def7ae7798
|
bump version on docs homepage to 2.0.3
|
2012-04-14 18:30:43 -07:00 |
|
Mark Otto
|
4bcb89946b
|
merge in #2684, offset on the .makeColumn mixin
|
2012-04-14 18:18:11 -07:00 |
|
Mark Otto
|
d8acc062c1
|
Merge branch 'gruvii-patch-2' into 2.0.3-wip
|
2012-04-14 18:11:40 -07:00 |
|
Mark Otto
|
2486033754
|
Merge branch 'patch-2' of https://github.com/gruvii/bootstrap into gruvii-patch-2
|
2012-04-14 18:11:31 -07:00 |
|
Jacob Thornton
|
82267d48ff
|
calling pause on a slide should actually pause it - even when hovering
|
2012-04-14 17:49:51 -07:00 |
|
Jacob Thornton
|
34132f0e89
|
rebuild
|
2012-04-14 17:19:00 -07:00 |
|
Mark Otto
|
ce30d19c15
|
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
docs/assets/bootstrap.zip
|
2012-04-14 17:16:37 -07:00 |
|
Mark Otto
|
dbde2dc9e4
|
adding icon classes to finish off glyphicons 1.6 update
|
2012-04-14 17:15:16 -07:00 |
|
Jacob Thornton
|
3408064d00
|
hack for subnav
|
2012-04-14 17:15:03 -07:00 |
|
Mark Otto
|
d5063e5dc8
|
fix #3032: update glyphicons sprite to 1.6 release
|
2012-04-14 16:59:49 -07:00 |
|
Jacob Thornton
|
81a296d06a
|
whitespace
|
2012-04-14 16:38:44 -07:00 |
|
Jacob Thornton
|
c291e4d786
|
fix typeahead test
|
2012-04-14 16:32:20 -07:00 |
|
Jacob Thornton
|
575f18aaf4
|
add jshint support + a few minor stylistic changes
|
2012-04-14 16:29:53 -07:00 |
|
Mark Otto
|
8575a45294
|
alt fix to #3029: change to single border-radii properties
|
2012-04-14 13:31:48 -07:00 |
|
Mark Otto
|
a7d8145a32
|
fix #3036: add bg color to inputs
|
2012-04-14 13:18:37 -07:00 |
|
Mark Otto
|
c710f03995
|
Merge pull request #3042 from ctalkington/typo-fix-1
Doc Typo Fix
|
2012-04-13 17:14:11 -07:00 |
|
ctalkington
|
0e6f12af86
|
add 's' to 'classe' in components docs. thanks mishmosh.
|
2012-04-12 15:14:54 -05:00 |
|
Bryan Petty
|
5b85ed181a
|
Fixed extra margin on Navbar buttons.
|
2012-04-10 15:22:17 -06:00 |
|
Mark Otto
|
48063afb3a
|
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
docs/assets/bootstrap.zip
|
2012-04-07 23:41:27 -07:00 |
|
Mark Otto
|
0b2d23d443
|
add larger .input-* to block reset for responsive <767
|
2012-04-07 23:41:09 -07:00 |
|
Mark Otto
|
28c4ed824e
|
Merge branch 'alecrust-patch-3' into 2.0.3-wip
|
2012-04-07 23:38:16 -07:00 |
|
Mark Otto
|
5bc601d9a8
|
fix typo on js docs selector
|
2012-04-07 23:37:58 -07:00 |
|
Jacob Thornton
|
08fee005a8
|
https://github.com/twitter/bootstrap/issues/2954
|
2012-04-07 21:26:46 -07:00 |
|
Chris Aniszczyk
|
11064c4d34
|
Update the LICENSE to the actual APLv2
|
2012-04-07 17:17:39 -07:00 |
|
Mark Otto
|
a20cd66ba4
|
clean up new input append examples
|
2012-04-07 16:49:06 -07:00 |
|
Mark Otto
|
3ecf109835
|
fix conflicts, add docs example for two buttons on an append
|
2012-04-07 16:44:03 -07:00 |
|
Mark Otto
|
1d30225e2c
|
Merge branch 'jasny-patch-2' into 2.0.3-wip
Conflicts:
less/forms.less
|
2012-04-07 16:43:48 -07:00 |
|
Mark Otto
|
0a71f171bc
|
readd bootstrap.zip, add @inputBorderRadius var to close #2946
|
2012-04-07 16:17:15 -07:00 |
|
Mark Otto
|
f563b1db43
|
update kippt screenshot
|
2012-04-07 15:59:14 -07:00 |
|
Mark Otto
|
5591a9b966
|
use yui-compress by default instead of regular compress
|
2012-04-07 14:56:37 -07:00 |
|
Mark Otto
|
798363eda7
|
fix left margin on .thumbnails for responsive <767
|
2012-04-07 14:31:55 -07:00 |
|
Mark Otto
|
10ff5f16a6
|
fix #2968 manually: add consolas to monospace font stack
|
2012-04-07 14:25:58 -07:00 |
|
Bryan Petty
|
4b81c0dff3
|
Changed .nav-collapse to clear both instead of left, and added compiled files.
|
2012-04-05 14:13:16 -06:00 |
|
Arnold Daniels
|
fedce0cec7
|
Allow multiple buttons in .input-prepend and .input-append .
This has a look similar to button groups.
|
2012-04-05 23:08:32 +03:00 |
|
Jacob Thornton
|
4953629ccd
|
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Conflicts:
docs/assets/bootstrap.zip
|
2012-04-04 15:13:27 -07:00 |
|
Jacob Thornton
|
83febb3452
|
remake and add isHTML check to popover as well
|
2012-04-04 15:02:30 -07:00 |
|
Jacob Thornton
|
4bd611884a
|
detect if title in tooltip is text or html. if text - use text method to prevent xss.
all add a few notes to js readme about updated event
|
2012-04-04 14:58:04 -07:00 |
|
Alec Rust
|
ff57f59562
|
Corrected spacing
|
2012-04-03 12:15:36 +02:00 |
|
Mark Otto
|
2ea437f353
|
fix #2908: unfloat inputs using .span* in fluid row
|
2012-04-02 22:49:19 -07:00 |
|
Mark Otto
|
4462f24753
|
fix #2911: correct /lib/ path to /less/
|
2012-04-02 22:40:06 -07:00 |
|
Mark Otto
|
2988de6377
|
fix #2913: get more specific with button group selectors
|
2012-04-02 22:38:12 -07:00 |
|
Bryan Petty
|
030265eaec
|
Restrict collapsed items in Navbar to only those in .nav-collapse, and buttons in Navbar.
|
2012-04-02 02:52:06 -06:00 |
|
Mark Otto
|
7bf4c8e76e
|
Merge branch 'alecrust-patch-1' into 2.0.3-wip
|
2012-04-01 11:10:20 -07:00 |
|
Alec Rust
|
574592cba5
|
Corrected "resises" to "resides"
|
2012-04-01 17:25:43 +02:00 |
|
Mark Otto
|
647f1c98ed
|
fix #2296: allow fluid thumbnails
|
2012-04-01 01:05:00 -07:00 |
|
Mark Otto
|
fe05f9aeb2
|
fix #2572: streamline thumbnails css to allow for offsets
|
2012-04-01 00:59:34 -07:00 |
|