0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Commit Graph

1714 Commits

Author SHA1 Message Date
Mark Otto
e0a9a7722f Merge pull request #14 from twbs/nuke_customizer
Nuke the customizer
2014-12-11 12:21:05 -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
fef873a840 fix all validation, turn off some settings, add sort order 2014-12-11 12:05:29 -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
95da2a9428 nuke the customizer 2014-12-10 13:51:43 -08:00
Mark Otto
63d4423fc0 grunt 2014-12-10 13:49:53 -08:00
Mark Otto
8ef926b4fb clean up some docs css 2014-12-06 00:20:57 -08:00
Mark Otto
57071cc68a grunt--fuuuuuuuuuuuuuck you line comments 2014-12-05 14:56:29 -08:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -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
9928144dc4 Fixes #15241: Add simple example to docs for collapse plugin 2014-11-29 23:03:47 -08:00
Mark Otto
c901287394 remove more mentions of theme 2014-11-29 15:01:44 -08:00
Mark Otto
15d98dc6b7 disable shadows on buttons for now 2014-11-25 17:47:32 -08:00
Mark Otto
7ca73b7542 fix margin on .bs-example thumbs 2014-11-25 17:10:47 -08:00
XhmikosR
7ea49019b8 Run grunt. 2014-11-24 09:53:42 +02:00
XhmikosR
0c816d910d Merge pull request #15159 from twbs/docs-muted
Clean up old `muted` references and switch to `text-muted`.
2014-11-20 10:27:42 +02:00
XhmikosR
a1b8aa351e Clean up old muted references and switch to text-muted. 2014-11-20 08:02:25 +02:00
Chris Rebert
ddf39cc2e7 Don't line wrap event names in JS plugin docs 2014-11-12 16:32:51 -08:00
XhmikosR
bf4a331f1a Run grunt. 2014-11-10 12:55:26 +02:00
Mark Otto
8c954fd13d run cssmin on docs css for dist-css task 2014-11-10 00:20:41 -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
Heinrich Fenkart
6020bb06f2 grunt 2014-11-05 00:36:52 +01:00
Heinrich Fenkart
069488dea3 Use Jekyll data for Wall of Browser Bugs 2014-11-04 07:25:52 +01:00
Mark Otto
45b59f4307 Reverts #14848, the overflow scrolling in the docs sidebar /cc @hnrch02 2014-10-28 22:57:16 -07:00
Mark Otto
a5497da5be grunt 2014-10-27 20:37:17 -07:00
Chris Rebert
a43d4767ba .bs-customizer-input => .col-xs-4 2014-10-27 15:02:21 -07:00
Mark Otto
e3d2146350 fix rounded corners on copy buttons 2014-10-27 03:23:44 -07:00
Mark Otto
c15aa36798 switch to max-width on containers 2014-10-27 03:07:34 -07:00
Mark Otto
d896faa1b9 grunt 2014-10-27 01:35:02 -07:00
Mark Otto
252583b661 grunt 2014-10-26 23:07:20 -07:00
Mark Otto
f26821a83a fix progress bar animated biznas 2014-10-26 22:48:12 -07:00
Mark Otto
743aaf6100 fix clipboard button and examples 2014-10-25 22:39:01 -07:00
Mark Otto
80aca8c17e grunt 2014-10-24 13:27:28 -07:00
Mark Otto
79b38361ab 20px from bottom because the final frontier 2014-10-24 13:26:05 -07:00
Ilya Radchenko
fb70b13dc3 Allow to scroll the nav
Basically it's impossible to use the navigation if it's expanded. This will allow it to be scrollable so that the menus are accessable.
2014-10-22 11:56:12 -04:00
Mark Otto
d1660ad078 Swap -small and -large variables for -sm and -lg 2014-09-21 16:04:37 -07:00
Mark Otto
1917b2d870 G R U N T 2014-09-17 22:00:12 -07:00
Mark Otto
92e81718a3 Use .clearfix mixin instead of overflow on examples 2014-09-17 21:43:46 -07:00
Mark Otto
ca2711fc8e rewrite jumbotron less and make heading use a class 2014-09-17 20:03:32 -07:00
Mark Otto
86828fcd3d Some secondary button border action 2014-09-17 18:10:28 -07:00
Mark Otto
9f2aeafe85 Merge branch 'master' into derp
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.svg
	docs/_includes/components/badges.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/pagination.html
	docs/_includes/css/forms.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/home-nav.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/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.html
	docs/_includes/nav/javascript.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/browser-bugs.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
	docs/dist/fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.svg
	less/_button-group.less
	less/_jumbotron.less
	less/_variables.less
	less/mixins/vendor-prefixes.less
	less/panels.less
	less/thumbnails.less
	package.json
2014-09-17 15:21:31 -07:00
Mark Otto
783e001786 grunt 2014-08-27 23:35:54 -07:00
Mark Otto
72ddad6fc8 Fixes #14439: Add static tooltip example to docs 2014-08-27 23:33:03 -07:00
XhmikosR
b1bb57360c Specify cursor: pointer for #import-manual-trigger. 2014-08-26 13:12:54 +03:00
Mark Otto
32a6d9b404 Full grunt 2014-08-23 13:43:41 -07:00