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 |
|
Mark Otto
|
c213ff820a
|
fix the variables i broke, temporarily disabling line-height-computed
|
2014-12-04 00:09:37 -08:00 |
|
Matt Smith
|
dbe4765416
|
Nested button groups with only one child now have rounded corners (Iss.#15270)
|
2014-12-03 11:44:35 -05:00 |
|
Bootstrap's Grunt bot
|
ac49a09906
|
automatic grunt dist
|
2014-12-03 07:20:27 +00:00 |
|
Chris Rebert
|
66217e4a85
|
Temporarily revert "automatic grunt dist" so Grunt bot will run again.
This reverts commit 2c1c885ed4.
|
2014-12-02 23:02:46 -08:00 |
|
Bootstrap's Grunt bot
|
2c1c885ed4
|
automatic grunt dist
|
2014-12-03 00:51:08 +00:00 |
|
Mark Otto
|
27df020852
|
convert to scss
|
2014-12-02 14:02:35 -08:00 |
|
Mark Otto
|
75943868be
|
update home and side nav to use new navbar structure
|
2014-12-01 15:41:11 -08:00 |
|
Mark Otto
|
9180e15e33
|
Clean up navbar to remove .navbar-toggle, .navbar-collapse, and .navbar-header as they are no longer used; Add .navbar-toggler to .navbar-inverse
|
2014-12-01 15:03:09 -08:00 |
|
Mark Otto
|
7a799af939
|
fixes and grunt
|
2014-11-30 21:01:50 -08:00 |
|
Mark Otto
|
4bba2d0e0c
|
fix more broke shit, run grunt
|
2014-11-30 20:29:47 -08:00 |
|
Mark Otto
|
b648a77ed3
|
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
|
2014-11-30 20:17:45 -08:00 |
|
Mark Otto
|
bcb90ef3a0
|
Bump Glyphicons to v1.9
|
2014-11-30 01:31:49 -08:00 |
|
Mark Otto
|
23bdfc45eb
|
grunt
|
2014-11-29 21:40:04 -08:00 |
|
Mark Otto
|
9c049c99e2
|
grunt
|
2014-11-29 20:58:14 -08:00 |
|
Mark Otto
|
7c71b4874b
|
Fixes #15074: Fix the nesting problem with form control size variants
|
2014-11-29 20:57:04 -08:00 |
|
Mark Otto
|
80d7be1126
|
grunt
|
2014-11-29 18:36:21 -08:00 |
|
Mark Otto
|
12be9044f4
|
fix a bunch of padding and alignment things for forms
|
2014-11-25 18:00:52 -08:00 |
|
Mark Otto
|
15d98dc6b7
|
disable shadows on buttons for now
|
2014-11-25 17:47:32 -08:00 |
|
XhmikosR
|
7ea49019b8
|
Run grunt.
|
2014-11-24 09:53:42 +02:00 |
|
Chris Rebert
|
dcd86a8a91
|
grunt dist
|
2014-11-19 11:01:04 -08:00 |
|
Heinrich Fenkart
|
c2abfc0a44
|
grunt
|
2014-11-17 18:57:02 +01:00 |
|
Mark Otto
|
9a7e365c2c
|
bump version to v3.3.1
|
2014-11-12 09:03:16 -08:00 |
|
Mark Otto
|
ff386147ce
|
grunt
|
2014-11-11 20:25:09 -08:00 |
|
Mark Otto
|
2cc66cbb58
|
Merge branch 'master' into derp
Conflicts:
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
docs/_includes/customizer-variables.html
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.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
less/_variables.less
|
2014-11-09 23:48:56 -08:00 |
|
Mark Otto
|
eb74a8cbf3
|
darken primary blue for accessibility contrast on link colors
|
2014-11-09 23:11:28 -08:00 |
|
Mark Otto
|
f17b636bce
|
color contrast for links, gets us to 4.63:1
|
2014-11-09 23:01:50 -08:00 |
|
Mark Otto
|
e020d50838
|
fix variable, run grunt
|
2014-11-09 22:05:09 -08:00 |
|
Mark Otto
|
86af1f39ab
|
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
_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
docs/_includes/components/button-groups.html
docs/_includes/components/jumbotron.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/js/carousel.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.html
docs/_includes/nav/javascript.html
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
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/examples/justified-nav/index.html
less/_forms.less
less/_tooltip.less
less/navs.less
less/theme.less
|
2014-11-09 22:02:53 -08:00 |
|
Mark Otto
|
d1278efcc5
|
grunt
|
2014-11-09 18:04:00 -08:00 |
|
Mark Otto
|
46d1bf8eef
|
Fixes #14234 again
- Rather than override and hack for IE8-10 and then IE11, scope to just Safari.
- Drops the IE hacks for a media query Webkit hack
|
2014-11-09 15:03:33 -08:00 |
|
Mark Otto
|
df28b7e25f
|
Fixes #14965: Reset top border-radii on dropdown menus in fixed bottom navbars
|
2014-11-08 00:13:19 -08:00 |
|
Mark Otto
|
852eef9689
|
grunt
|
2014-11-08 00:10:53 -08:00 |
|
Mark Otto
|
8fbb2bbbd1
|
Fixes #14979: Override .jumbotron padding within .container-fluid to match .container
|
2014-11-07 23:01:20 -08:00 |
|
Mark Otto
|
2862c30320
|
Fixes #15046: Add full font overrides for popovers and tooltips
|
2014-11-07 22:17:39 -08:00 |
|
Heinrich Fenkart
|
e27dc5d71e
|
grunt
|
2014-11-05 01:56:18 +01:00 |
|
Heinrich Fenkart
|
db90ff6df7
|
grunt
|
2014-11-05 01:45:16 +01:00 |
|
Heinrich Fenkart
|
6020bb06f2
|
grunt
|
2014-11-05 00:36:52 +01:00 |
|
Heinrich Fenkart
|
b8c3c5c19b
|
grunt
|
2014-10-30 04:45:04 +01:00 |
|
Mark Otto
|
16dbdbd7a2
|
Merge branch 'master' into v3.3.0
Conflicts:
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
|
2014-10-29 11:56:48 -07:00 |
|
Mark Otto
|
5429e71401
|
fixes #14913: badges in list group shouldn't have text shadow
|
2014-10-29 10:27:18 -07:00 |
|
Mark Otto
|
22f9c8fc0a
|
grunt
|
2014-10-29 08:58:51 -07:00 |
|
Mark Otto
|
94b59b57d6
|
version bump
|
2014-10-29 08:56:20 -07:00 |
|
Mark Otto
|
a75c6d84e1
|
grunt
|
2014-10-28 23:08:42 -07:00 |
|
Heinrich Fenkart
|
bf2ad00ee0
|
grunt
|
2014-10-29 04:56:02 +01:00 |
|
Heinrich Fenkart
|
94b544c229
|
grunt
|
2014-10-29 04:44:52 +01:00 |
|
Heinrich Fenkart
|
a7f58a8356
|
grunt
|
2014-10-29 04:30:31 +01:00 |
|
Mark Otto
|
a5497da5be
|
grunt
|
2014-10-27 20:37:17 -07:00 |
|
Mark Otto
|
c15aa36798
|
switch to max-width on containers
|
2014-10-27 03:07:34 -07:00 |
|
Mark Otto
|
252583b661
|
grunt
|
2014-10-26 23:07:20 -07:00 |
|
Mark Otto
|
dcee894a8c
|
grunt
|
2014-10-26 22:57:38 -07:00 |
|
Mark Otto
|
f26821a83a
|
fix progress bar animated biznas
|
2014-10-26 22:48:12 -07:00 |
|
Mark Otto
|
d6b0f45fb7
|
Merge branch 'master' into derp
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
docs/_includes/components/dropdowns.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/components/progress-bars.html
docs/_includes/components/responsive-embed.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/less.html
docs/_includes/css/overview.html
docs/_includes/css/responsive-utilities.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/getting-started/template.html
docs/_includes/header.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/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/nav/components.html
docs/_includes/nav/getting-started.html
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/docs.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/components.html
docs/components/navbar.md
docs/css.html
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/examples/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/grid/index.html
docs/examples/jumbotron-narrow/index.html
docs/examples/jumbotron/index.html
docs/examples/justified-nav/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/offcanvas/index.html
docs/examples/signin/index.html
docs/examples/starter-template/index.html
docs/examples/sticky-footer-navbar/index.html
docs/examples/sticky-footer/index.html
docs/examples/theme/index.html
docs/examples/tooltip-viewport/index.html
docs/getting-started.html
docs/javascript.html
docs/migration.html
less/_animation.less
less/_modal.less
less/_navbar.less
less/_variables.less
less/glyphicons.less
less/navs.less
less/panels.less
less/progress-bars.less
|
2014-10-26 22:31:59 -07:00 |
|
Heinrich Fenkart
|
2cbb1d9374
|
grunt
|
2014-10-26 04:39:49 +01:00 |
|
Mark Otto
|
783eced7ab
|
follow up fix for #14837 /cc @hnrch02
|
2014-10-25 20:20:24 -07:00 |
|
Heinrich Fenkart
|
5f2e6fa58b
|
grunt
|
2014-10-26 03:53:10 +01:00 |
|
Mark Otto
|
0521913a99
|
Merge pull request #13824 from jsdf/node-requirable
Allow npm package to be resolved via node module resolution
|
2014-10-25 19:43:05 -07:00 |
|