]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
10 years agoRemove IE8 compat shims from JS visual tests
Chris Rebert [Mon, 15 Dec 2014 19:38:57 +0000 (11:38 -0800)] 
Remove IE8 compat shims from JS visual tests

10 years agodocs tweak /cc @glebm
Mark Otto [Thu, 11 Dec 2014 22:36:19 +0000 (14:36 -0800)] 
docs tweak /cc @glebm

10 years agonuke auto truncating message
Mark Otto [Thu, 11 Dec 2014 22:19:02 +0000 (14:19 -0800)] 
nuke auto truncating message

10 years agoUse grid classes or mixins on .dl-horizontal, update docs to include it, removes...
Mark Otto [Thu, 11 Dec 2014 22:12:10 +0000 (14:12 -0800)] 
Use grid classes or mixins on .dl-horizontal, update docs to include it, removes auto truncate and makes .text-overflow mixin into a .text-truncate class and mixin combo for better granularity

10 years agogrunt
Mark Otto [Thu, 11 Dec 2014 21:54:24 +0000 (13:54 -0800)] 
grunt

10 years agoMerge pull request #16 from twbs/android-lollipop
Mark Otto [Thu, 11 Dec 2014 21:53:58 +0000 (13:53 -0800)] 
Merge pull request #16 from twbs/android-lollipop

Officially support the Android Browser on Android v5.0+

10 years agoMerge pull request #15 from twbs/v4_builds
Mark Otto [Thu, 11 Dec 2014 20:21:26 +0000 (12:21 -0800)] 
Merge pull request #15 from twbs/v4_builds

Stub out v4 custom builds

10 years agoMerge pull request #14 from twbs/nuke_customizer
Mark Otto [Thu, 11 Dec 2014 20:21:05 +0000 (12:21 -0800)] 
Merge pull request #14 from twbs/nuke_customizer

Nuke the customizer

10 years agoMerge pull request #13 from twbs/default-vars
Mark Otto [Thu, 11 Dec 2014 20:20:05 +0000 (12:20 -0800)] 
Merge pull request #13 from twbs/default-vars

Apply !default to SCSS variables

10 years agoMerge pull request #8 from twbs/scss-lint
Mark Otto [Thu, 11 Dec 2014 20:16:45 +0000 (12:16 -0800)] 
Merge pull request #8 from twbs/scss-lint

Add SCSS-Lint to Grunt

10 years agoMerge branch 'v4' into scss-lint
Mark Otto [Thu, 11 Dec 2014 20:07:09 +0000 (12:07 -0800)] 
Merge branch 'v4' into scss-lint

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
scss/_card.scss

10 years agoMerge branch 'v4' of https://github.com/twbs/derpstrap into v4
Mark Otto [Thu, 11 Dec 2014 20:06:16 +0000 (12:06 -0800)] 
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

10 years agogrunt
Mark Otto [Thu, 11 Dec 2014 20:06:08 +0000 (12:06 -0800)] 
grunt

10 years agofix all validation, turn off some settings, add sort order
Mark Otto [Thu, 11 Dec 2014 20:05:29 +0000 (12:05 -0800)] 
fix all validation, turn off some settings, add sort order

10 years agoOfficially support the Android Browser on Android v5.0+
Chris Rebert [Thu, 11 Dec 2014 18:48:32 +0000 (10:48 -0800)] 
Officially support the Android Browser on Android v5.0+

10 years agoMerge pull request #6 from twbs/grid-framework-refactor
Gleb Mazovetskiy [Thu, 11 Dec 2014 15:16:42 +0000 (15:16 +0000)] 
Merge pull request #6 from twbs/grid-framework-refactor

Refactor grid_framework

10 years agoMerge branch 'v4' of https://github.com/twbs/derpstrap into v4
Mark Otto [Thu, 11 Dec 2014 04:51:17 +0000 (20:51 -0800)] 
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/css/docs.min.css.map

10 years agostub out descriptions and titles for potential custom builds
Mark Otto [Wed, 10 Dec 2014 22:12:20 +0000 (14:12 -0800)] 
stub out descriptions and titles for potential custom builds

10 years agonuke the customizer
Mark Otto [Wed, 10 Dec 2014 21:51:43 +0000 (13:51 -0800)] 
nuke the customizer

10 years agogrunt
Mark Otto [Wed, 10 Dec 2014 21:49:53 +0000 (13:49 -0800)] 
grunt

10 years agoApply !default to SCSS variables
Chris Rebert [Wed, 10 Dec 2014 00:24:05 +0000 (16:24 -0800)] 
Apply !default to SCSS variables

