2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00
Commit Graph

10911 Commits

Author SHA1 Message Date
Mark Otto cdb7d9839e grunt 2013-12-08 17:21:37 -08:00
Mark Otto b98d6ed12b Merge branch 'master' of github.com:twbs/bootstrap 2013-12-08 17:19:45 -08:00
Mark Otto e1247e3edc Match customizer banner to Gruntfile banner 2013-12-08 17:17:51 -08:00
Mark Otto 997a1f4ed2 fix dependency mapping of buttons and button-groups in customizer 2013-12-08 17:17:04 -08:00
Chris Rebert 1f35b6ec5c fix <button>s with .btn but missing accompanying .btn-* 2013-12-08 17:15:26 -08:00
Julian Thilo bab736c7d7 Fix typo in new author meta tag 2013-12-08 22:39:29 +01:00
Mark Otto 5eeaf114cc Merge pull request #11780 from ZDroid/grunt-dev
Don't ignore Gruntfile, it's required for compile
2013-12-08 10:47:24 -08:00
Zlatan Vasović a5d9b358ab Don't ignore Gruntfile, it's required for compile 2013-12-08 13:36:52 +01:00
XhmikosR cbfbf1b2dd Add csslint support. 2013-12-08 13:23:25 +02:00
XhmikosR fdc5d1dc34 Minify css with clean-css. 2013-12-08 13:05:10 +02:00
Zlatan Vasović 77bc82d486 Add .animation-*() mixins 2013-12-08 11:54:04 +01:00
Mark Otto b5613c9af5 Merge pull request #10709 from XhmikosR/quotes
Quotes
2013-12-08 02:52:15 -08:00
XhmikosR eca8ff3803 Use single quotes consistently. 2013-12-08 12:44:14 +02:00
Zlatan Vasović 0c457d48f8 Drop redundant module import 2013-12-08 11:24:47 +01:00
Mark Otto ed63dfd8d3 Merge pull request #11739 from XhmikosR/lint-assets
Lint docs-assets/js/application.js and docs-assets/js/customizer.js.
2013-12-08 02:16:16 -08:00
Mark Otto e349fb2114 fix validation failure 2013-12-08 02:14:43 -08:00
Mark Otto 1f9bfa89dc Fixes #11741: Don't set headings font-family again, just use inherit 2013-12-08 02:14:24 -08:00
Mark Otto c37b710e85 Merge branch 'master' into pr/11744
Conflicts:
	dist/css/bootstrap.min.css
2013-12-08 02:00:37 -08:00
Mark Otto b5008ebf9c add vertical-align back to where it's necessary since we reset from block to inline-block on several inputs 2013-12-08 01:59:44 -08:00
Mark Otto e43e87b2f3 Merge pull request #11748 from bganicky/patch-1
Updated .scale() mixin so that it accepts optional vertical scale factor...
2013-12-08 01:49:38 -08:00
Mark Otto 12500047f9 Merge branch 'master' into pr/11750
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
2013-12-08 01:45:42 -08:00
Mark Otto 475bbd4d38 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-08 00:17:17 -08:00
Mark Otto d70f4e895c image compression 2013-12-07 23:49:03 -08:00
Mark Otto adf8209b9c Merge pull request #11772 from KostyaTretyak/correction
Fixed some errors in the docs javascript.html
2013-12-07 23:29:36 -08:00
Mark Otto 90cbfc76e4 Add new template, Cover 2013-12-07 23:23:41 -08:00
kostyatretyak 34070af4a3 Merge branch 'master' of https://github.com/twbs/bootstrap into correction 2013-12-08 09:13:22 +02:00
kostyatretyak 6145cc026d Fixed some errors in the docs javascript.html 2013-12-08 09:11:43 +02:00
Mark Otto 6273604601 Add .container-fluid variation for full-width containers and layouts
/cc #10711 #9862
2013-12-07 20:52:51 -08:00
Mark Otto 73bc7d9f12 Add new template, Dashboard 2013-12-07 20:51:25 -08:00
Mark Otto 5fdd917918 improve icon display on narrow devices 2013-12-07 16:28:29 -08:00
Mark Otto 5e6f9b9a37 prevent horizontal scroll on components 2013-12-07 16:22:43 -08:00
Mark Otto 74408de619 Shorter download text because narrow viewports 2013-12-07 16:22:00 -08:00
Mark Otto 0bf5202b92 Fixes #11729: Show code snippets on mobile views 2013-12-07 16:21:46 -08:00
Mark Otto 9edec7ed21 Fixes #11756: Mention document mode checking ability in IE comaptibility modes 2013-12-07 15:57:17 -08:00
Mark Otto a9b86cbfde Merge branch 'pr/11138'
Conflicts:
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js
2013-12-07 14:10:41 -08:00
Mark Otto 07de53c644 Contextual list group cleanup
* Adds nav link to sidebar for contextual classes
* Refactors to use prefixed classes, like .list-group-item-info, instead of chained classes
* Adds default and linked variations to example in docs
2013-12-07 14:09:03 -08:00
Mark Otto a1f737b436 grunt dist after adding .text-justify 2013-12-07 12:19:17 -08:00
Mark Otto bfd8f8c83a Merge branch 'master' of github.com:twbs/bootstrap 2013-12-07 12:18:52 -08:00
Mark Otto b1215d1b2e Fixes #11193: Add kbd element styles to indicate user input via keyboard 2013-12-07 12:18:13 -08:00
Mark Otto a691d54436 Merge pull request #11675 from GraceNut/feature/text-justify
Added text-justify class to type.less
2013-12-07 11:58:31 -08:00
Mark Otto fe58357df1 Fixes #10884: Adds .info variant to contextual table classes 2013-12-07 11:56:35 -08:00
Mark Otto c07632e4e8 Reorder button and table variants for consistent order 2013-12-07 11:47:37 -08:00
Mark Otto 107b334d34 Fixes #11766: Use color var for background on badges in buttons to restore proper background to default button badge 2013-12-07 11:45:11 -08:00
Mark Otto 2b4fa90902 grunt dist 2013-12-07 11:44:32 -08:00
Mark Otto cc1f95652b Merge branch 'master' of github.com:twbs/bootstrap 2013-12-07 11:41:02 -08:00
Mark Otto 775c29fef6 Fixes #11764: Add meta data to docs for description, keywords, and authors 2013-12-07 11:40:08 -08:00
Mark Otto 94a5413ec7 Merge pull request #11757 from ZDroid/darken-toggle
Darken navbar toggle icon bar to meet WCAG
2013-12-07 11:34:03 -08:00
Mark Otto 4032dd0f26 grunt 2013-12-07 11:32:39 -08:00
Mark Otto 73da46c8bb Fixes #11760: Remove mailing list links from readme and about pages
Links are dead now since Google blacklisted the group for massive spam,
which they could be of no help in resolving. We’ll have a new official
forum for discussions soon folks <3.
2013-12-07 11:22:38 -08:00
Mark Otto 4b84acb9a4 Merge pull request #11765 from ZDroid/docs-min-js
Load minified Bootstrap JS code
2013-12-07 11:09:43 -08:00