]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Ross Allen [Thu, 19 Dec 2013 04:15:23 +0000 (20:15 -0800)]
Write Glyphicons to _data, generate Glyphicons markup
This generates a glyphicons.yml file from the glyphicons.less source,
and then components.html uses that data to generate the Glyphicons docs
by iterating through the data. The _data directory was introduced in
Jekyll 1.3.0, and GitHub Pages is already on [version 1.4.2][1].
Fixes #11862.
[1] https://github.com/github/pages-gem/blob/master/github-pages.gemspec#L16
Mark Otto [Thu, 19 Dec 2013 01:34:40 +0000 (17:34 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Thu, 19 Dec 2013 01:32:32 +0000 (17:32 -0800)]
Fixes #11918: Fork the @h5bp contributing guidelines and combine with our coding guidelines
Mark Otto [Thu, 19 Dec 2013 01:32:32 +0000 (17:32 -0800)]
Fixes
Mark Otto [Thu, 19 Dec 2013 00:56:41 +0000 (16:56 -0800)]
fixes #11447: add docs warning about loading once for remote modal option
Chris Rebert [Wed, 18 Dec 2013 23:37:46 +0000 (15:37 -0800)]
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)
Chris Rebert [Wed, 18 Dec 2013 23:50:59 +0000 (15:50 -0800)]
rebuild minified customizer JS so it reflects the licensing change
Mark Otto [Wed, 18 Dec 2013 23:35:24 +0000 (15:35 -0800)]
license in customizer
Chris Rebert [Wed, 18 Dec 2013 23:28:08 +0000 (15:28 -0800)]
update licensing header in JS files & run grunt
Mark Otto [Wed, 18 Dec 2013 23:26:17 +0000 (15:26 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 18 Dec 2013 23:26:07 +0000 (15:26 -0800)]
update license faqs for apache
Chris Rebert [Wed, 18 Dec 2013 23:16:29 +0000 (15:16 -0800)]
cleanup licensing section more
Mark Otto [Wed, 18 Dec 2013 23:13:50 +0000 (15:13 -0800)]
grunt after that carousel merge
Mark Otto [Wed, 18 Dec 2013 23:12:51 +0000 (15:12 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 18 Dec 2013 23:12:30 +0000 (15:12 -0800)]
another apache mention
Mark Otto [Wed, 18 Dec 2013 23:08:38 +0000 (15:08 -0800)]
remove license readme mention
Mark Otto [Wed, 18 Dec 2013 23:08:16 +0000 (15:08 -0800)]
more license mentions
Mark Otto [Wed, 18 Dec 2013 23:01:47 +0000 (15:01 -0800)]
Merge pull request #11416 from danielboendergaard/carousel-duration
Carousel: Use the transition duration from CSS
Mark Otto [Wed, 18 Dec 2013 22:56:08 +0000 (14:56 -0800)]
version bump
Mark Otto [Wed, 18 Dec 2013 22:54:24 +0000 (14:54 -0800)]
Punt Apache license information and stick with MIT
Mark Otto [Wed, 18 Dec 2013 22:52:50 +0000 (14:52 -0800)]
grunt
Mark Otto [Wed, 18 Dec 2013 22:49:05 +0000 (14:49 -0800)]
Merge pull request #11928 from twbs/we_have_to_go_back_kate
Follow up to reverted commits
Mark Otto [Wed, 18 Dec 2013 22:38:10 +0000 (14:38 -0800)]
drop the the, it's cleaner
Mark Otto [Wed, 18 Dec 2013 22:37:30 +0000 (14:37 -0800)]
derp
Mark Otto [Wed, 18 Dec 2013 22:29:33 +0000 (14:29 -0800)]
buttons should be more mixin friendly
Mark Otto [Wed, 18 Dec 2013 22:28:03 +0000 (14:28 -0800)]
navbars need to use prefixed nav class or they won't work as expected
Mark Otto [Wed, 18 Dec 2013 22:27:21 +0000 (14:27 -0800)]
restore inline block on breadcrumbs and ensure proper code formatting for readibility
Mark Otto [Wed, 18 Dec 2013 22:26:37 +0000 (14:26 -0800)]
run grunt dist
Mark Otto [Wed, 18 Dec 2013 22:24:59 +0000 (14:24 -0800)]
rewrite readme to restore lost information, only with a bit more formatting consistency
Mark Otto [Wed, 18 Dec 2013 22:21:35 +0000 (14:21 -0800)]
Merge pull request #11927 from twbs/revert_commits
Revert commits
Julian Thilo [Wed, 18 Dec 2013 21:58:13 +0000 (22:58 +0100)]
Revert commits
Bootstrap is being relicensed from Apache 2.0 to MIT so that more of our community can use the free and open source software we lovely create together. As commits are copyright their original authors, the commits of any individual not agreeing to relicense their contributions are being removed to be later rewritten by the @twbs/team.
This undoes the changes introduced by the following commits:
https://github.com/twbs/bootstrap/commit/
7ea34ae0ef79c793e9a9d393b4eef825b71e84b5 , https://github.com/twbs/bootstrap/commit/
7376eef378fe7d5e69b8b8cce93c7c64b751d55a , https://github.com/twbs/bootstrap/commit/
303ba1326bbe367598ab4cc063b4607507208e56 , https://github.com/twbs/bootstrap/commit/
7d1c8c2a0ce16331583a965821690f7715e62908 , https://github.com/twbs/bootstrap/commit/
11319f6da9f9a19ec40743cdfe868ac732698149 , https://github.com/twbs/bootstrap/commit/
110fc8860117d8675345806219ba313b18086db2 , https://github.com/twbs/bootstrap/commit/
ced08f69359f3a70771804a98fa3c499f388cc74
Mark Otto [Wed, 18 Dec 2013 21:01:43 +0000 (13:01 -0800)]
Merge pull request #11881 from ZDroid/patch-1
Require comma on left side
Mark Otto [Wed, 18 Dec 2013 20:57:38 +0000 (12:57 -0800)]
Merge pull request #11804 from twbs/css-source-maps
enable CSS source maps in grunt-contrib-less
Chris Rebert [Wed, 18 Dec 2013 19:45:30 +0000 (11:45 -0800)]
fix typo
Mark Otto [Wed, 18 Dec 2013 18:23:46 +0000 (10:23 -0800)]
add source maps
Mark Otto [Wed, 18 Dec 2013 18:22:18 +0000 (10:22 -0800)]
Merge branch 'master' into css-source-maps
Conflicts:
Gruntfile.js
Mark Otto [Wed, 18 Dec 2013 17:49:05 +0000 (09:49 -0800)]
Fixes #11899: Ensure proper margins and .small/small usage for heading tags (e.g., .h1-.h6)
Mark Otto [Wed, 18 Dec 2013 17:48:04 +0000 (09:48 -0800)]
add inline note about navbar sizing
Mark Otto [Wed, 18 Dec 2013 17:42:45 +0000 (09:42 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 18 Dec 2013 17:42:37 +0000 (09:42 -0800)]
fixes #11925: cover template for firefox
Chris Rebert [Wed, 18 Dec 2013 09:05:48 +0000 (01:05 -0800)]
Merge pull request #11923 from wangsai/fix-id
fix href of "Browser and device support"
wangsai [Wed, 18 Dec 2013 08:57:55 +0000 (16:57 +0800)]
fix href of "Browser and device support"
Mark Otto [Wed, 18 Dec 2013 06:49:55 +0000 (22:49 -0800)]
Merge pull request #11910 from InWayOpenSource/btn-group-inside-input-group-btn
Fix handling of .btn-group placed inside .input-group-btn
Chris Rebert [Tue, 17 Dec 2013 19:46:54 +0000 (11:46 -0800)]
Merge pull request #11916 from ZDroid/fix-iversions
Downgrade Safari and OS X
Zlatan Vasović [Tue, 17 Dec 2013 19:39:32 +0000 (20:39 +0100)]
Downgrade Safari and OS X
Chris Rebert [Tue, 17 Dec 2013 09:35:16 +0000 (01:35 -0800)]
enable failHard grunt-html-validation option; fixes #11876
Chris Rebert [Tue, 17 Dec 2013 09:29:19 +0000 (01:29 -0800)]
upgrade to grunt-html-validation v0.1.11
Sebastian Podjasek [Mon, 16 Dec 2013 21:47:09 +0000 (22:47 +0100)]
Fix handling of btn-group placed inside input-group-btn (used for mixing dropdowns with normal buttons)
Zlatan Vasović [Sun, 15 Dec 2013 19:04:32 +0000 (20:04 +0100)]
Require comma on left side
Chris Rebert [Mon, 16 Dec 2013 08:43:21 +0000 (00:43 -0800)]
Merge pull request #11893 from twbs/separate-browsers-file
move Sauce test browsers list out of Gruntfile into separate file
Chris Rebert [Mon, 16 Dec 2013 08:30:04 +0000 (00:30 -0800)]
move Sauce test browsers list out of Gruntfile into separate file
Chris Rebert [Mon, 16 Dec 2013 08:02:42 +0000 (00:02 -0800)]
Merge pull request #11891 from twbs/cache-jekyll-bundle
use S3-cached Jekyll install to further speed up the Travis build
Chris Rebert [Sun, 15 Dec 2013 05:02:15 +0000 (21:02 -0800)]
use S3-cached Jekyll install
Mark Otto [Mon, 16 Dec 2013 06:10:05 +0000 (22:10 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 16 Dec 2013 06:09:45 +0000 (22:09 -0800)]
inform the people that fixed positioning ain't all it's cracked up to be /cc #11888
Mark Otto [Mon, 16 Dec 2013 06:04:57 +0000 (22:04 -0800)]
Merge pull request #11887 from twbs/minor-panels-refactor
minor refactoring of
4ee93c9f8529cfeef56d4178b91e1ddcb0bff09c
Chris Rebert [Mon, 16 Dec 2013 05:26:52 +0000 (21:26 -0800)]
Merge pull request #11890 from twbs/generic-caching
make S3 caching significantly more generic
Chris Rebert [Mon, 16 Dec 2013 05:09:01 +0000 (21:09 -0800)]
make S3 caching significantly more generic
Chris Rebert [Mon, 16 Dec 2013 04:38:06 +0000 (20:38 -0800)]
Chris Rebert [Mon, 16 Dec 2013 03:45:34 +0000 (19:45 -0800)]
Merge pull request #11886 from twbs/html-validator-config
explicitly set more HTML5 validator options
Chris Rebert [Mon, 16 Dec 2013 03:42:47 +0000 (19:42 -0800)]
explicitly set more HTML5 validator options
Chris Rebert [Mon, 16 Dec 2013 03:15:26 +0000 (19:15 -0800)]
use unique IDs for input feedback examples so HTML validates
Chris Rebert [Mon, 16 Dec 2013 03:07:14 +0000 (19:07 -0800)]
use unique IDs for modal labels in doc examples so HTML validates
Chris Rebert [Mon, 16 Dec 2013 03:00:37 +0000 (19:00 -0800)]
simplify JS snippet slightly
Chris Rebert [Mon, 16 Dec 2013 02:45:56 +0000 (18:45 -0800)]
fix typo in docs
Chris Rebert [Mon, 16 Dec 2013 02:18:55 +0000 (18:18 -0800)]
fix var name in example to follow JS conventions
Chris Rebert [Mon, 16 Dec 2013 02:13:50 +0000 (18:13 -0800)]
copyediting
Mark Otto [Mon, 16 Dec 2013 01:22:55 +0000 (17:22 -0800)]
Fixes #10492 again, this time for last row's corners on striped tables
Mark Otto [Mon, 16 Dec 2013 01:15:09 +0000 (17:15 -0800)]
Add new form feedback states, clean up existing form styles
New stuff:
* Adds `.has-feedback` and `.form-control-feedback` to show icon-based
form feedback to users. Fixes #11836.
* Removes the `width: 1em` on `.glyphicon` because it makes it
impractical to resize the width of all icons, even if they’re not
“empty” (e.g., a simple `.glyphicon { width: 30px; }` wouldn’t work,
nor would a class preceeded by a parent class.
Clean up:
* Sets `width: auto;` on all `.form-control`s within inline forms.
* Removes all the inline `select` menu `width` styles because all
inputs are now `auto`.
* Update form states docs to separate out sections better.
Mark Otto [Sun, 15 Dec 2013 23:27:46 +0000 (15:27 -0800)]
Fixes #11266: Apply a pixel-based line-height to date inputs for iOS 7
Mark Otto [Sun, 15 Dec 2013 23:24:52 +0000 (15:24 -0800)]
formatting and comment
Mark Otto [Sun, 15 Dec 2013 23:07:38 +0000 (15:07 -0800)]
Merge branch 'master' into pr/11817
Conflicts:
dist/css/bootstrap.min.css
less/input-groups.less
Mark Otto [Sun, 15 Dec 2013 22:52:49 +0000 (14:52 -0800)]
Fixes #11402: Updated fix for select.form-control width in inline-forms
Mark Otto [Sun, 15 Dec 2013 22:32:14 +0000 (14:32 -0800)]
grunt
Mark Otto [Sun, 15 Dec 2013 22:28:49 +0000 (14:28 -0800)]
Merge pull request #11494 from blowsie/patch-2
Fixed single dropdown-toggle in btn-group-veritcal not being rounded
Mark Otto [Sun, 15 Dec 2013 22:23:55 +0000 (14:23 -0800)]
Fixes #11660: Depcreate small and .small in blockquote in favor of footer
Mark Otto [Sun, 15 Dec 2013 22:14:32 +0000 (14:14 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 15 Dec 2013 22:14:09 +0000 (14:14 -0800)]
revert an earlier change to move the component-animations.less file because it fubared modal backdrop .fade usage
Mark Otto [Sun, 15 Dec 2013 22:13:25 +0000 (14:13 -0800)]
run grunt on modal scrolling change
Mark Otto [Sun, 15 Dec 2013 22:10:48 +0000 (14:10 -0800)]
Merge branch 'master' into pr/11676
Conflicts:
less/modals.less
Mark Otto [Sun, 15 Dec 2013 22:09:50 +0000 (14:09 -0800)]
Merge branch 'master' into pr/11776
Conflicts:
package.json
Mark Otto [Sun, 15 Dec 2013 22:07:17 +0000 (14:07 -0800)]
Merge pull request #11732 from dak/include-dev-fonts-in-bower
Don't exclude fonts from bower installs
Mark Otto [Sun, 15 Dec 2013 21:53:41 +0000 (13:53 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 15 Dec 2013 21:52:56 +0000 (13:52 -0800)]
typo
Mark Otto [Sun, 15 Dec 2013 21:46:11 +0000 (13:46 -0800)]
Merge pull request #11840 from ZDroid/pagination-boom
Improve pager customization
Mark Otto [Sun, 15 Dec 2013 21:44:26 +0000 (13:44 -0800)]
Fixes #11783: Document requirement of .container(-fluid) in navbars
Mark Otto [Sun, 15 Dec 2013 21:39:45 +0000 (13:39 -0800)]
Fixes #11795: Update the contributing guidelines to include some more CSS guidelines
Mark Otto [Sun, 15 Dec 2013 21:08:17 +0000 (13:08 -0800)]
Clarify number of columns in nested grid
Mark Otto [Sun, 15 Dec 2013 20:41:47 +0000 (12:41 -0800)]
Fixes #11799: Mention support of number of add-ons in docs
Mark Otto [Sun, 15 Dec 2013 20:31:40 +0000 (12:31 -0800)]
Fixes #11770: Move component-animations.less to the utility section of import list to match Customizer
Mark Otto [Sun, 15 Dec 2013 20:27:46 +0000 (12:27 -0800)]
Browser/device support docs update
* Fixes #11055: add mention of select menu styling on Android stock
browsers with included optional fix
* Update IDs and docs nav to include bookmark links to each section
* Add callout to navbar docs about fixed position, inputs, and virtual
keyboard
Mark Otto [Sun, 15 Dec 2013 19:44:16 +0000 (11:44 -0800)]
Fixes #11833: add warning to docs for popover multiple line positioning; update it's docs with example markup, too
Mark Otto [Sun, 15 Dec 2013 19:41:46 +0000 (11:41 -0800)]
update tooltip docs
Mark Otto [Sun, 15 Dec 2013 19:36:16 +0000 (11:36 -0800)]
Fixes #11805 with docs mention of navbar
Mark Otto [Sun, 15 Dec 2013 19:33:06 +0000 (11:33 -0800)]
finalize blog template
Mark Otto [Sun, 15 Dec 2013 19:29:58 +0000 (11:29 -0800)]
Restyle the blockquote to not thin text or change line-height
Mark Otto [Sun, 15 Dec 2013 19:16:57 +0000 (11:16 -0800)]
Merge branch 'master' into cover_template
Mark Otto [Sun, 15 Dec 2013 19:09:03 +0000 (11:09 -0800)]
Change variable
Mark Otto [Sun, 15 Dec 2013 19:02:45 +0000 (11:02 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 15 Dec 2013 19:02:32 +0000 (11:02 -0800)]
Fixes #11829: Adds .make-xs-column mixins