Per @thomas-mcdonald

10 years agoMerge pull request #9 from twbs/less-vendor-prefixing
Mark Otto [Tue, 9 Dec 2014 06:48:03 +0000 (22:48 -0800)] 
Merge pull request #9 from twbs/less-vendor-prefixing

_progress.scss: remove unnecessary @-webkit-keyframes

10 years agoMerge pull request #10 from twbs/bye-gradient-vendors
Mark Otto [Tue, 9 Dec 2014 06:47:42 +0000 (22:47 -0800)] 
Merge pull request #10 from twbs/bye-gradient-vendors

remove explicit vendor prefixes from _gradients.scss

10 years agoMerge pull request #11 from twbs/card-columns-vendor
Mark Otto [Tue, 9 Dec 2014 06:47:17 +0000 (22:47 -0800)] 
Merge pull request #11 from twbs/card-columns-vendor

remove explicit vendor prefixing from _card.scss

10 years agoremove explicit vendor prefixing from _card.scss
Chris Rebert [Tue, 9 Dec 2014 06:05:50 +0000 (22:05 -0800)] 
remove explicit vendor prefixing from _card.scss

10 years agoremove explicit vendor prefixes from _gradients.scss
Chris Rebert [Tue, 9 Dec 2014 06:00:05 +0000 (22:00 -0800)] 
remove explicit vendor prefixes from _gradients.scss

10 years ago_progress.scss: remove unnecessary @-webkit-keyframes
Chris Rebert [Tue, 9 Dec 2014 04:36:33 +0000 (20:36 -0800)] 
_progress.scss: remove unnecessary @-webkit-keyframes

Autoprefixer already takes care of this for us.

10 years agoSCSS-Lint: StringQuotes: double_quotes , to match current style
Chris Rebert [Tue, 9 Dec 2014 04:00:13 +0000 (20:00 -0800)] 
SCSS-Lint: StringQuotes: double_quotes , to match current style

10 years agotemporarily disable PropertySortOrder since it defaults to alphabetical
Chris Rebert [Tue, 9 Dec 2014 03:59:21 +0000 (19:59 -0800)] 
temporarily disable PropertySortOrder since it defaults to alphabetical

10 years agoSCSS-Lint: disable arbitrary selector/nesting depth limits
Chris Rebert [Tue, 9 Dec 2014 03:58:25 +0000 (19:58 -0800)] 
SCSS-Lint: disable arbitrary selector/nesting depth limits

10 years agoSCSS-Lint: SpaceBeforeBrace: allow_single_line_padding: true
Chris Rebert [Tue, 9 Dec 2014 03:57:05 +0000 (19:57 -0800)] 
SCSS-Lint: SpaceBeforeBrace: allow_single_line_padding: true

10 years agoadd test-scss Grunt task
Chris Rebert [Tue, 9 Dec 2014 03:02:25 +0000 (19:02 -0800)] 
add test-scss Grunt task

10 years agoadd default SCSS-Lint config
Chris Rebert [Tue, 9 Dec 2014 03:00:05 +0000 (19:00 -0800)] 
add default SCSS-Lint config

10 years agoTravis: install scss-lint
Chris Rebert [Tue, 9 Dec 2014 02:34:15 +0000 (18:34 -0800)] 
Travis: install scss-lint

10 years agoRefactor grid-framework followup
Gleb Mazovetskiy [Sun, 7 Dec 2014 14:52:44 +0000 (14:52 +0000)] 
Refactor grid-framework followup

* Split up calc-grid-column, generate selectors in make-grid
* Iterate over $grid-breakpoints and (pull, push, offset)

10 years agoRefactor grid_framework
Gleb Mazovetskiy [Fri, 5 Dec 2014 10:53:43 +0000 (10:53 +0000)] 
Refactor grid_framework

A more idiomatic refactoring of the grid framework

* Use %-placeholder instead of generating a class name list
* Use if expression
* Remove loop-grid-columns

10 years agoinline-block on labels now instead of inline
Mark Otto [Sat, 6 Dec 2014 08:33:36 +0000 (00:33 -0800)] 
inline-block on labels now instead of inline

10 years agoremove docs warning on inline vs inline-block for labels
Mark Otto [Sat, 6 Dec 2014 08:30:28 +0000 (00:30 -0800)] 
remove docs warning on inline vs inline-block for labels

10 years agoclean up some docs css
Mark Otto [Sat, 6 Dec 2014 08:20:57 +0000 (00:20 -0800)] 
clean up some docs css

10 years agostub out extend section a bit
Mark Otto [Sat, 6 Dec 2014 08:18:44 +0000 (00:18 -0800)] 
stub out extend section a bit

