]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoFix having multiple selectors on a single line. 15628/head
Kevin Kirsche [Wed, 21 Jan 2015 21:38:58 +0000 (16:38 -0500)] 
Fix having multiple selectors on a single line.

11 years agoautomatic grunt dist
Bootstrap's Grunt bot [Wed, 21 Jan 2015 21:20:51 +0000 (21:20 +0000)] 
automatic grunt dist

11 years agoMerge pull request #15620 from twbs/iso-4217
Chris Rebert [Wed, 21 Jan 2015 21:16:57 +0000 (13:16 -0800)] 
Merge pull request #15620 from twbs/iso-4217

Add .glyphicon-* aliases for other ISO 4217-ish currency codes

11 years agoMerge pull request #90 from twbs/at-viewport
Chris Rebert [Wed, 21 Jan 2015 21:14:07 +0000 (13:14 -0800)] 
Merge pull request #90 from twbs/at-viewport

Reorg @viewport now that we don't need to worry about non-responsiveness

11 years agoReorg @viewport now that we don't need to worry about non-responsive layouts
Chris Rebert [Wed, 21 Jan 2015 20:41:11 +0000 (12:41 -0800)] 
Reorg @viewport now that we don't need to worry about non-responsive layouts

11 years agoMerge branch 'v4' of twbs/bootstrap/v4 into v4
Chris Rebert [Wed, 21 Jan 2015 21:02:55 +0000 (13:02 -0800)] 
Merge branch 'v4' of twbs/bootstrap/v4 into v4

11 years agoMerge branch 'master' into v4
Chris Rebert [Wed, 21 Jan 2015 21:00:12 +0000 (13:00 -0800)] 
Merge branch 'master' into v4

11 years agotesting out svgs
Mark Otto [Wed, 21 Jan 2015 20:01:36 +0000 (12:01 -0800)] 
testing out svgs

11 years agoFix issue twbs/bootstrap#15561
Kevin Kirsche [Wed, 21 Jan 2015 17:01:25 +0000 (12:01 -0500)] 
Fix issue twbs/bootstrap#15561

Fix issue twbs/bootstrap#15561 regarding badges not shrinking to fit inside of .btn-group-xs

11 years agoMerge pull request #15621 from twbs/fix-12832
Chris Rebert [Wed, 21 Jan 2015 08:02:09 +0000 (00:02 -0800)] 
Merge pull request #15621 from twbs/fix-12832

Document sticky :hover on mobile browsers

11 years agoCarousel example: move the Base64 images outside of the HTML. 15255/head
XhmikosR [Sun, 30 Nov 2014 11:09:30 +0000 (13:09 +0200)] 
Carousel example: move the Base64 images outside of the HTML.

Use a simple blank.gif and change the background color instead of duplicating stuff.

11 years agoMove inline CSS to docs.css.
XhmikosR [Thu, 20 Nov 2014 08:09:47 +0000 (10:09 +0200)] 
Move inline CSS to docs.css.

11 years agoAdd AnchorJS for docs anchors. 15491/head
XhmikosR [Tue, 28 Oct 2014 21:50:22 +0000 (23:50 +0200)] 
Add AnchorJS for docs anchors.

11 years agoseveral docs cleanup things
Mark Otto [Wed, 21 Jan 2015 06:57:24 +0000 (22:57 -0800)] 
several docs cleanup things

11 years agocopy
Mark Otto [Wed, 21 Jan 2015 05:55:20 +0000 (21:55 -0800)] 
copy

11 years agofix dupe images
Mark Otto [Wed, 21 Jan 2015 05:12:31 +0000 (21:12 -0800)] 
fix dupe images

11 years agocustom holder theme
Mark Otto [Wed, 21 Jan 2015 05:12:25 +0000 (21:12 -0800)] 
custom holder theme

11 years agoMerge pull request #15503 from twbs/qunit
Chris Rebert [Wed, 21 Jan 2015 04:23:34 +0000 (20:23 -0800)] 
Merge pull request #15503 from twbs/qunit

Update QUnit to v1.17.0.

11 years agotweak 'close reopened modal' unit test to work under new QUnit API 15503/head
Chris Rebert [Wed, 21 Jan 2015 04:18:33 +0000 (20:18 -0800)] 
tweak 'close reopened modal' unit test to work under new QUnit API

