clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-24 12:07:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,658 Commits 116 Branches 89 Tags 625 MiB
f5024eb13a
Commit Graph

223 Commits

Author SHA1 Message Date
Mark Otto
dcbe484a09 New text align class, .text-nowrap, for preventing text from breaking to new lines. Applies it to the grid docs table. 2014-06-10 21:20:34 -07:00
Mark Otto
631e04b6fc Fixes #13548: Use position: absolute; to fix checkbox and radio line-height problems that were introduced after #13003 2014-06-10 20:50:58 -07:00
Mark Otto
c0e82accad grunt 2014-06-10 20:17:22 -07:00
Mark Otto
9a51410fd3 grunt 2014-06-10 18:11:26 -07:00
Mark Otto
4aca4cf866 grunt for table change 2014-06-10 00:26:20 -07:00
Mark Otto
e06970948b Fixes #13616: Add custom gutter support to containers 2014-06-10 00:24:23 -07:00
Mark Otto
9e1652aa50 grunt 2014-06-09 22:25:24 -07:00
Mark Otto
8d9ef8f0a1 Addresses part of #13643: Correct webkit-linear-gradient syntax in horizontal gradients 2014-06-08 23:02:16 -07:00
Mark Otto
85cde774b9 remove max-width: 100%; from table and place it on .table 2014-06-08 16:54:05 -07:00
Mark Otto
5dbfdd47c5 fixes #13375 2014-06-08 14:08:06 -07:00
Mark Otto
d1872b4c98 Merge branch 'master' into pr/13736 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2014-06-08 13:57:44 -07:00
Mark Otto
5cd72ce230 grunt 2014-06-08 13:55:40 -07:00
Mark Otto
34891de173 grunt 2014-06-08 11:19:35 -07:00
Mark Otto
1e3b93804f grunt 2014-06-08 11:18:59 -07:00
XhmikosR
03a8949d7c Run grunt. 2014-06-06 01:23:07 +03:00
Chris Rebert
8e568a8e36 grunt dist 2014-05-23 15:49:13 -07:00
Mark Otto
d66b65ddde Merge branch 'master' into icon_paths 
Conflicts:
	dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.css.map
 2014-05-22 23:01:42 -07:00
Mark Otto
fab9ab8fe9 Reset the padding on radio/checkbox labels in form-inline 2014-05-22 18:42:21 -07:00
Chris Rebert
1340a491e5 grunt dist 2014-05-21 23:37:06 -07:00
Mark Otto
91d51d3fba Merge branch 'master' into icon_paths 2014-05-20 23:21:12 -07:00
Mark Otto
f39b272fed grunt 2014-05-12 21:19:01 -07:00
Mark Otto
7e1f2994d1 grunt dist 2014-05-12 21:15:27 -07:00
Mark Otto
c42cd8164c Merge branch 'master' into icon_paths 
Conflicts:
	dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.css.map
 2014-05-12 20:26:23 -07:00
Mark Otto
d4c7248749 grunt dist 2014-05-12 20:26:01 -07:00
Mark Otto
31956be6ef Merge branch 'master' into icon_paths 
Conflicts:
	dist/css/bootstrap-rtl.css
	dist/css/bootstrap.css.map
	dist/js/bootstrap.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/js/bootstrap.min.js
 2014-05-12 19:57:49 -07:00
Mark Otto
0d1018cb2f grunt 2014-05-12 19:53:12 -07:00
Mark Otto
f5513fd30e nuke rtl 2014-05-12 19:47:53 -07:00
Chris Rebert
cb2ef1eff4 grunt dist 2014-05-08 16:35:03 -07:00
Mark Otto
510f4fe50a Fixes #13478, reverts #10941 2014-05-08 15:41:08 -07:00
Mark Otto
4c3ef52fc1 Merge branch 'pr/13320' 
Conflicts:
	dist/css/bootstrap-rtl.min.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap-rtl.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-04-30 19:48:22 -07:00
Mark Otto
108b7c390e grunt dist 2014-04-30 19:47:56 -07:00
Mark Otto
b217357252 grunt dist 2014-04-30 19:35:47 -07:00
XhmikosR
30b07b942e Run grunt. 2014-04-26 08:35:48 +03:00
Chris Rebert
eaddbd92bb grunt dist 2014-04-20 16:19:13 -07:00
Mark Otto
06fb9406bd grunt dist 2014-04-17 00:56:22 -07:00
XhmikosR
2f0f8ec6d1 Run grunt dist. 2014-04-09 10:02:34 +03:00
Mark Otto
de86b36b50 grunt dist 2014-04-08 23:59:17 -07:00
Mark Otto
bfb99413ee grunt dist 2014-04-06 20:49:22 -07:00
XhmikosR
4c2626fecb Run grunt. 2014-04-03 10:53:44 +03:00
Tyler Cipriani
0907244256 Modal body shift fix for IE10/11 
Closes #13103 by merging it.
 2014-03-28 23:45:22 -07:00
Chris Rebert
e8551d4f50 grunt dist 2014-03-28 11:00:39 -07:00
XhmikosR
10586bf040 Run grunt. 2014-03-27 08:02:51 +02:00
Mark Otto
acf5707323 Fixes #13066: Add z-index to the form control feedback icons so input groups don't render on top of them 2014-03-24 20:07:54 -07:00
Mark Otto
b4f4c7b16f Fixes #13037: add text-align: left; to prevent alignment change in dropdowns 2014-03-24 20:02:56 -07:00
Mark Otto
6951b48e65 grunt 2014-03-24 20:01:46 -07:00
Mark Otto
ce013440e7 grunt 2014-03-24 19:31:12 -07:00
Mark Otto
6f6bce5944 Fixes #13141: Add a max-width: 100%; to label elements so IE8 wraps text 2014-03-24 19:26:41 -07:00
Mark Otto
21084192b6 Fixes #13079: Scope .open class in button variant mixin to immediate children 2014-03-24 19:08:05 -07:00
Chris Rebert
0dc88edeb9 grunt dist 2014-03-20 01:16:01 -07:00
Mark Otto
43cf003f9a Update gruntfile to point to new customizer nav, run grunt 2014-03-16 20:40:30 -07:00
fat
dd7cab84f6 build 2014-03-16 18:44:58 -07:00
XhmikosR
f750f7e448 Run usebanner before cssmin. 2014-03-11 19:49:11 +02:00
Mark Otto
6f13a14e4b moar grunt 2014-03-10 16:51:53 -07:00
Mark Otto
74c391b9ad Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/customize.min.js
	docs/dist/css/bootstrap.css.map
 2014-03-10 16:43:01 -07:00
Mark Otto
a83ca38713 Fixes #13003: Move padding on radio and checkbox options from the surrounding div to the label to remove the no-click deadzone caused by negative margin 2014-03-10 16:41:56 -07:00
Mark Otto
552f170e3c even more grunt 2014-03-10 13:31:34 -07:00
Mark Otto
a36643dd33 Merge branch 'master' into modular-the-mixins 
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
 2014-03-10 00:08:29 -07:00
Mark Otto
564b79ca87 grunt 2014-03-09 23:58:29 -07:00
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
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
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
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
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
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
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