]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agouse periods for consistency in each line 12175/head
Waynn Lue [Thu, 9 Jan 2014 20:22:31 +0000 (12:22 -0800)] 
use periods for consistency in each line

11 years agoMerge pull request #12174 from ZDroid/absolute-urls
Chris Rebert [Thu, 9 Jan 2014 19:54:56 +0000 (11:54 -0800)] 
Merge pull request #12174 from ZDroid/absolute-urls

Use absolute instead of relative URLs

11 years agoUse absolute instead of relative URLs 12174/head
Zlatan Vasović [Thu, 9 Jan 2014 19:33:13 +0000 (20:33 +0100)] 
Use absolute instead of relative URLs

11 years agogrunt dist
Chris Rebert [Thu, 9 Jan 2014 19:11:13 +0000 (11:11 -0800)] 
grunt dist

11 years agoMerge pull request #12164 from thomaswelton/issue-12162
Chris Rebert [Thu, 9 Jan 2014 19:07:42 +0000 (11:07 -0800)] 
Merge pull request #12164 from thomaswelton/issue-12162

Fix value of svg font ID & removed hard coding

11 years agoMerge pull request #12163 from ZDroid/wrong-paths
Chris Rebert [Thu, 9 Jan 2014 17:59:30 +0000 (09:59 -0800)] 
Merge pull request #12163 from ZDroid/wrong-paths

Update paths in bower.json

11 years agoMerge pull request #12160 from waynn/patch-2
Chris Rebert [Thu, 9 Jan 2014 17:56:07 +0000 (09:56 -0800)] 
Merge pull request #12160 from waynn/patch-2

missing a period after "Twitter, Inc"

11 years agoUpdate paths in bower.json 12163/head
Zlatan Vasović [Thu, 9 Jan 2014 10:20:23 +0000 (11:20 +0100)] 
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)

11 years agoAdd new varaible @icon-font-svg-id and set it to be the correct SVG font ID, used... 12164/head
thomaswelton [Thu, 9 Jan 2014 10:16:27 +0000 (10:16 +0000)] 
Add new varaible @icon-font-svg-id and set it to be the correct SVG font ID, used new variable in glyphicons.less

11 years agomissing a period after "Twitter, Inc" 12160/head
Waynn Lue [Thu, 9 Jan 2014 08:11:01 +0000 (00:11 -0800)] 
missing a period after "Twitter, Inc"

11 years agobump grunt-contrib-jade to v0.9.1
Chris Rebert [Thu, 9 Jan 2014 05:15:37 +0000 (21:15 -0800)] 
bump grunt-contrib-jade to v0.9.1

11 years agoJSHint is on crack?
Chris Rebert [Thu, 9 Jan 2014 02:45:40 +0000 (18:45 -0800)] 
JSHint is on crack?

Linting docs/grunt/bs-raw-files-generator.js ...ERROR
[L3:C5] W079: Redefinition of 'btoa'.
var btoa = require('btoa')

11 years agogrunt build-customizer
Chris Rebert [Thu, 9 Jan 2014 02:39:45 +0000 (18:39 -0800)] 
grunt build-customizer

11 years agogrunt dist
Chris Rebert [Thu, 9 Jan 2014 02:39:08 +0000 (18:39 -0800)] 
grunt dist

11 years agoMerge pull request #11158 from twbs/templated-customizer
Chris Rebert [Thu, 9 Jan 2014 02:36:32 +0000 (18:36 -0800)] 
Merge pull request #11158 from twbs/templated-customizer

Autogenerate the customizer's variables form

11 years agoadd support for '//===' for <h3>s in bs-lessdoc 11158/head
Chris Rebert [Wed, 8 Jan 2014 05:43:12 +0000 (21:43 -0800)] 
add support for '//===' for <h3>s in bs-lessdoc

11 years agoUse JS & Jade to generate the customizer variables form HTML from variables.less...
Chris Rebert [Fri, 18 Oct 2013 02:52:16 +0000 (19:52 -0700)] 
Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095

also updates variables file organization (courtesy @mdo)

11 years agoJSCS can be dumb sometimes
Chris Rebert [Mon, 9 Dec 2013 05:25:25 +0000 (21:25 -0800)] 
JSCS can be dumb sometimes

11 years agoMerge pull request #12150 from twbs/extract-from-gruntfile
Chris Rebert [Wed, 8 Jan 2014 19:01:03 +0000 (11:01 -0800)] 
Merge pull request #12150 from twbs/extract-from-gruntfile

cleanup Gruntfile by extracting executable code