11 years agofix bug in tab show/shown relatedTarget unit test
Chris Rebert [Wed, 21 Jan 2015 04:16:42 +0000 (20:16 -0800)] 
fix bug in tab show/shown relatedTarget unit test

11 years agoupdate JS unit tests to future-proof QUnit 1.16.0 API
Chris Rebert [Wed, 21 Jan 2015 03:40:50 +0000 (19:40 -0800)] 
update JS unit tests to future-proof QUnit 1.16.0 API

[skip validator]

11 years agoDocument sticky :hover on mobile browsers; fixes #12832 15621/head
Chris Rebert [Wed, 21 Jan 2015 03:22:20 +0000 (19:22 -0800)] 
Document sticky :hover on mobile browsers; fixes #12832

11 years agolarge page titles
Mark Otto [Wed, 21 Jan 2015 02:50:07 +0000 (18:50 -0800)] 
large page titles

11 years agogrunt
Mark Otto [Wed, 21 Jan 2015 02:48:18 +0000 (18:48 -0800)] 
grunt

11 years agoMerge branch 'v4' of https://github.com/twbs/derpstrap into v4
Mark Otto [Wed, 21 Jan 2015 01:05:53 +0000 (17:05 -0800)] 
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

11 years agofix docs homepage ad
Mark Otto [Wed, 21 Jan 2015 01:05:39 +0000 (17:05 -0800)] 
fix docs homepage ad

11 years agoAdd .glyphicon-* aliases for other ISO 4217-ish currency codes 15620/head
Chris Rebert [Wed, 21 Jan 2015 00:24:34 +0000 (16:24 -0800)] 
Add .glyphicon-* aliases for other ISO 4217-ish currency codes

Fixes #15617.

11 years agoMerge pull request #61 from twbs/clear-out-fonts
Mark Otto [Tue, 20 Jan 2015 23:40:37 +0000 (15:40 -0800)] 
Merge pull request #61 from twbs/clear-out-fonts

remove unused font files

11 years agoUpdate README.md
Mark Otto [Tue, 20 Jan 2015 23:40:32 +0000 (15:40 -0800)] 
Update README.md

11 years agoMerge pull request #15619 from twbs/markdown
Chris Rebert [Tue, 20 Jan 2015 21:25:24 +0000 (13:25 -0800)] 
Merge pull request #15619 from twbs/markdown

Change markdown library

11 years agoupdate shrinkwrap 15619/head
Chris Rebert [Tue, 20 Jan 2015 21:05:38 +0000 (13:05 -0800)] 
update shrinkwrap

11 years agoremarkable -> markdown-it
Chris Rebert [Tue, 20 Jan 2015 21:04:35 +0000 (13:04 -0800)] 
remarkable -> markdown-it

11 years agoMerge pull request #15618 from twbs/update-sauce
Chris Rebert [Tue, 20 Jan 2015 21:04:17 +0000 (13:04 -0800)] 
Merge pull request #15618 from twbs/update-sauce

update grunt-saucelabs to ~8.5.0

11 years agoupdate shrinkwrap 15618/head
Chris Rebert [Tue, 20 Jan 2015 20:49:46 +0000 (12:49 -0800)] 
update shrinkwrap

11 years agoupdate grunt-saucelabs to ~8.5.0
Chris Rebert [Tue, 20 Jan 2015 20:49:08 +0000 (12:49 -0800)] 
update grunt-saucelabs to ~8.5.0

11 years agonew headers, ad placements, intro paragraphs on several pages, etc
Mark Otto [Tue, 20 Jan 2015 04:03:08 +0000 (20:03 -0800)] 
new headers, ad placements, intro paragraphs on several pages, etc

11 years agofix scrollspy nav
Mark Otto [Tue, 20 Jan 2015 02:51:21 +0000 (18:51 -0800)] 
fix scrollspy nav

11 years agoMerge pull request #52 from twbs/normalize-figure
Chris Rebert [Tue, 20 Jan 2015 00:58:01 +0000 (16:58 -0800)] 
Merge pull request #52 from twbs/normalize-figure

Let Normalize.css normalize <figure>'s margin

11 years agofix broken brand logos
Mark Otto [Tue, 20 Jan 2015 00:18:38 +0000 (16:18 -0800)] 
fix broken brand logos

11 years agono need for additional subheading
Mark Otto [Tue, 20 Jan 2015 00:17:54 +0000 (16:17 -0800)] 
no need for additional subheading

