0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

707 Commits

Author SHA1 Message Date
mrmrs
b0bc9ef815 Add consistent newline at end of files in less/mixins 2014-03-09 23:44:11 -07:00
mrmrs
2f380a9683 Merge branch 'master' into modular-the-mixins
* master:
  Replace some images on the Carousel example with some base64 encoded 1x1 gifs
  ugh grunt
  moar grunt
  mo copy
  http://www.youtube.com/watch?v=AJWtLf4-WWs
  grunt
  Copy change
  fix grammar in comment in forms.less
  Fixes #12759
  Fixes #12738
  replace .visible-{size} with .visible-{size}-{display} ; fixes #8869

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	less/mixins.less
2014-03-09 23:28:08 -07:00
mrmrs
348b7de7f7 Break mixins.less up into smaller modules.
Move all deprecated vendor prefix mixins to less/mixins/vendor-prefixes.less
Create mixins directory and move partials to that directory.

FIXES #12994
2014-03-09 23:18:48 -07:00
Mark Otto
30deb5697c grunt 2014-03-09 22:06:14 -07:00
Mark Otto
ccb17f110d Merge branch 'master' into fix-8869 2014-03-09 22:01:38 -07:00
Mark Otto
a15c24410b Fixes #12759
Ensures proper sizing and alignment of input groups within inline and
navbar forms.

* Uses `inline-table` on the input group
* Nukes the widths to `width: auto`—without this, the parent input
group doesn’t size correctly and functions as `display: table;` or
`block`
2014-03-09 21:25:51 -07:00
Mark Otto
b4d66b7f6b Fixes #12738
* Removes default max-height from .navbar-collapse (so not every navbar
will get a max-height collapse section)
* Scopes regular 340px max-height to fixed top and bottom navbars only
(those are the only ones that really need a max-height to enable
scrolling)
* Adds a landscape media query for phones to cap the max-height at
200px for fixed navbars"
2014-03-09 20:45:32 -07:00
Mark Otto
1a5fb4ef24 Fixes #12843: Scope label styles for horizontal forms to a media query so their narrow viewport display looks just like a normal form 2014-03-09 17:22:52 -07:00
Mark Otto
2f955907f9 Fixes #12669: Properly reset line-height on date inputs for all sizes; Fix IE8+'s misaslignment of text within date inputs 2014-03-09 17:12:39 -07:00
Mark Otto
b69e4d636a Reorganize mixins and G R U N T 2014-03-09 16:50:30 -07:00
mrmrs
0b415c6099 Merge branch 'master' into mixin-table-of-contents
* master:
  Fix bad grunt merge and then G R U N T
  Reorder the Gruntfile a bit
  Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube
  Remove unneeded quotes.
  Rename generateRawFilesJs to generateRawFiles
  Remove redundant parens

Conflicts:
	docs/assets/js/raw-files.min.js
	test-infra/npm-shrinkwrap.canonical.json
2014-03-09 16:40:40 -07:00
mrmrs
71e9902d9a Adjusts some section titles to be more explicit.
FIXES #12992
2014-03-09 16:25:27 -07:00
mrmrs
fc74ee5f67 Changes compiled assets after changing mixins.less 2014-03-09 16:15:35 -07:00
XhmikosR
68b3e3f3be Merge pull request #12986 from twbs/unneeded-quotes
Remove unneeded quotes.
2014-03-10 01:07:14 +02:00
XhmikosR
9d027d2bee Remove unneeded quotes. 2014-03-09 11:10:52 +02:00
Mark Otto
ef5d8e98e2 Merge branch 'master' into sr-only-focusable
Conflicts:
	dist/css/bootstrap.css
2014-03-08 20:34:29 -08:00
fat
4d96e69a55 fixes #9836 2014-03-08 19:45:38 -08:00
fat
e9cced72fd fix #9342 2014-03-08 19:20:47 -08:00
Mark Otto
bcfb27b962 grunt 2014-03-08 16:11:24 -08:00
Mark Otto
67c747a109 grunt 2014-03-08 15:30:18 -08:00
Bas Bosman
de27e729da Do csscomb earlier in build phase 2014-03-07 13:39:07 +01:00
Mark Otto
0143e38a67 Merge branch 'master' into document_popover_focus
Conflicts:
	docs/assets/js/docs.min.js