11 years agoMerge pull request #12155 from Dudytz/master
Julian Thilo [Wed, 8 Jan 2014 16:20:18 +0000 (08:20 -0800)] 
Merge pull request #12155 from Dudytz/master

updated path docs-assets to docs/assets

11 years agoupdated path docs-assets to docs/assets 12155/head
Eduardo [Wed, 8 Jan 2014 15:43:56 +0000 (16:43 +0100)] 
updated path docs-assets to docs/assets

11 years agoMerge pull request #12151 from wangsai/no-preboot
Mark Otto [Wed, 8 Jan 2014 08:52:51 +0000 (00:52 -0800)] 
Merge pull request #12151 from wangsai/no-preboot

no preboot

11 years agono preboot 12151/head
wangsai [Wed, 8 Jan 2014 08:22:50 +0000 (16:22 +0800)] 
no preboot

11 years agoextract glyphicons.yml generator out of Gruntfile into separate module 12150/head
Chris Rebert [Wed, 8 Jan 2014 06:34:09 +0000 (22:34 -0800)] 
extract glyphicons.yml generator out of Gruntfile into separate module

11 years agoextract raw-files.js generator out of Gruntfile into separate module
Chris Rebert [Wed, 8 Jan 2014 06:15:48 +0000 (22:15 -0800)] 
extract raw-files.js generator out of Gruntfile into separate module

11 years agoMerge pull request #12149 from twbs/bump-grunt-contrib-less
Chris Rebert [Wed, 8 Jan 2014 04:05:09 +0000 (20:05 -0800)] 
Merge pull request #12149 from twbs/bump-grunt-contrib-less

bump grunt-contrib-less to v0.9.0

11 years agobump grunt-contrib-less to v0.9.0 12149/head
Chris Rebert [Wed, 8 Jan 2014 03:50:58 +0000 (19:50 -0800)] 
bump grunt-contrib-less to v0.9.0

11 years agoenable CSSLint in test suite; fixes #12094
Chris Rebert [Wed, 8 Jan 2014 03:34:49 +0000 (19:34 -0800)] 
enable CSSLint in test suite; fixes #12094

11 years agoadjust filename to indicate that customize JS is minified
Chris Rebert [Wed, 8 Jan 2014 03:10:31 +0000 (19:10 -0800)] 
adjust filename to indicate that customize JS is minified

11 years agogrunt dist build-customizer
Chris Rebert [Wed, 8 Jan 2014 03:05:29 +0000 (19:05 -0800)] 
grunt dist build-customizer

11 years agohave customizer output Bootstrap Theme too; fixes #12003
Chris Rebert [Wed, 8 Jan 2014 02:57:15 +0000 (18:57 -0800)] 
have customizer output Bootstrap Theme too; fixes #12003

11 years agomake customizer compilation code more generic
Chris Rebert [Wed, 8 Jan 2014 02:38:37 +0000 (18:38 -0800)] 
make customizer compilation code more generic

11 years agofix #12143
Chris Rebert [Wed, 8 Jan 2014 01:08:40 +0000 (17:08 -0800)] 
fix #12143

11 years agoMerge pull request #12147 from ZDroid/double
Chris Rebert [Tue, 7 Jan 2014 22:02:45 +0000 (14:02 -0800)] 
Merge pull request #12147 from ZDroid/double

Drop redundant 'the'

11 years agoDrop redundant 'the' 12147/head
Zlatan Vasović [Tue, 7 Jan 2014 21:40:23 +0000 (22:40 +0100)] 
Drop redundant 'the'

11 years agoFix #12073: Consistent order of variations
Julian Thilo [Tue, 7 Jan 2014 21:24:45 +0000 (22:24 +0100)] 
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

11 years agoMerge pull request #12057 from ZDroid/nl
Chris Rebert [Tue, 7 Jan 2014 08:31:27 +0000 (00:31 -0800)] 
Merge pull request #12057 from ZDroid/nl

'use strict' on new line

11 years agoMerge pull request #12135 from leoj3n/patch-2
Chris Rebert [Tue, 7 Jan 2014 08:27:54 +0000 (00:27 -0800)] 
Merge pull request #12135 from leoj3n/patch-2

Improve wording in CONTRIBUTING.md

11 years agoImprove wording in CONTRIBUTING.md 12135/head
Joel Kuzmarski [Tue, 7 Jan 2014 07:57:43 +0000 (01:57 -0600)] 
Improve wording in CONTRIBUTING.md

Parts of the "Pull requests" section are strangely worded.

This commit fixes that.

11 years agoMerge pull request #12133 from leoj3n/patch-1
Chris Rebert [Tue, 7 Jan 2014 07:55:17 +0000 (23:55 -0800)] 
Merge pull request #12133 from leoj3n/patch-1

