0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

8139 Commits

Author SHA1 Message Date
Mark Otto
8bc6aeb60a add what's included 2013-12-22 21:27:12 -08:00
Mark Otto
906b0c595b Merge branch 'master' into sass_docs 2013-12-22 21:23:24 -08:00
Mark Otto
cb7cdd0c05 Revert to CSScomb 1.1.0 because 1.2.0 and 1.2.1 fuck up our compiled CSS 2013-12-22 21:18:45 -08:00
Mark Otto
ec13eb8d38 Remove timestamp on generated Glyhpicons 2013-12-22 21:05:08 -08:00
Mark Otto
7ccb0333e4 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-22 21:01:00 -08:00
Mark Otto
51628d2050 grunt 2013-12-22 21:00:53 -08:00
Mark Otto
146800ef43 Merge pull request #11979 from ZDroid/fix-old-links
Fix old links
2013-12-22 17:30:35 -08:00
Chris Rebert
fa2380758e Merge pull request #11982 from ZDroid/update-deps
Update dependencies
2013-12-22 12:23:52 -08:00
Zlatan Vasović
88c3619d2c Update dependencies 2013-12-22 19:01:00 +01:00
Zlatan Vasović
28adcbe439 Fix old links
Replace recess with less.
2013-12-22 16:26:05 +01:00
XhmikosR
ea5a4ec31e Jekyll: exclude more files/folders.
We still can't exclude `./fonts/" and "./js/" due to https://github.com/jekyll/jekyll/issues/906
2013-12-22 11:45:18 +02: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
XhmikosR
b27fecb7a3 bower.json: sort by name. 2013-12-22 08:59:36 +02:00
XhmikosR
29aaf66a8a Normalize package.json. 2013-12-22 08:59:36 +02:00
XhmikosR
6e3ac8f2a4 js/.jscs.json: sort by name. 2013-12-22 08:59:36 +02:00
Mark Otto
12980e7ea4 link homepage sass and less 2013-12-21 13:42:10 -08:00
Mark Otto
176e35d33d rework downloads to simplify and add sass 2013-12-21 13:40:42 -08:00
Mark Otto
16ff01f629 remove dat 2013-12-21 11:17:39 -08:00
Mark Otto
02c40ab991 Merge branch 'master' into docs_derp
Conflicts:
	_layouts/default.html
	components.html
2013-12-21 11:17:29 -08:00
Mark Otto
c66924cc1b add section for contents 2013-12-21 10:36:20 -08:00
Mark Otto
2f56922937 config url 2013-12-21 10:09:39 -08:00
Mark Otto
bb644eede6 Team members on About page 2013-12-21 10:08:04 -08:00
Mark Otto
86e6c869a3 remove some unintional code 2013-12-21 09:59:24 -08:00
Mark Otto
0c49f846e3 Merge branch 'master' into sass_docs 2013-12-21 09:45:47 -08:00
Mark Otto
5f9695ae7c readme typo from #11965 2013-12-21 09:36:51 -08:00
Mark Otto
b734a2a435 Merge pull request #11965 from tomByrer/md-tweaks
condenced README CONTRIB changes
2013-12-21 09:36:18 -08:00
tomByrer
c84688fc4f https://github.com/twbs/bootstrap/pull/11950#issuecomment-31033824 2013-12-21 09:39:34 -07:00
Mark Otto
033476ccc7 more Less 2013-12-20 21:19:45 -08:00
Mark Otto
66c280c855 Sass docs; LESS to Less because fuck caps 2013-12-20 21:02:25 -08:00
Mark Otto
810c7ec4f8 Merge pull request #11956 from tlindig/tl_pagination_customizing
add new variables for "pagination" to improve support of customizing
2013-12-20 12:29:49 -08:00
Mark Otto
e1bd300f2f Merge pull request #11960 from ZDroid/no-leading-commas-json
Drop remaining leading commas
2013-12-20 11:18:04 -08:00
Zlatan Vasović
b604c2fbac Drop remaining leading commas 2013-12-20 20:09:51 +01:00
Mark Otto
f1d4a3bb5c Merge pull request #11959 from ZDroid/update-grunt-csscomb
Update grunt-csscomb dependency
2013-12-20 11:08:39 -08:00
Zlatan Vasović
e95c396f44 Update grunt-csscomb dependency
Per David DM.
2013-12-20 19:59:18 +01:00
Tobias Lindig
7f599cedf3 add new variables for "pagination" to improve support of customizing 2013-12-20 17:06:53 +01:00
Mark Otto
2854c5c3fb Fixes #11952: Refactor blockquote styles
* Deprecate .pull-right class for .blockquote-reverse
* Move font-size change to the parent, blockquote, instead of setting on the p element to allow more flexible content
2013-12-19 19:40:08 -08:00
Mark Otto
81b1e6801f correct jsbin link 2013-12-19 19:28:22 -08:00
Chris Rebert
2c5e5b23e1 Merge pull request #11951 from bnewcomb/master
Fix sentence grammar
2013-12-19 19:10:16 -08:00
Ben Newcomb
2e0337a61b Minor grammar change
'as well' was used twice in sentence
2013-12-19 18:57:43 -08:00
Mark Otto
523eca14e8 Merge pull request #11930 from ssorallen/master
Write Glyphicons to _data, generate Glyphicons markup
2013-12-19 15:03:43 -08:00
Mark Otto
4a01acaf67 Merge pull request #11941 from ZDroid/left-plus
No leading pluses
2013-12-19 14:06:01 -08:00
Mark Otto
caadd72084 Merge pull request #11939 from ZDroid/weird-indents
2 instead of 4 spaces in .csscomb.json
2013-12-19 14:05:19 -08:00
Chris Rebert
2898e73ec4 "Thosing" [sic] => "Those" 2013-12-19 11:39:57 -08:00
Julian Thilo
fc03fac9e4 Fix sentence in css.html 2013-12-19 20:12:31 +01:00
Julian Thilo
b298d2f481 Merge pull request #11945 from robertgentel/patch-1
Update css.html
2013-12-19 10:56:36 -08:00
robertgentel
ded1e72202 Update css.html
Documentation (missing word)
2013-12-19 11:06:45 -06:00
Zlatan Vasović
1bf5abab31 No leading pluses 2013-12-19 15:32:37 +01:00
Zlatan Vasović
9201ccd08b 2 instead of 4 spaces in .csscomb.json 2013-12-19 13:11:05 +01:00
Chris Rebert
fb8310fbc6 Merge pull request #11936 from KostyaTretyak/patch-1
Deleted curly brackets (in css.html)
2013-12-19 01:23:10 -08:00
kostyatretyak
09c7870971 Deleted curly brackets (in css.html) 2013-12-19 11:07:56 +02:00