rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-03 15:24:19 +01:00
Code Issues Actions Packages Releases Activity
7,701 Commits 108 Branches 89 Tags 547 MiB
90ba7fa836
Commit Graph

95 Commits

Author SHA1 Message Date
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
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
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
83c60ef3ee Merge branch 'master' into pr/11107 
Conflicts:
	docs-assets/js/raw-files.js
 2013-12-14 16:20:19 -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
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
Mark Otto
cf81cb60ef Merge branch 'master' into gradient-prefix-cleanup 
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
 2013-12-04 21:23:09 -08:00
Mark Otto
8c5dc542a5 grunt 2013-12-04 21:22:24 -08:00
awebdeveloper
3f1e4b92ee -moz and old webkit syntax removed for gradients based on 
http://caniuse.com/#search=grad
 2013-12-03 14:13:55 -08:00
Chris Rebert
303f8a33c3 add <table> case to responsive-visibility mixin; see #10056 2013-12-03 13:57:28 -08:00
Chris Rebert
bac153127c grunt 2013-12-03 13:54:56 -08:00
Chris Rebert
2d4ee18162 add comment regarding #11598 2013-12-03 13:31:47 -08:00
XhmikosR
b8928340f4 Update filesaver.js to the latest git. 2013-12-02 14:15:57 +02:00
XhmikosR
c56e63e967 Update jszip.js to the latest git. 2013-12-02 14:13:10 +02:00
XhmikosR
4392d43d7c Update holder.js to v2.2. 2013-12-02 14:12:57 +02:00
Mark Otto
8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
Mark Otto
118e901eb1 grunt 2013-12-01 19:30:10 -08:00
Mark Otto
25bc5322aa grunt 2013-12-01 18:35:58 -08:00
Mark Otto
556d6cef3e Fixes #10941: Fix Glyphicons path for those importing bootstrap.less from another directory 2013-12-01 00:20:47 -08:00
Mark Otto
53047fa587 Merge branch 'master' into pr/11536 
Conflicts:
	dist/css/bootstrap.min.css
 2013-11-30 23:35:56 -08:00
Mark Otto
57070dcf45 grunt 2013-11-30 23:35:08 -08:00
Mark Otto
22da6fcfb2 grunt 2013-11-30 21:17:53 -08:00
Mark Otto
359ac8f66a grunt 2013-11-30 16:21:19 -08:00
Mark Otto
080aa7f5c8 Merge branch 'master' into pr/11299 
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
 2013-11-30 00:55:00 -08:00
Mark Otto
8674228521 Merge branch 'pr/11493' 
Conflicts:
	dist/css/bootstrap.min.css
 2013-11-29 23:30:26 -08:00
Mark Otto
09cd5289ab Fixes #11468: Prevent default gradient on in Firefox for Android 2013-11-29 17:47:27 -08:00
Mark Otto
0be94180b9 grunt 2013-11-28 15:45:45 -08:00