Fix bad anchor link in CONTRIBUTING.md

11 years agoFix bad anchor link in CONTRIBUTING.md 12133/head
Joel Kuzmarski [Tue, 7 Jan 2014 07:45:33 +0000 (01:45 -0600)] 
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`.

11 years agoMerge branch 'master' of https://github.com/twbs/bootstrap
Julian Thilo [Tue, 7 Jan 2014 00:30:16 +0000 (01:30 +0100)] 
Merge branch 'master' of https://github.com/twbs/bootstrap

11 years agoduh, missed one more file
Julian Thilo [Tue, 7 Jan 2014 00:27:49 +0000 (01:27 +0100)] 
duh, missed one more file

X-Ref: https://github.com/twbs/bootstrap/commit/7fcfe61f4da41356b2ae974ad20536db0d74e83f

11 years agomissed a file
Julian Thilo [Tue, 7 Jan 2014 00:22:13 +0000 (01:22 +0100)] 
missed a file

X-Ref: https://github.com/twbs/bootstrap/commit/7fcfe61f4da41356b2ae974ad20536db0d74e83f

11 years agoUpdate copyright notices in all places
Julian Thilo [Tue, 7 Jan 2014 00:05:24 +0000 (01:05 +0100)] 
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

11 years agoMerge pull request #12125 from juniorconte/input-block-level
Mark Otto [Mon, 6 Jan 2014 17:14:44 +0000 (09:14 -0800)] 
Merge pull request #12125 from juniorconte/input-block-level

notes from .input-block-level

11 years agonotes from .input-block-level 12125/head
juniorconte [Mon, 6 Jan 2014 13:41:15 +0000 (11:41 -0200)] 
notes from .input-block-level

11 years agoNew Year
Chris Rebert [Mon, 6 Jan 2014 07:45:15 +0000 (23:45 -0800)] 
New Year

11 years agoMerge pull request #12116 from twbs/pacify-csslint
Chris Rebert [Mon, 6 Jan 2014 07:44:17 +0000 (23:44 -0800)] 
Merge pull request #12116 from twbs/pacify-csslint

make CSSLint happier

11 years agoMerge pull request #12107 from twbs/same-footer-links
Mark Otto [Mon, 6 Jan 2014 07:21:11 +0000 (23:21 -0800)] 
Merge pull request #12107 from twbs/same-footer-links

harmonize footer links on homepage & docs pages

11 years agoMerge pull request #12118 from wangsai/fix-out-container
Chris Rebert [Mon, 6 Jan 2014 06:54:01 +0000 (22:54 -0800)] 
Merge pull request #12118 from wangsai/fix-out-container

fix the paragraph outside of '.bs-docs-section'

11 years agofix the paragraph outside of '.bs-docs-section' 12118/head
wangsai [Mon, 6 Jan 2014 06:39:09 +0000 (14:39 +0800)] 
fix the paragraph outside of '.bs-docs-section'

11 years agomake CSSLint happier; refs #12094 12116/head
Chris Rebert [Mon, 6 Jan 2014 05:28:52 +0000 (21:28 -0800)] 
make CSSLint happier; refs #12094

11 years agogrammarghhhhhhhhhhhh
Mark Otto [Mon, 6 Jan 2014 04:54:31 +0000 (20:54 -0800)] 
grammarghhhhhhhhhhhh

11 years agoadd /docs/assets JS to JSCS Grunt task config
Chris Rebert [Mon, 6 Jan 2014 04:52:37 +0000 (20:52 -0800)] 
add /docs/assets JS to JSCS Grunt task config

11 years agoMerge pull request #12115 from Quy/master
Mark Otto [Mon, 6 Jan 2014 04:16:17 +0000 (20:16 -0800)] 
Merge pull request #12115 from Quy/master

Delete reference to a non-existent class

11 years agoDelete reference to a non-existent class 12115/head
Quy Ton [Mon, 6 Jan 2014 04:08:37 +0000 (20:08 -0800)] 
Delete reference to a non-existent class

11 years agoMerge pull request #12082 from kevinsawicki/use-dollar-instead-of-jquery
Chris Rebert [Mon, 6 Jan 2014 02:06:55 +0000 (18:06 -0800)] 
Merge pull request #12082 from kevinsawicki/use-dollar-instead-of-jquery

Use $ instead of jQuery

11 years agoMerge pull request #12110 from twbs/one-control-per-input-group
Mark Otto [Sun, 5 Jan 2014 23:57:33 +0000 (15:57 -0800)] 
Merge pull request #12110 from twbs/one-control-per-input-group

document single .form-control per .input-group limitation

11 years agodocument single .form-control per .input-group limitation; fixes #12109 12110/head
Chris Rebert [Sun, 5 Jan 2014 22:44:48 +0000 (14:44 -0800)] 
document single .form-control per .input-group limitation; fixes #12109

11 years agoharmonize footer links on homepage & docs pages 12107/head
Chris Rebert [Sun, 5 Jan 2014 21:45:56 +0000 (13:45 -0800)] 
harmonize footer links on homepage & docs pages

11 years agoUse mix of medium and small grid clases on dashboard example
Mark Otto [Sun, 5 Jan 2014 21:26:15 +0000 (13:26 -0800)] 
Use mix of medium and small grid clases on dashboard example

11 years agoMerge pull request #12105 from twbs/navbar-containers
Mark Otto [Sun, 5 Jan 2014 21:19:49 +0000 (13:19 -0800)] 
Merge pull request #12105 from twbs/navbar-containers

add .container(-fluid) to remaining navbar examples

11 years agoadd .container(-fluid) to remaining navbar examples for consistency/accuracy 12105/head
Chris Rebert [Sun, 5 Jan 2014 20:55:03 +0000 (12:55 -0800)] 
add .container(-fluid) to remaining navbar examples for consistency/accuracy

follow-up to 93a4d6cc5ecdc1cbc09c4b8af2e587f4480b36cf

11 years agoMerge pull request #12104 from ghoullier/master
Chris Rebert [Sun, 5 Jan 2014 19:47:00 +0000 (11:47 -0800)] 
Merge pull request #12104 from ghoullier/master

Replace getElementsByTag with querySelector in IE10 Mobile viewport JS snippet

11 years agoReplace getElementsByTag by querySelector for IE10 Mobile plateform. 12104/head
Gregory HOULLIER [Sun, 5 Jan 2014 19:15:48 +0000 (20:15 +0100)] 
Replace getElementsByTag by querySelector for IE10 Mobile plateform.

11 years agoMerge pull request #12099 from Quy/master
Chris Rebert [Sun, 5 Jan 2014 16:52:16 +0000 (08:52 -0800)] 
Merge pull request #12099 from Quy/master

Fix typos

11 years agoFix typos 12099/head
Quy Ton [Sun, 5 Jan 2014 16:38:32 +0000 (08:38 -0800)] 
Fix typos

11 years agoMerge pull request #12098 from ZDroid/reorg
Chris Rebert [Sun, 5 Jan 2014 16:05:40 +0000 (08:05 -0800)] 
Merge pull request #12098 from ZDroid/reorg

Group repo vars together in Jekyll config

11 years agoMerge pull request #12097 from ZDroid/deprecated
Chris Rebert [Sun, 5 Jan 2014 16:01:55 +0000 (08:01 -0800)] 
Merge pull request #12097 from ZDroid/deprecated

Replace @screen-sm with @screen-sm-min

11 years agoReorganize vars 12098/head
Zlatan Vasović [Sun, 5 Jan 2014 10:51:49 +0000 (11:51 +0100)] 
Reorganize vars

11 years agoReplace @screen-sm with @screen-sm-min 12097/head
Zlatan Vasović [Sun, 5 Jan 2014 10:38:26 +0000 (11:38 +0100)] 
Replace @screen-sm with @screen-sm-min

11 years agoMerge pull request #12095 from Quy/master
Chris Rebert [Sun, 5 Jan 2014 05:43:25 +0000 (21:43 -0800)] 
Merge pull request #12095 from Quy/master

Fix typo

11 years agoFix typo 12095/head
Quy Ton [Sun, 5 Jan 2014 05:35:06 +0000 (21:35 -0800)] 
Fix typo

11 years agoMerge pull request #12092 from Quy/master
Mark Otto [Sun, 5 Jan 2014 03:31:52 +0000 (19:31 -0800)] 
Merge pull request #12092 from Quy/master

Use relative URLs and fix anchor links

11 years agoMerge pull request #12090 from nschonni/patch-2
Chris Rebert [Sat, 4 Jan 2014 20:20:38 +0000 (12:20 -0800)] 
Merge pull request #12090 from nschonni/patch-2

Quote Node 0.10 so correct version is printed

11 years agoFix anchor links 12092/head
Quy Ton [Sat, 4 Jan 2014 17:28:56 +0000 (09:28 -0800)] 
Fix anchor links

11 years agoUse relative URLs
Quy Ton [Sat, 4 Jan 2014 17:10:02 +0000 (09:10 -0800)] 
Use relative URLs

11 years agoQuote Node 0.10 so correct version is printed 12090/head
Nick Schonning [Sat, 4 Jan 2014 15:46:05 +0000 (10:46 -0500)] 
Quote Node 0.10 so correct version is printed

11 years agoReplace lingering page.url instance with site.baseurl
Chris Rebert [Sat, 4 Jan 2014 00:19:20 +0000 (16:19 -0800)] 
Replace lingering page.url instance with site.baseurl

Refs #12083 & #12037

11 years agoUse $ instead of jQuery 12082/head
Kevin Sawicki [Fri, 3 Jan 2014 22:37:03 +0000 (14:37 -0800)] 
Use $ instead of jQuery

11 years agoflip order so sentence reads better
Chris Rebert [Fri, 3 Jan 2014 20:29:45 +0000 (12:29 -0800)] 
flip order so sentence reads better

11 years agode-emphasize /docs/assets and docs HTML now that they're outside of the root dir
Chris Rebert [Fri, 3 Jan 2014 20:21:38 +0000 (12:21 -0800)] 
de-emphasize /docs/assets and docs HTML now that they're outside of the root dir

11 years agoMerge pull request #12081 from Quy/master
Chris Rebert [Fri, 3 Jan 2014 20:14:20 +0000 (12:14 -0800)] 
Merge pull request #12081 from Quy/master

Update source code download structure

11 years agoUpdate source code download structure 12081/head
Quy Ton [Fri, 3 Jan 2014 19:42:27 +0000 (11:42 -0800)] 
Update source code download structure

11 years agoMerge pull request #12080 from Quy/master
Julian Thilo [Fri, 3 Jan 2014 19:04:14 +0000 (11:04 -0800)] 
Merge pull request #12080 from Quy/master

Refer to popovers instead of tooltips.

11 years agoRefer to popovers instead of tooltips. 12080/head
Quy Ton [Fri, 3 Jan 2014 18:55:06 +0000 (10:55 -0800)] 
Refer to popovers instead of tooltips.

11 years agoMerge pull request #12063 from ZDroid/tc
Mark Otto [Thu, 2 Jan 2014 18:52:43 +0000 (10:52 -0800)] 
Merge pull request #12063 from ZDroid/tc

Drop trailling comma

11 years agoDrop trailling comma 12063/head
Zlatan Vasović [Thu, 2 Jan 2014 14:46:13 +0000 (15:46 +0100)] 
Drop trailling comma

No need for it.

11 years agoMerge pull request #12055 from wangsai/fix-assets-links-of-examples
Mark Otto [Wed, 1 Jan 2014 20:02:28 +0000 (12:02 -0800)] 
Merge pull request #12055 from wangsai/fix-assets-links-of-examples

fix assets links in all examples

11 years agoMerge pull request #12056 from ZDroid/ny
Julian Thilo [Wed, 1 Jan 2014 17:45:50 +0000 (09:45 -0800)] 
Merge pull request #12056 from ZDroid/ny

New Year

11 years ago'use strict' on new line 12057/head
Zlatan Vasović [Wed, 1 Jan 2014 14:42:41 +0000 (15:42 +0100)] 
'use strict' on new line

11 years agoNew Year 12056/head
Zlatan Vasović [Wed, 1 Jan 2014 14:37:08 +0000 (15:37 +0100)] 
New Year

11 years agofix assets links in all examples 12055/head
wangsai [Wed, 1 Jan 2014 14:29:13 +0000 (22:29 +0800)] 
fix assets links in all examples

11 years agoUpdate Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task...
Mark Otto [Wed, 1 Jan 2014 02:21:41 +0000 (18:21 -0800)] 
Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030: navbar toggle focus state

11 years agoFix broken JS
Mark Otto [Wed, 1 Jan 2014 01:47:16 +0000 (17:47 -0800)] 
Fix broken JS

11 years agoderp
Mark Otto [Tue, 31 Dec 2013 21:57:35 +0000 (13:57 -0800)] 
derp

11 years agoMerge pull request #12037 from twbs/docs_dir
Mark Otto [Tue, 31 Dec 2013 21:43:32 +0000 (13:43 -0800)] 
Merge pull request #12037 from twbs/docs_dir

Bring back the `/docs` directory

11 years agoMerge branch 'master' into docs_dir 12037/head
Mark Otto [Tue, 31 Dec 2013 21:43:11 +0000 (13:43 -0800)] 
Merge branch 'master' into docs_dir

11 years agoFixes #12046: move .csscomb.json and .csslintrc to less/ folder
Mark Otto [Tue, 31 Dec 2013 21:16:28 +0000 (13:16 -0800)] 
Fixes #12046: move .csscomb.json and .csslintrc to less/ folder