Mark Otto
|
615eb99067
|
fix broke shit, recompile
|
2015-01-03 20:16:46 -08:00 |
|
Mark Otto
|
0e5d17d5f6
|
Merge branch 'master' into v4
Conflicts:
Gruntfile.js
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/_data/glyphicons.yml
docs/_includes/components/alerts.html
docs/_includes/components/badges.html
docs/_includes/components/breadcrumbs.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/jumbotron.html
docs/_includes/components/labels.html
docs/_includes/components/list-group.html
docs/_includes/components/media.html
docs/_includes/components/navbar.html
docs/_includes/components/navs.html
docs/_includes/components/page-header.html
docs/_includes/components/pagination.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/components/responsive-embed.html
docs/_includes/components/thumbnails.html
docs/_includes/components/wells.html
docs/_includes/css/buttons.html
docs/_includes/css/code.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/tables.html
docs/_includes/css/type.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/disabling-responsiveness.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/whats-included.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/modal.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/nav/components.html
docs/_includes/nav/javascript.html
docs/_jade/customizer-variables.jade
docs/_layouts/default.html
docs/about.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/src/customizer.js
docs/customize.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/glyphicons.less
less/mixins/vendor-prefixes.less
less/navbar.less
less/popovers.less
less/tables.less
less/theme.less
less/tooltip.less
less/variables.less
package.json
scss/_carousel.scss
scss/_close.scss
scss/_forms.scss
test-infra/npm-shrinkwrap.json
|
2015-01-03 20:08:58 -08:00 |
|
Mark Otto
|
c6af78e8a4
|
grunt
|
2015-01-01 12:13:28 -08:00 |
|
Mark Otto
|
e4fa95eb57
|
grunt dist
|
2015-01-01 12:02:02 -08:00 |
|
Bootstrap's Grunt bot
|
57260f16b3
|
automatic grunt dist
|
2015-01-01 19:02:43 +00:00 |
|
Bootstrap's Grunt bot
|
548d46eb8b
|
automatic grunt dist
|
2015-01-01 03:01:40 +00:00 |
|
Chris Rebert
|
45f5841785
|
Merge pull request #15464 from twbs/address-15419
Address #15419
|
2014-12-31 16:11:04 -08:00 |
|
Bootstrap's Grunt bot
|
6c383c5102
|
automatic grunt dist
|
2015-01-01 00:02:16 +00:00 |
|
Mark Otto
|
1a932b7e02
|
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
|
2014-12-31 10:39:56 -08:00 |
|
Mark Otto
|
a5e127fd16
|
grunt
|
2014-12-31 10:37:23 -08:00 |
|
Bootstrap's Grunt bot
|
5a35555a72
|
automatic grunt dist
|
2014-12-30 12:31:08 +00:00 |
|
Chris Rebert
|
ad138ed885
|
Disable .glyphicon-door & .glyphicon-key for the time being
Closes #15419
Refs #10106
|
2014-12-29 16:44:33 -08:00 |
|
Chris Rebert
|
730c3f5f23
|
grunt dist-css
|
2014-12-29 12:38:53 -08:00 |
|
Mark Otto
|
b92534c632
|
improve code quality on custom forms
|
2014-12-25 15:40:24 -08:00 |
|
Mark Otto
|
cd60cf3386
|
custom forms: checkbox and radio stacked option
|
2014-12-24 15:45:37 -08:00 |
|
Mark Otto
|
18e08e777b
|
add custom forms, stub out examples for radios and checkboxes
|
2014-12-24 04:13:23 -08:00 |
|
Mark Otto
|
952be04cb0
|
grunt
|
2014-12-23 22:57:03 -08:00 |
|
Mark Otto
|
6b394ab067
|
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
docs/components/helpers.md
scss/_utilities.scss
|
2014-12-23 13:59:26 -08:00 |
|
Mark Otto
|
f9aec74124
|
add [hidden] utility for hiding any html element (see #15274 for more context)
|
2014-12-23 04:10:59 -08:00 |
|
Mark Otto
|
b615bd938b
|
Merge branch 'master' of https://github.com/twbs/bootstrap
Conflicts:
dist/css/bootstrap.css.map
|
2014-12-22 19:30:51 -08:00 |
|
Mark Otto
|
c41970c579
|
Fixes #15422: Alternate fix for temporal input sizing in input groups
|
2014-12-22 19:28:29 -08:00 |
|
Bootstrap's Grunt bot
|
3668bde098
|
automatic grunt dist
|
2014-12-23 03:20:44 +00:00 |
|
Bootstrap's Grunt bot
|
b61e4dd671
|
automatic grunt dist
|
2014-12-22 23:10:45 +00:00 |
|
Chris Rebert
|
9a6477662a
|
grunt dist
|
2014-12-22 13:37:31 -08:00 |
|
Mark Otto
|
28d847a1e0
|
grunt
|
2014-12-20 23:05:23 -08:00 |
|
Bootstrap's Grunt bot
|
9c526bf519
|
automatic grunt dist
|
2014-12-21 06:20:46 +00:00 |
|
Bootstrap's Grunt bot
|
acef81d900
|
automatic grunt dist
|
2014-12-20 02:20:44 +00:00 |
|
Mark Otto
|
547f16b58e
|
rewrite all table styles to remove in selectors
|
2014-12-18 22:59:47 -08:00 |
|
Mark Otto
|
94753bc3ec
|
grunt
|
2014-12-18 20:19:53 -08:00 |
|
Chris Rebert
|
90f4767d06
|
grunt dist
|
2014-12-17 15:26:12 -08:00 |
|
Bootstrap's Grunt bot
|
181f4aebea
|
automatic grunt dist
|
2014-12-15 00:30:39 +00:00 |
|
Bootstrap's Grunt bot
|
f9db33d7db
|
automatic grunt dist
|
2014-12-12 19:30:34 +00:00 |
|
Mark Otto
|
1e136a70a2
|
Clean up some navbar.scss, drop the -float-breakpoint var entirely
|
2014-12-11 14:47:10 -08:00 |
|
Mark Otto
|
3737cb1d46
|
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
|
2014-12-11 14:12:10 -08:00 |
|
Mark Otto
|
2edc779391
|
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
|
2014-12-11 12:07:09 -08:00 |
|
Mark Otto
|
2a78159a20
|
grunt
|
2014-12-11 12:06:08 -08:00 |
|
Mark Otto
|
0e371ddf87
|
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
|
2014-12-10 20:51:17 -08:00 |
|
Mark Otto
|
63d4423fc0
|
grunt
|
2014-12-10 13:49:53 -08:00 |
|
Mark Otto
|
63639f9913
|
Merge pull request #9 from twbs/less-vendor-prefixing
_progress.scss: remove unnecessary @-webkit-keyframes
|
2014-12-08 22:48:03 -08:00 |
|
Chris Rebert
|
b59abb40f7
|
remove explicit vendor prefixes from _gradients.scss
|
2014-12-08 22:00:05 -08:00 |
|
Chris Rebert
|
94eecb84bf
|
_progress.scss: remove unnecessary @-webkit-keyframes
Autoprefixer already takes care of this for us.
|
2014-12-08 20:36:33 -08:00 |
|
Mark Otto
|
2ade44a9ca
|
inline-block on labels now instead of inline
|
2014-12-06 00:33:36 -08:00 |
|
Mark Otto
|
ebfe358495
|
tweak label component padding
|
2014-12-06 00:18:11 -08:00 |
|
Mark Otto
|
57071cc68a
|
grunt--fuuuuuuuuuuuuuck you line comments
|
2014-12-05 14:56:29 -08:00 |
|
Mark Otto
|
bc3a2f669d
|
fix vars order, remove rando grid class from mixin
|
2014-12-04 22:32:39 -08:00 |
|
Mark Otto
|
a1a3a007b6
|
tweak grid docs, add new tier
|
2014-12-04 21:02:04 -08:00 |
|
Mark Otto
|
824f26a3c0
|
grunt dist
|
2014-12-04 15:29:53 -08:00 |
|
Mark Otto
|
2fa4ab8209
|
grunt
|
2014-12-04 15:20:45 -08:00 |
|
Mark Otto
|
d0cffbb680
|
grunt dist
|
2014-12-04 01:03:54 -08:00 |
|
Mark Otto
|
4474630d77
|
restore px to base font size var
|
2014-12-04 00:10:24 -08:00 |
|