clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-25 12:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,922 Commits 116 Branches 89 Tags 628 MiB
99b66c1f2c
Commit Graph

7922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
99b66c1f2c grunt dist 2014-01-09 18:06:46 -08:00
Mark Otto
1c66664bed Merge pull request #12175 from waynn/patch-3 
use periods for consistency in each line
 2014-01-09 14:28:27 -08:00
Chris Rebert
82eccef7e3 mixins.less: fix typo in comment 2014-01-09 13:45:10 -08:00
Waynn Lue
cba9d81340 use periods for consistency in each line 2014-01-09 12:22:31 -08:00
Chris Rebert
6645e5daad Merge pull request #12174 from ZDroid/absolute-urls 
Use absolute instead of relative URLs
 2014-01-09 11:54:56 -08:00
Zlatan Vasović
8c85e1b5a3 Use absolute instead of relative URLs 2014-01-09 20:33:13 +01:00
Chris Rebert
fc62379e61 grunt dist 2014-01-09 11:11:13 -08:00
Chris Rebert
1276503754 Merge pull request #12164 from thomaswelton/issue-12162 
Fix value of svg font ID & removed hard coding
 2014-01-09 11:07:42 -08:00
Chris Rebert
1fc68c3560 Merge pull request #12163 from ZDroid/wrong-paths 
Update paths in bower.json
 2014-01-09 09:59:30 -08:00
Chris Rebert
4896141121 Merge pull request #12160 from waynn/patch-2 
missing a period after "Twitter, Inc"
 2014-01-09 09:56:07 -08:00
Zlatan Vasović
431c544fbc Update paths in bower.json 
- Replace `*.html`, `docs/assets` and `examples` with `docs` (new directory)
- Instead of `_*`, it's just `_config.yml`, without regex (speeds up bower download a few milliseconds)
 2014-01-09 11:20:23 +01:00
thomaswelton
04ba67d6f1 Add new varaible @icon-font-svg-id and set it to be the correct SVG font ID, used new variable in glyphicons.less 2014-01-09 10:16:27 +00:00
Waynn Lue
f116106bf6 missing a period after "Twitter, Inc" 2014-01-09 00:11:01 -08:00
Chris Rebert
7ba6daabfe bump grunt-contrib-jade to v0.9.1 2014-01-08 21:15:37 -08:00
Chris Rebert
29547a2102 JSHint is on crack? 
Linting docs/grunt/bs-raw-files-generator.js ...ERROR
[L3:C5] W079: Redefinition of 'btoa'.
var btoa = require('btoa')
 2014-01-08 18:45:40 -08:00
Chris Rebert
8a10bd5231 grunt build-customizer 2014-01-08 18:39:45 -08:00
Chris Rebert
72ff8ff9fb grunt dist 2014-01-08 18:39:08 -08:00
Chris Rebert
9443044606 Merge pull request #11158 from twbs/templated-customizer 
Autogenerate the customizer's variables form
 2014-01-08 18:36:32 -08:00
Chris Rebert
db829f8620 add support for '//===' for <h3>s in bs-lessdoc 2014-01-08 12:41:51 -08:00
Chris Rebert
39861714a8 Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095 
also updates variables file organization (courtesy @mdo)
 2014-01-08 12:41:51 -08:00
Chris Rebert
c9ba678b9f JSCS can be dumb sometimes 2014-01-08 12:37:10 -08:00
Chris Rebert
1736bcb05c Merge pull request #12150 from twbs/extract-from-gruntfile 
cleanup Gruntfile by extracting executable code
 2014-01-08 11:01:03 -08:00
Julian Thilo
24c16d9904 Merge pull request #12155 from Dudytz/master 
updated path docs-assets to docs/assets
 2014-01-08 08:20:18 -08:00
Eduardo
9f0afd57f0 updated path docs-assets to docs/assets 2014-01-08 16:43:56 +01:00
Mark Otto
692eb554aa Merge pull request #12151 from wangsai/no-preboot 
no preboot
 2014-01-08 00:52:51 -08:00