2014-03-07 01:30:28 -08:00
mrmrs
d1d5d90413 Fixes #12748 2014-03-07 00:59:22 -08:00
Mark Otto
5bd2799978 G R U N T 2014-03-07 00:26:38 -08:00
Mark Otto
c03b8f1f0f Merge branch 'master' into pr/12670 2014-03-07 00:23:52 -08:00
Mark Otto
6452b409aa grunt for days 2014-03-07 00:23:22 -08:00
Mark Otto
164b41b28d Fixes #12937: Darken active button states just a smidge more 2014-03-07 00:19:26 -08:00
Bas Bosman
cb7eb674ac Add autoprefixer 2014-03-07 09:01:54 +01:00
Mark Otto
705ff7f227 Moving the embed to it's own CSS file, moving the docs to the Components page with an example, fixing a Glyhpicons list problem in the docs 2014-03-06 23:18:13 -08:00
Mark Otto
12c619f5b9 Merge branch 'master' into boulox-responsive-embed
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/css.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-03-06 22:40:25 -08:00
Mark Otto
7e299c6a49 Fixes #12683: Remove the overflow: hidden; from the .panel-group > .panel because it apparently serves no purpose and cuts off nested dropdown menus. 2014-03-06 22:32:21 -08:00
Mark Otto
df3eb66ede Merge branch 'master' into popovers-use-radii-var
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
2014-03-06 21:44:46 -08:00
Mark Otto
0c9308a3b2 Rewrite the disabled list group items to simplify styles 2014-03-06 21:40:22 -08:00
Mark Otto
c8614c0f15 Merge branch 'master' into pr/12490
Conflicts:
	less/list-group.less
2014-03-06 21:32:52 -08:00
Mark Otto
9dc796155c Fixes #12722: Fixes up responsive tables in print
Safari renders this fine for one reason or another, but Chrome still renders the media query styles to make tables responsive. This change scopes them to screen devices only, so printing looks boss everywhere.
2014-03-06 21:25:34 -08:00
mrmrs
4868096dbd Fixes #12934 2014-03-06 21:05:29 -08:00
Mark Otto
17e41098c8 Fixes #12824: Remove white-space: nowrap from code elements 2014-03-06 20:39:19 -08:00
Mark Otto
8526adf69c grunt 2014-03-06 20:33:10 -08:00
Mark Otto
10eb167e35 Fixes #12901: Refactors list group active state for use on non-anchors 2014-03-04 22:42:13 -08:00
Mark Otto
24de9b0994 Fixes #12848: Account for and document progress bars at 0-3% 2014-03-04 16:55:15 -08:00
Mark Otto
026e2f8d30 Grunt after merging #12863 2014-03-04 14:24:09 -08:00
Mark Otto
7733f24373 Fixes #12868: Enables icon feedback on validation states for large/small inputs.
Also reorders the CSS to place Glyhpicons as a dependency before other components for fewer overrides and less specific CSS.
2014-03-04 14:12:57 -08:00
Mark Otto
f45df64670 Fixes #12914: Darken immediate children hr elements in jumbotrons 2014-03-04 13:54:09 -08:00
Mark Otto
d6e07f045c Merge branch 'master' into rtl_via_css_flip
Conflicts:
	docs/assets/js/raw-files.min.js
2014-03-04 00:41:57 -08:00
Mark Otto
1399497a02 grunt 2014-03-04 00:30:40 -08:00
Mark Otto
559b90f944 Rename RTL files and add some basic docs 2014-03-03 23:50:04 -08:00
Mark Otto
4dd7b4bd87 Don't RTL the theme file--no need 2014-03-03 21:54:07 -08:00
Mark Otto
af39290a9d Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip
Conflicts:
	Gruntfile.js
	package.json
	test-infra/npm-shrinkwrap.canonical.json
2014-03-03 21:52:56 -08:00
Mark Otto
2ece8dd336 Merge branch 'master' into rtl_via_css_flip 2014-03-03 21:50:03 -08:00
Mark Otto
e381635b1f Fixes #12593: Add support for table bodies and table rows to the collapse plugin 2014-03-03 21:39:53 -08:00