10 years agotweak label component padding
Mark Otto [Sat, 6 Dec 2014 08:18:04 +0000 (00:18 -0800)] 
tweak label component padding

10 years agogrunt--fuuuuuuuuuuuuuck you line comments
Mark Otto [Fri, 5 Dec 2014 22:56:29 +0000 (14:56 -0800)] 
grunt--fuuuuuuuuuuuuuck you line comments

10 years agoMerge pull request #7 from twbs/gemfile
Gleb Mazovetskiy [Fri, 5 Dec 2014 22:39:51 +0000 (22:39 +0000)] 
Merge pull request #7 from twbs/gemfile

Specify ruby dev deps in Gemfile

10 years agoMerge pull request #4 from twbs/disable-source-comments
Gleb Mazovetskiy [Fri, 5 Dec 2014 22:39:32 +0000 (22:39 +0000)] 
Merge pull request #4 from twbs/disable-source-comments

Disable source comments

10 years agoUpdate test-infra/npm-shrinkwrap.json
Gleb Mazovetskiy [Fri, 5 Dec 2014 11:19:06 +0000 (11:19 +0000)] 
Update test-infra/npm-shrinkwrap.json

10 years agoSpecify ruby dev deps in Gemfile
Gleb Mazovetskiy [Fri, 5 Dec 2014 11:23:50 +0000 (11:23 +0000)] 
Specify ruby dev deps in Gemfile

10 years agoDisable source comments
Gleb Mazovetskiy [Fri, 5 Dec 2014 10:53:14 +0000 (10:53 +0000)] 
Disable source comments

Require latest grunt-sass, bumped dep

10 years agoMerge pull request #3 from twbs/v4_grid
Mark Otto [Fri, 5 Dec 2014 07:27:08 +0000 (23:27 -0800)] 
Merge pull request #3 from twbs/v4_grid

Add new grid tier

10 years agofix vars order, remove rando grid class from mixin
Mark Otto [Fri, 5 Dec 2014 06:32:39 +0000 (22:32 -0800)] 
fix vars order, remove rando grid class from mixin

10 years agoMerge branch 'v4' into v4_grid
Mark Otto [Fri, 5 Dec 2014 05:21:30 +0000 (21:21 -0800)] 
Merge branch 'v4' into v4_grid

10 years agoMerge branch 'v4' of https://github.com/twbs/derpstrap into v4
Mark Otto [Fri, 5 Dec 2014 05:20:54 +0000 (21:20 -0800)] 
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

10 years agotweak grid docs, add new tier
Mark Otto [Fri, 5 Dec 2014 05:02:04 +0000 (21:02 -0800)] 
tweak grid docs, add new tier

10 years agoMerge pull request #2 from twbs/data-example-id
Chris Rebert [Fri, 5 Dec 2014 03:14:55 +0000 (19:14 -0800)] 
Merge pull request #2 from twbs/data-example-id

Add support for example IDs to {% example %} template tag

10 years agomove media queries docs to new section of layout
Mark Otto [Fri, 5 Dec 2014 00:51:19 +0000 (16:51 -0800)] 
move media queries docs to new section of layout

10 years agogrunt dist
Mark Otto [Thu, 4 Dec 2014 23:29:53 +0000 (15:29 -0800)] 
grunt dist

10 years agofix margin on tables
Mark Otto [Thu, 4 Dec 2014 23:25:57 +0000 (15:25 -0800)] 
fix margin on tables

10 years agosass, not less
Mark Otto [Thu, 4 Dec 2014 23:25:24 +0000 (15:25 -0800)] 
sass, not less

10 years agolinting
Mark Otto [Thu, 4 Dec 2014 23:20:55 +0000 (15:20 -0800)] 
linting

10 years agogrunt
Mark Otto [Thu, 4 Dec 2014 23:20:45 +0000 (15:20 -0800)] 
grunt

10 years agofix blockquote margins, remify values
Mark Otto [Thu, 4 Dec 2014 23:19:23 +0000 (15:19 -0800)] 
fix blockquote margins, remify values

10 years agofix hr margins, remify border width
Mark Otto [Thu, 4 Dec 2014 23:18:16 +0000 (15:18 -0800)] 
fix hr margins, remify border width

10 years agorem-ify blog example and clean a few visuals up
Mark Otto [Thu, 4 Dec 2014 22:32:13 +0000 (14:32 -0800)] 
rem-ify blog example and clean a few visuals up

10 years agonew look for carousel example, convert to rems
Mark Otto [Thu, 4 Dec 2014 22:18:13 +0000 (14:18 -0800)] 
new look for carousel example, convert to rems