wangsai
7e16425acb no preboot 2014-01-08 16:22:50 +08:00
Chris Rebert
d7a128c636 extract glyphicons.yml generator out of Gruntfile into separate module 2014-01-07 22:34:09 -08:00
Chris Rebert
d1c29af591 extract raw-files.js generator out of Gruntfile into separate module 2014-01-07 22:16:52 -08:00
Chris Rebert
b67fc6906a Merge pull request #12149 from twbs/bump-grunt-contrib-less 
bump grunt-contrib-less to v0.9.0
 2014-01-07 20:05:09 -08:00
Chris Rebert
9ae5d321b5 bump grunt-contrib-less to v0.9.0 2014-01-07 19:50:58 -08:00
Chris Rebert
a712abd06e enable CSSLint in test suite; fixes #12094 2014-01-07 19:34:49 -08:00
Chris Rebert
c891be5e5f adjust filename to indicate that customize JS is minified 2014-01-07 19:10:31 -08:00
Chris Rebert
ef7bf0abf8 grunt dist build-customizer 2014-01-07 19:05:29 -08:00
Chris Rebert
c635d8f547 have customizer output Bootstrap Theme too; fixes #12003 2014-01-07 18:57:15 -08:00
Chris Rebert
07309edce5 make customizer compilation code more generic 2014-01-07 18:55:13 -08:00
Chris Rebert
bf5017c01c fix #12143 2014-01-07 17:08:40 -08:00
Chris Rebert
9eab6ffd1c Merge pull request #12147 from ZDroid/double 
Drop redundant 'the'
 2014-01-07 14:02:45 -08:00
Zlatan Vasović
ec594887fe Drop redundant 'the' 2014-01-07 22:40:23 +01:00
Julian Thilo
8fd177bfa7 Fix #12073: Consistent order of variations 
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
 2014-01-07 22:24:45 +01:00
Chris Rebert
5f328dce88 Merge pull request #12057 from ZDroid/nl 
'use strict' on new line
 2014-01-07 00:31:27 -08:00
Chris Rebert
5e39e6c9d0 Merge pull request #12135 from leoj3n/patch-2 
Improve wording in CONTRIBUTING.md
 2014-01-07 00:27:54 -08:00
Joel Kuzmarski
3661c4b8ff Improve wording in CONTRIBUTING.md 
Parts of the "Pull requests" section are strangely worded.

This commit fixes that.
 2014-01-07 02:11:07 -06:00
Chris Rebert
0a09dd46cb Merge pull request #12133 from leoj3n/patch-1 
Fix bad anchor link in CONTRIBUTING.md
 2014-01-06 23:55:17 -08:00
Joel Kuzmarski
483974695c Fix bad anchor link in CONTRIBUTING.md 
Hey look, I'm contributing to CONTRIBUTING.md!

This anchor must have been overlooked while updating the docs in a previous commit. Expected behavior: scroll the document to a linked section. Experienced behavior: nada.

This proposed file change renames the anchor text from `coding conventions` to `coding guidelines` and changes the anchor link from `#code-conventions` to `#code-guidelines`.
 2014-01-07 01:45:33 -06:00
Julian Thilo
158a2394a2 Merge branch 'master' of https://github.com/twbs/bootstrap 2014-01-07 01:30:16 +01:00
Julian Thilo
8d903fbd02 duh, missed one more file 
X-Ref: 7fcfe61f4d
 2014-01-07 01:27:49 +01:00
Julian Thilo
c42b6a3f8b missed a file 
X-Ref: 7fcfe61f4d
 2014-01-07 01:22:13 +01:00
Julian Thilo
7fcfe61f4d Update copyright notices in all places 
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
 2014-01-07 01:05:24 +01:00
Mark Otto
99338caed0 Merge pull request #12125 from juniorconte/input-block-level 
notes from .input-block-level
 2014-01-06 09:14:44 -08:00
juniorconte
7722ab5566 notes from .input-block-level 2014-01-06 11:41:15 -02:00