11 years agotons of docs helpers cleanup
Mark Otto [Tue, 20 Jan 2015 00:15:51 +0000 (16:15 -0800)] 
tons of docs helpers cleanup

11 years agoproperly reset button.close styles
Mark Otto [Tue, 20 Jan 2015 00:11:39 +0000 (16:11 -0800)] 
properly reset button.close styles

11 years agofix quick floats example
Mark Otto [Tue, 20 Jan 2015 00:11:29 +0000 (16:11 -0800)] 
fix quick floats example

11 years agofix broken breadcrumb divider
Mark Otto [Tue, 20 Jan 2015 00:08:48 +0000 (16:08 -0800)] 
fix broken breadcrumb divider

11 years agofix broken buttons
Mark Otto [Tue, 20 Jan 2015 00:03:41 +0000 (16:03 -0800)] 
fix broken buttons

11 years agoseparate examples for inline radios and checkboxes
Mark Otto [Tue, 20 Jan 2015 00:01:28 +0000 (16:01 -0800)] 
separate examples for inline radios and checkboxes

11 years agoconsolidate forms docs
Mark Otto [Tue, 20 Jan 2015 00:00:56 +0000 (16:00 -0800)] 
consolidate forms docs

11 years agodocs subheading tweaks
Mark Otto [Mon, 19 Jan 2015 23:53:21 +0000 (15:53 -0800)] 
docs subheading tweaks

11 years agofix border color on inverse tables
Mark Otto [Mon, 19 Jan 2015 23:52:40 +0000 (15:52 -0800)] 
fix border color on inverse tables

11 years agobetter separation of docs sections with a light bottom border on h2s
Mark Otto [Mon, 19 Jan 2015 23:49:44 +0000 (15:49 -0800)] 
better separation of docs sections with a light bottom border on h2s

11 years agoremove unnecessary docs sections for media queries page
Mark Otto [Mon, 19 Jan 2015 23:44:53 +0000 (15:44 -0800)] 
remove unnecessary docs sections for media queries page

11 years agofix homepage nav styles
Mark Otto [Mon, 19 Jan 2015 23:44:45 +0000 (15:44 -0800)] 
fix homepage nav styles

11 years agonuke files
Mark Otto [Mon, 19 Jan 2015 23:25:53 +0000 (15:25 -0800)] 
nuke files

11 years agomove around files
Mark Otto [Mon, 19 Jan 2015 23:25:49 +0000 (15:25 -0800)] 
move around files

11 years agoautomatic grunt dist
Bootstrap's Grunt bot [Mon, 19 Jan 2015 23:20:54 +0000 (23:20 +0000)] 
automatic grunt dist

11 years agoMerge pull request #15606 from tagliala/trim-whitespaces
Mark Otto [Mon, 19 Jan 2015 23:13:16 +0000 (15:13 -0800)] 
Merge pull request #15606 from tagliala/trim-whitespaces

Trim whitespaces

11 years agogrunt
Mark Otto [Mon, 19 Jan 2015 22:55:25 +0000 (14:55 -0800)] 
grunt

11 years agofix invalid css
Mark Otto [Mon, 19 Jan 2015 22:50:41 +0000 (14:50 -0800)] 
fix invalid css

11 years agoMerge branch 'master' into v4
Mark Otto [Mon, 19 Jan 2015 22:48:12 +0000 (14:48 -0800)] 
Merge branch 'master' into v4

Conflicts:
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs/_includes/components/thumbnails.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/template.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/assets/css/docs.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/src/customizer.js
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.js
docs/dist/js/bootstrap.min.js
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/theme/index.html
grunt/configBridge.json
less/alerts.less
less/badges.less
less/jumbotron.less
less/panels.less
less/tables.less
less/theme.less
less/variables.less
package.json
scss/_button-group.scss
scss/_buttons.scss
scss/_forms.scss

11 years agoTrim whitespaces 15606/head
Geremia Taglialatela [Mon, 19 Jan 2015 20:26:01 +0000 (21:26 +0100)] 
Trim whitespaces

11 years agoUpdate QUnit to v1.17.0.
XhmikosR [Mon, 19 Jan 2015 17:05:24 +0000 (19:05 +0200)] 
Update QUnit to v1.17.0.

11 years agoMerge pull request #15605 from twbs/deps
XhmikosR [Mon, 19 Jan 2015 17:54:43 +0000 (19:54 +0200)] 
Merge pull request #15605 from twbs/deps