10 years agomore rem fixes for examples
Mark Otto [Thu, 4 Dec 2014 22:02:38 +0000 (14:02 -0800)] 
more rem fixes for examples

10 years agoconvert narrow jumbotron to rems
Mark Otto [Thu, 4 Dec 2014 09:10:26 +0000 (01:10 -0800)] 
convert narrow jumbotron to rems

10 years agouse static top navbar in jumbotron
Mark Otto [Thu, 4 Dec 2014 09:07:04 +0000 (01:07 -0800)] 
use static top navbar in jumbotron

10 years agorename css file
Mark Otto [Thu, 4 Dec 2014 09:06:09 +0000 (01:06 -0800)] 
rename css file

10 years agorename
Mark Otto [Thu, 4 Dec 2014 09:05:43 +0000 (01:05 -0800)] 
rename

10 years agoconvert jumbotron example to new navbar, fix container, and use rems in css
Mark Otto [Thu, 4 Dec 2014 09:04:07 +0000 (01:04 -0800)] 
convert jumbotron example to new navbar, fix container, and use rems in css

10 years agogrunt dist
Mark Otto [Thu, 4 Dec 2014 09:03:54 +0000 (01:03 -0800)] 
grunt dist

10 years agono need for .container's max-width: 100% since we use max-width now on all containers
Mark Otto [Thu, 4 Dec 2014 09:03:41 +0000 (01:03 -0800)] 
no need for .container's max-width: 100% since we use max-width now on all containers

10 years agofix heading margins
Mark Otto [Thu, 4 Dec 2014 09:03:23 +0000 (01:03 -0800)] 
fix heading margins

10 years agofix nav for grid template
Mark Otto [Thu, 4 Dec 2014 09:00:15 +0000 (01:00 -0800)] 
fix nav for grid template

10 years agoupdate starter template to use new navbar
Mark Otto [Thu, 4 Dec 2014 08:59:36 +0000 (00:59 -0800)] 
update starter template to use new navbar

10 years agorestore px to base font size var
Mark Otto [Thu, 4 Dec 2014 08:10:24 +0000 (00:10 -0800)] 
restore px to base font size var

10 years agofix the variables i broke, temporarily disabling line-height-computed
Mark Otto [Thu, 4 Dec 2014 08:09:37 +0000 (00:09 -0800)] 
fix the variables i broke, temporarily disabling line-height-computed

10 years agoMerge pull request #1 from twbs/scss
Mark Otto [Thu, 4 Dec 2014 02:15:37 +0000 (18:15 -0800)] 
Merge pull request #1 from twbs/scss

Move to Sass

10 years agofix broken textarea.form-control reported by @thomas-mcdonald
Mark Otto [Wed, 3 Dec 2014 19:23:53 +0000 (11:23 -0800)] 
fix broken textarea.form-control reported by @thomas-mcdonald

10 years agoAdd support for example IDs to {% example %} template tag
Chris Rebert [Wed, 3 Dec 2014 02:46:42 +0000 (18:46 -0800)] 
Add support for example IDs to {% example %} template tag

e.g. {% example html id=some-example-id-here %}

10 years agobit of cleanup
Mark Otto [Tue, 2 Dec 2014 22:03:43 +0000 (14:03 -0800)] 
bit of cleanup

10 years agoconvert to scss
Mark Otto [Tue, 2 Dec 2014 22:02:35 +0000 (14:02 -0800)] 
convert to scss

10 years agoremove broken examples link
Mark Otto [Tue, 2 Dec 2014 10:04:37 +0000 (02:04 -0800)] 
remove broken examples link

10 years agoadd examples description, remove browser bugs description
Mark Otto [Tue, 2 Dec 2014 00:51:48 +0000 (16:51 -0800)] 
add examples description, remove browser bugs description

10 years agomove examples index again, clean up nav
Mark Otto [Tue, 2 Dec 2014 00:51:31 +0000 (16:51 -0800)] 
move examples index again, clean up nav

10 years agorearrange examples
Mark Otto [Tue, 2 Dec 2014 00:12:15 +0000 (16:12 -0800)] 
rearrange examples

10 years agoupdate home and side nav to use new navbar structure
Mark Otto [Mon, 1 Dec 2014 23:41:11 +0000 (15:41 -0800)] 
update home and side nav to use new navbar structure

10 years agoadd new album example
Mark Otto [Mon, 1 Dec 2014 23:19:15 +0000 (15:19 -0800)] 
add new album example

