rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity
8,901 Commits 108 Branches 89 Tags 547 MiB
1d6187956f
Commit Graph

3931 Commits

Author SHA1 Message Date
ORiON-
3ea69a16f9 Fixed typo at docs/examples/rtl/index.php 
The filename generated at dist/css/ called 'bootstrap-rtl.min.css'.
 2014-03-11 18:42:49 +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
3fb5d0bbac Merge branch 'master' into modular-the-mixins 2014-03-10 13:21:56 -07:00
Julian Thilo
6234ba561a Merge pull request #13002 from ZDroid/hash 
Add missing customizer comment
 2014-03-10 11:08:56 +01:00
Zlatan Vasović
1a417357ad Add missing customizer comment 2014-03-10 08:35:50 +01: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
38d0908aff Add recompiled assets after nuking toc in mixins.less. 2014-03-09 23:51:38 -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
e727973d8c Merge pull request #12204 from twbs/fix-8869 
replace .visible-{size} with .visible-{size}-{display}
 2014-03-09 22:48:57 -07:00
Mark Otto
309ef72ef4 Replace some images on the Carousel example with some base64 encoded 1x1 gifs 2014-03-09 22:38:13 -07:00
Mark Otto
a7b0fa7ebf ugh grunt 2014-03-09 22:28:29 -07:00
Mark Otto
213860408e moar grunt 2014-03-09 22:19:02 -07:00
Mark Otto
72837b11e3 mo copy 2014-03-09 22:10:58 -07:00
Mark Otto
7bef778c48 http://www.youtube.com/watch?v=AJWtLf4-WWs 2014-03-09 22:06:51 -07:00
Mark Otto
30deb5697c grunt 2014-03-09 22:06:14 -07:00
Mark Otto
76883ff9b4 Copy change 2014-03-09 22:06:12 -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
Mark Otto
4883605624 Fix bad grunt merge and then G R U N T 2014-03-09 16:15:53 -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
Mark Otto
aacafb2d5c Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube 2014-03-09 16:03:46 -07:00
Mark Otto
15d4494038 Moves IE8 justified button border mention to docs section, not the browser bugs page /cc @cvrebert 2014-03-09 15:32:36 -07:00
Mark Otto
4d870af2aa Fixes #12487: Document required use of position relative for scrollspy 2014-03-09 15:19:26 -07:00
Mark Otto
ce634a0ba7 Document shitty situation of multiple .navbar-right classes in #12951 2014-03-09 14:49:52 -07:00
Mark Otto
9920251ca8 Document #12476 bug in the wall of bugs 2014-03-09 14:17:18 -07:00
Mark Otto
27da9728bc grunt 2014-03-09 13:50:55 -07:00
Mark Otto
d8bc65b9d0 Merge branch 'master' into sr-only-focusable 2014-03-09 12:32:13 -07:00
XhmikosR
9d027d2bee Remove unneeded quotes. 2014-03-09 11:10:52 +02:00
Mark Otto
54b35d00a4 document position relative firefox bug; cleanup some stuff in the browser bugs page 2014-03-08 20:53:16 -08:00
Mark Otto
ef5d8e98e2 Merge branch 'master' into sr-only-focusable 
Conflicts:
	dist/css/bootstrap.css
 2014-03-08 20:34:29 -08:00
Mark Otto
b8ab0c66ac grunt 2014-03-08 20:03:31 -08:00
fat
4d96e69a55 fixes #9836 2014-03-08 19:45:38 -08:00
Mark Otto
74aab91671 grunt 2014-03-08 19:32:40 -08:00
fat
e9cced72fd fix #9342 2014-03-08 19:20:47 -08:00
Mark Otto
4b6e1b6754 grunt dist 2014-03-08 17:40:58 -08:00
Mark Otto
7c3881086f Fix comment 2014-03-08 17:11:48 -08:00
Mark Otto
bcfb27b962 grunt 2014-03-08 16:11:24 -08:00
Mark Otto
03701b8d4b Fixes #12966: Ensure icon font vars are loaded into Customizer 2014-03-08 15:32:24 -08:00
Mark Otto
67c747a109 grunt 2014-03-08 15:30:18 -08:00
Mark Otto
30bbab06d8 Merge pull request #12962 from BBosman/transitions-count 
Add transition-timing-function mixin to docs
 2014-03-07 14:52:41 -08:00
Chris Rebert
0d0cbb87ee rm #1969 from browser bugs list per outcome of investigation 2014-03-07 11:08:05 -08:00
Zlatan Vasović
d08bbdc6ec Reorganize docs assets 2014-03-07 17:37:23 +01:00
Bas Bosman
acdc053ee3 Add transition-timing-function mixin to docs 2014-03-07 11:28:48 +01:00
Mark Otto
0b8d27a125 fix derped html 2014-03-07 01:30:38 -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
Mark Otto
e25dacba14 Merge branch 'master' into typography-example-updates 
Conflicts:
	docs/assets/js/customize.min.js
 2014-03-07 01:10:16 -08:00
Mark Otto
ac4dd30460 G R U N T G R U N T 2014-03-07 01:08:29 -08:00
mrmrs
d1d5d90413 Fixes #12748 2014-03-07 00:59:22 -08:00
Mark Otto
d44e98b34d G R U N T 2014-03-07 00:50:28 -08:00
Mark Otto
fe0d5959d2 Merge branch 'master' of github.com:twbs/bootstrap 2014-03-07 00:28:29 -08:00
Mark Otto
5bd2799978 G R U N T 2014-03-07 00:26:38 -08:00
XhmikosR
24ec60e6e5 Merge pull request #12931 from twbs/line-endings 2014-03-07 10:24:32 +02: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
XhmikosR
6a3faa6ab3 Normalize line endings 2014-03-07 10:22:57 +02: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
84a7431dfd add responsive embed to customizer 2014-03-06 23:19:16 -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
fab10b643e Merge branch 'master' of github.com:twbs/bootstrap 2014-03-06 21:26:48 -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
Mark Otto
645eebba61 Merge pull request #12894 from lipis/patch-2 
Removed margin-bottom from last p of .blog-footer
 2014-03-06 21:11:00 -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
Chris Rebert
421e7af137 add link from Getting Started page to Wall of Browser Bugs page 2014-03-06 15:19:27 -08:00
Chris Rebert
39f8bbac37 add docs page listing relevant outstanding browser bugs 2014-03-06 15:19:27 -08:00
Chris Rebert
af5a219718 fix #12936 2014-03-05 14:17:20 -08:00
XhmikosR
d7dc8a7bd3 Merge pull request #12853 from twbs/jscs 
Switch to JSCS
 2014-03-05 08:42:50 +02: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
fdbeefff59 nav 2014-03-04 16:56:35 -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
e418377b11 Fixes #12697: Document readonly inputs 2014-03-04 15:16:38 -08:00
Mark Otto
a0ac99efbf docs for #12873 2014-03-04 14:48:52 -08:00
Mark Otto
a4df363174 grunt after merging #12917 2014-03-04 14:35:23 -08:00
Mark Otto
026e2f8d30 Grunt after merging #12863 2014-03-04 14:24:09 -08:00
Mark Otto
8f2a787c36 grunt 2014-03-04 14:20:48 -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
64579505d2 Fixes #12916: Don't let .lead resize on viewport change 2014-03-04 13:52:13 -08:00
Mark Otto
5193f9f607 add svg logos to brand guidelines 2014-03-04 13:32:02 -08:00
Mark Otto
caf332080e Merge pull request #12897 from avindra/patch-1 
Fix for stray 1px line under top navigation in Dashboard example
 2014-03-04 11:35:32 -08:00