Update devDependencies.

11 years agoUpdate devDependencies. 15605/head
XhmikosR [Mon, 19 Jan 2015 17:13:43 +0000 (19:13 +0200)] 
Update devDependencies.

11 years agocustomizer typo
Mark Otto [Mon, 19 Jan 2015 17:19:09 +0000 (09:19 -0800)] 
customizer typo

11 years agoMerge pull request #15604 from twbs/ship_v3.3.2 v3.3.2
Mark Otto [Mon, 19 Jan 2015 17:03:09 +0000 (09:03 -0800)] 
Merge pull request #15604 from twbs/ship_v3.3.2

Ship v3.3.2

11 years agogrunt 15604/head
Mark Otto [Mon, 19 Jan 2015 16:33:33 +0000 (08:33 -0800)] 
grunt

11 years agobump versions
Mark Otto [Mon, 19 Jan 2015 16:32:13 +0000 (08:32 -0800)] 
bump versions

11 years agogrunt
Mark Otto [Mon, 19 Jan 2015 16:27:15 +0000 (08:27 -0800)] 
grunt

11 years agoremove less references from package files
Thomas McDonald [Fri, 9 Jan 2015 10:26:16 +0000 (10:26 +0000)] 
remove less references from package files

Closes #62 (of v4)

11 years agoMerge pull request #64 from twbs/fix-build
Chris Rebert [Sun, 18 Jan 2015 23:08:12 +0000 (15:08 -0800)] 
Merge pull request #64 from twbs/fix-build

Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss"

11 years agofixes #15497: increase decimals on line-height-large from 1.33 to 1.3333333 to fix...
Mark Otto [Sun, 18 Jan 2015 23:03:14 +0000 (15:03 -0800)] 
fixes #15497: increase decimals on line-height-large from 1.33 to 1.3333333 to fix button sizing in Win 8.1 Chrome

11 years agoTemporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss"
Chris Rebert [Sun, 18 Jan 2015 22:53:06 +0000 (14:53 -0800)] 
Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss"

This reverts commit 2916ac43ed57baacc49d2cc7550b8d1dfe87b261.
This reverts commit 3d635f30795deb11ee7feaea5595b78c70221389.
This reverts commit 61a21205575aa03b4fbbacee2052d20bf75941d4.

This change broke the Grunt build.

11 years agofix main SCSS file paths
Chris Rebert [Sun, 18 Jan 2015 22:29:51 +0000 (14:29 -0800)] 
fix main SCSS file paths