10 years agoClean up navbar to remove .navbar-toggle, .navbar-collapse, and .navbar-header as...
Mark Otto [Mon, 1 Dec 2014 23:03:09 +0000 (15:03 -0800)] 
Clean up navbar to remove .navbar-toggle, .navbar-collapse, and .navbar-header as they are no longer used; Add .navbar-toggler to .navbar-inverse

10 years agonav tweaks
Mark Otto [Mon, 1 Dec 2014 10:06:30 +0000 (02:06 -0800)] 
nav tweaks

10 years agoMerge branch 'master' into v4
Mark Otto [Mon, 1 Dec 2014 09:41:10 +0000 (01:41 -0800)] 
Merge branch 'master' into v4

Conflicts:
docs/_includes/js/collapse.html

10 years agonuke the other incomplete example per @ianw
Mark Otto [Mon, 1 Dec 2014 09:39:31 +0000 (01:39 -0800)] 
nuke the other incomplete example per @ianw

10 years agofixes and grunt
Mark Otto [Mon, 1 Dec 2014 05:01:50 +0000 (21:01 -0800)] 
fixes and grunt

10 years agofix more broke shit, run grunt
Mark Otto [Mon, 1 Dec 2014 04:29:47 +0000 (20:29 -0800)] 
fix more broke shit, run grunt

10 years agoMerge branch 'master' into v4
Mark Otto [Mon, 1 Dec 2014 04:17:45 +0000 (20:17 -0800)] 
Merge branch 'master' into v4

Conflicts:
Gruntfile.js
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/fonts/glyphicons-halflings-regular.eot
dist/fonts/glyphicons-halflings-regular.svg
dist/fonts/glyphicons-halflings-regular.ttf
dist/fonts/glyphicons-halflings-regular.woff
docs/_data/glyphicons.yml
docs/_includes/components/alerts.html
docs/_includes/components/badges.html
docs/_includes/components/button-dropdowns.html
docs/_includes/components/button-groups.html
docs/_includes/components/dropdowns.html
docs/_includes/components/glyphicons.html
docs/_includes/components/input-groups.html
docs/_includes/components/labels.html
docs/_includes/components/media.html
docs/_includes/components/navbar.html
docs/_includes/components/navs.html
docs/_includes/components/pagination.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.html
docs/_includes/css/responsive-utilities.html
docs/_includes/css/sass.html
docs/_includes/css/tables.html
docs/_includes/css/type.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/community.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/examples.html
docs/_includes/getting-started/whats-included.html
docs/_includes/js/affix.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/overview.html
docs/_includes/js/tabs.html
docs/_includes/nav/components.html
docs/_includes/nav/css.html
docs/_includes/nav/javascript.html
docs/_includes/nav/main.html
docs/about.html
docs/assets/css/docs.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css
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/fonts/glyphicons-halflings-regular.eot
docs/dist/fonts/glyphicons-halflings-regular.svg
docs/dist/fonts/glyphicons-halflings-regular.ttf
docs/dist/fonts/glyphicons-halflings-regular.woff
docs/examples/carousel/index.html
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/navbar/index.html
docs/examples/non-responsive/index.html
docs/examples/non-responsive/non-responsive.css
docs/examples/sticky-footer-navbar/index.html
docs/examples/theme/index.html
fonts/glyphicons-halflings-regular.eot
fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.ttf
fonts/glyphicons-halflings-regular.woff
less/_carousel.less
less/_forms.less
less/glyphicons.less

10 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 1 Dec 2014 01:11:24 +0000 (17:11 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

10 years agoclarify collapse example with link and button triggers; also mention classes
Mark Otto [Mon, 1 Dec 2014 01:10:13 +0000 (17:10 -0800)] 
clarify collapse example with link and button triggers; also mention classes

10 years agoMerge pull request #15244 from zalog/patch-2
Mark Otto [Sun, 30 Nov 2014 22:20:21 +0000 (14:20 -0800)] 
Merge pull request #15244 from zalog/patch-2

Center .icon-prev and .icon-next in carousel

10 years agoMerge pull request #15258 from Quy/media-object
Mark Otto [Sun, 30 Nov 2014 20:38:01 +0000 (12:38 -0800)] 
Merge pull request #15258 from Quy/media-object

Add .media-object in docs

10 years agoAdd .media-object in docs 15258/head
Quy Ton [Sun, 30 Nov 2014 15:44:14 +0000 (07:44 -0800)] 
Add .media-object in docs

10 years agoExample: minor image compression improvements.
XhmikosR [Sun, 30 Nov 2014 11:16:19 +0000 (13:16 +0200)] 
Example: minor image compression improvements.

[ci skip]