fat
c77740bd3a
fixes #11720 - Add events trigger to affix
2013-12-24 16:29:51 -08:00
fat
a93a753c7d
fixes #10134 – dont use jquery offset directly because it uses sub pixel rendering
2013-12-24 13:07:42 -08:00
fat
fe7fffe034
Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset
...
Conflicts:
js/tests/unit/carousel.js
2013-12-24 12:50:55 -08:00
fat
558b6a478d
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
2013-12-24 12:35:24 -08:00
fat
50bd4edb8c
fixes #10236
...
if affixed top add scrollTop to it position.top
calculate and cache pinnedoffset independent of scrolling for initial load
2013-12-24 12:32:06 -08:00
Mark Otto
04ec4354ed
don't roll back that comment
2013-12-24 12:18:53 -08:00
Mark Otto
5c2dfbf33b
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
docs-assets/js/raw-files.js
2013-12-24 12:17:48 -08:00
Mark Otto
679c786237
roll back version numbers to avoid broken links in docs and readme ( fixes #12000 )
2013-12-24 12:16:17 -08:00
fat
fe839e6e78
change where modal loads content -– fixes #10105 , #9318 , #9459
2013-12-23 23:30:06 -08:00
fat
1fc08c1973
fixes #10568 - kill hoverstate info once command has been executed
2013-12-23 22:57:39 -08:00
fat
a87b150bc7
fixes #10205 Scrollspy Doesn't Support Chinese ID Targets http://mathiasbynens.be/notes/html5-id-class
2013-12-23 22:08:43 -08:00
Mark Otto
0bd5bca695
Fixes #11975 : Change from png to .ico for favicon
2013-12-23 15:16:25 -08:00
Mark Otto
96b5ae8b6a
grunt
2013-12-22 22:32:35 -08:00
Mark Otto
90ba7fa836
Merge pull request #11972 from XhmikosR/comma
...
Get rid of JSHint's `laxcomma` option now that the comma is used on the ...
2013-12-22 22:08:33 -08:00
Mark Otto
906b0c595b
Merge branch 'master' into sass_docs
2013-12-22 21:23:24 -08:00
Mark Otto
51628d2050
grunt
2013-12-22 21:00:53 -08:00
XhmikosR
a05a11e5dc
Get rid of JSHint's laxcomma option now that the comma is used on the right side.
2013-12-22 09:02:08 +02:00
Mark Otto
bb644eede6
Team members on About page
2013-12-21 10:08:04 -08:00
Chris Rebert
08854cf8a6
using templating doesn't seem to work there; hardcode license URL instead
...
Tested the customizer, the generated zip had:
css/bootstrap.css:line 6: * Licensed under MIT (<%= _.pluck(pkg.licenses, "url").join(", ") %>)
Revised customizer generates:
css/bootstrap.css:line 4: * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE )
2013-12-18 16:25:23 -08:00
Chris Rebert
fe7c7ccf29
rebuild minified customizer JS so it reflects the licensing change
2013-12-18 15:50:59 -08:00
Mark Otto
3315d4d9f4
license in customizer
2013-12-18 15:35:24 -08:00
Chris Rebert
df3716647d
update licensing header in JS files & run grunt
2013-12-18 15:29:19 -08:00
Mark Otto
922cd046ef
grunt after that carousel merge
2013-12-18 15:13:50 -08:00
Mark Otto
40651cf1ea
more license mentions
2013-12-18 15:08:16 -08:00
Mark Otto
e8e60ae4bc
version bump
2013-12-18 14:56:08 -08:00
Mark Otto
f29132350c
grunt
2013-12-18 14:52:50 -08:00
Mark Otto
072ccd4dda
Fixes #11572 : Add contextual background-color classes to match text classes; move both sets of classes to Helper Classes section of the CSS docs
2013-12-14 21:40:16 -08:00
Mark Otto
67b536ea51
change class name
2013-12-14 21:25:57 -08:00
Mark Otto
4c64c1eecd
Merge branch 'master' into pr/11302
...
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
2013-12-14 16:46:40 -08:00
Mark Otto
83c60ef3ee
Merge branch 'master' into pr/11107
...
Conflicts:
docs-assets/js/raw-files.js
2013-12-14 16:20:19 -08:00
Mark Otto
f1869771bc
Fixes #10505 : Document more of LESS vars and mixins
2013-12-14 14:18:43 -08:00
XhmikosR
caa3d53dcb
customizer.js: remove a workaround for older less.js.
2013-12-11 13:27:23 +02:00
XhmikosR
11180e0fa7
Update less.js to v1.5.1.
...
This fixes an error with `&:extend(.clearfix all)` when using the customizer.
2013-12-10 18:09:14 +02:00
Mark Otto
b9b17bc72b
grunt
2013-12-09 00:09:52 -08:00
Mark Otto
768f8b00f3
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-08 17:50:26 -08:00
Chris Rebert
ae0d48057e
fix #11787 : document stateful button JS
2013-12-08 17:42:59 -08:00
Mark Otto
cdb7d9839e
grunt
2013-12-08 17:21:37 -08:00
Mark Otto
e1247e3edc
Match customizer banner to Gruntfile banner
2013-12-08 17:17:51 -08:00
XhmikosR
eca8ff3803
Use single quotes consistently.
2013-12-08 12:44:14 +02:00
Mark Otto
ed63dfd8d3
Merge pull request #11739 from XhmikosR/lint-assets
...
Lint docs-assets/js/application.js and docs-assets/js/customizer.js.
2013-12-08 02:16:16 -08:00
Mark Otto
1f9bfa89dc
Fixes #11741 : Don't set headings font-family again, just use inherit
2013-12-08 02:14:24 -08:00
Mark Otto
5fdd917918
improve icon display on narrow devices
2013-12-07 16:28:29 -08:00
Mark Otto
0bf5202b92
Fixes #11729 : Show code snippets on mobile views
2013-12-07 16:21:46 -08:00
Mark Otto
a9b86cbfde
Merge branch 'pr/11138'
...
Conflicts:
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
2013-12-07 14:10:41 -08:00
XhmikosR
2fc2fe75bd
Lint docs-assets/js/application.js and docs-assets/js/customizer.js.
2013-12-07 05:05:13 +02:00
Chris Rebert
c545312bd6
need customize.js to be tracked for it to work on GitHub Pages
...
follow-up to #11738
2013-12-06 11:35:58 -08:00
Mark Otto
aac4f0189e
one last grunt
2013-12-04 22:54:03 -08:00
Mark Otto
b18d3fb80f
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-04 22:34:25 -08:00
Mark Otto
45930acdf7
Fixes #11610 : Add @grid-float-breakpoint-max to better link navbar behavior across viewports and improve customization.
...
Also addresses #10371 , #10395 , and #10465 .
2013-12-04 22:32:56 -08:00
Mark Otto
42bee1ddd5
Merge pull request #11671 from XhmikosR/updates
...
Update 3rd party asset libraries
2013-12-04 21:58:00 -08:00