Fixes 2916ac43ed57baacc49d2cc7550b8d1dfe87b261 errata
FYI @glebm

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 18 Jan 2015 21:39:50 +0000 (13:39 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #15142: Add position: relative; to .dropup for proper placement of menus
Mark Otto [Sun, 18 Jan 2015 21:39:40 +0000 (13:39 -0800)] 
Fixes #15142: Add position: relative; to .dropup for proper placement of menus

11 years agorm dummy href from dismiss-on-next-click popover example; fixes #15277
Chris Rebert [Sun, 18 Jan 2015 20:51:47 +0000 (12:51 -0800)] 
rm dummy href from dismiss-on-next-click popover example; fixes #15277

11 years agoMerge branch 'master' into pr/15278
Mark Otto [Sun, 18 Jan 2015 20:24:29 +0000 (12:24 -0800)] 
Merge branch 'master' into pr/15278

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css

11 years agogrunt
Mark Otto [Sun, 18 Jan 2015 20:22:43 +0000 (12:22 -0800)] 
grunt

11 years agoMerge pull request #15594 from twbs/fix_15493
Mark Otto [Sun, 18 Jan 2015 05:51:03 +0000 (21:51 -0800)] 
Merge pull request #15594 from twbs/fix_15493

Fixes #15493: inherit color on small/.small in .panel-title

11 years agofixes #15493: inherit color on small/.small in .panel-title 15594/head
Mark Otto [Sun, 18 Jan 2015 05:35:55 +0000 (21:35 -0800)] 
fixes #15493: inherit color on small/.small in .panel-title

11 years agoautomatic grunt dist
Bootstrap's Grunt bot [Sun, 18 Jan 2015 05:11:01 +0000 (05:11 +0000)] 
automatic grunt dist

11 years agoMerge pull request #15551 from lee101/master
Mark Otto [Sun, 18 Jan 2015 05:07:13 +0000 (21:07 -0800)] 
Merge pull request #15551 from lee101/master

Fix table-striped to work with bootstraps tooltips on rows

11 years ago#15576 errata: #15298 also reproduces on Linux
Chris Rebert [Fri, 16 Jan 2015 23:16:52 +0000 (15:16 -0800)] 
#15576 errata: #15298 also reproduces on Linux

See https://github.com/twbs/bootstrap/issues/15298#issuecomment-69216754

11 years agoautomatic grunt dist
Bootstrap's Grunt bot [Fri, 16 Jan 2015 21:41:05 +0000 (21:41 +0000)] 
automatic grunt dist

11 years agoMerge pull request #15589 from KevinJannis/patch-3
Mark Otto [Fri, 16 Jan 2015 21:31:52 +0000 (13:31 -0800)] 
Merge pull request #15589 from KevinJannis/patch-3

Added blank line between selectors in badges

11 years agoAdded blank line between selectors in badges 15589/head
Kevin Jannis [Fri, 16 Jan 2015 20:44:27 +0000 (21:44 +0100)] 
Added blank line between selectors in badges

11 years agoautomatic grunt dist
Bootstrap's Grunt bot [Fri, 16 Jan 2015 19:11:06 +0000 (19:11 +0000)] 
automatic grunt dist

11 years ago.form-control: add note about <select> & border-radius
Chris Rebert [Fri, 16 Jan 2015 19:02:51 +0000 (11:02 -0800)] 
.form-control: add note about <select> & border-radius

Refs #15340

11 years agoautomatic grunt dist
Bootstrap's Grunt bot [Fri, 16 Jan 2015 16:41:05 +0000 (16:41 +0000)] 
automatic grunt dist

11 years agoMerge pull request #15583 from twbs/deps
XhmikosR [Fri, 16 Jan 2015 16:38:52 +0000 (18:38 +0200)] 
Merge pull request #15583 from twbs/deps

Update devDependencies.

11 years agoMerge pull request #15581 from twbs/inline-form-with-visible-labels
Chris Rebert [Fri, 16 Jan 2015 16:20:41 +0000 (08:20 -0800)] 
Merge pull request #15581 from twbs/inline-form-with-visible-labels

Add example of using .form-inline with visible <label>s

11 years agoFix bogus JSCS warning. 15583/head
XhmikosR [Fri, 16 Jan 2015 15:45:58 +0000 (17:45 +0200)] 
Fix bogus JSCS warning.

11 years agoUpdate JSCS config for the new version.
XhmikosR [Fri, 16 Jan 2015 15:43:39 +0000 (17:43 +0200)] 
Update JSCS config for the new version.

11 years agoUpdate devDependencies.
XhmikosR [Fri, 16 Jan 2015 08:10:02 +0000 (10:10 +0200)] 
Update devDependencies.

11 years agoMerge pull request #15585 from dancourse/patch-1
Mark Otto [Fri, 16 Jan 2015 11:03:28 +0000 (03:03 -0800)] 
Merge pull request #15585 from dancourse/patch-1

12 items of *fewer* as it's a countable item

11 years agoautomatic grunt dist
Bootstrap's Grunt bot [Fri, 16 Jan 2015 10:51:20 +0000 (10:51 +0000)] 
automatic grunt dist

11 years agoMerge pull request #15584 from KevinJannis/patch-2
Mark Otto [Fri, 16 Jan 2015 10:41:11 +0000 (02:41 -0800)] 
Merge pull request #15584 from KevinJannis/patch-2

Added blank lines between selectors for alerts

11 years ago12 items of *fewer* as it's a countable item 15585/head
Dan Course [Fri, 16 Jan 2015 10:36:46 +0000 (10:36 +0000)] 
12 items of *fewer* as it's a countable item

http://www.oxforddictionaries.com/words/less-or-fewer

11 years agoAdded blank lines between selectors for alerts 15584/head
Kevin Jannis [Fri, 16 Jan 2015 09:06:35 +0000 (10:06 +0100)] 
Added blank lines between selectors for alerts

11 years agocustom widths not always required for inline form fields
Chris Rebert [Fri, 16 Jan 2015 01:52:02 +0000 (17:52 -0800)] 
custom widths not always required for inline form fields

[skip sauce]