rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-30 12:24:19 +01:00
Code Issues Actions Packages Releases Activity
8,893 Commits 108 Branches 89 Tags 547 MiB
6951b48e65
Commit Graph

8893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
82e2f87363 Merge pull request #12998 from twbs/modular-the-mixins 
Modular the mixins
 2014-03-10 16:36:34 -07:00
Mark Otto
ac8db909c5 Merge pull request #13001 from ZDroid/title 
Correct the page name
 2014-03-10 15:46:59 -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
XhmikosR
91d0a6d779 Bump Jekyll version used in Travis to v1.4.2. 
Note that while v1.4.3 is the latest stable version, it has a nasty Windows bug.
(https://github.com/jekyll/jekyll/issues/1948)
 2014-03-10 18:32:49 +02: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
Zlatan Vasović
d985e5bf56 Correct the page name 
"Getting started" is used in the docs.
 2014-03-10 08:31:55 +01:00
Mark Otto
0b7b374691 words 2014-03-10 00:10:07 -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
Chris Rebert
6dd51fab44 fix #12771 2014-03-10 00:06:38 -07:00
Mark Otto
3a2d6e4050 Formatting, comment consolidation, and line endings 2014-03-10 00:05:57 -07:00
Mark Otto
564b79ca87 grunt 2014-03-09 23:58:29 -07:00
Mark Otto
1848b0f249 Merge branch 'master' of github.com:twbs/bootstrap 2014-03-09 23:57:31 -07:00
Mark Otto
c4bc0d2311 Merge pull request #12999 from ZDroid/outline-zero 
Use `outline: 0` consistently
 2014-03-09 23:57:17 -07:00
Zlatan Vasović
d50a89bea9 Use outline: 0 consistently 2014-03-10 07:55:29 +01: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
Mark Otto
3640d71ad7 proper var 2014-03-09 23:25:15 -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
Chris Rebert
b1f71e5292 fix grammar in comment in forms.less 2014-03-09 21:35:48 -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
37b342b18a Merge pull request #12993 from twbs/mixin-table-of-contents 
Mixin table of contents
 2014-03-09 16:56:00 -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
XhmikosR
4bf0645060 Merge pull request #12977 from ZDroid/var 
Rename generateRawFilesJs to generateRawFiles
 2014-03-10 01:16:30 +02:00
Mark Otto
40ce6ca431 Merge branch 'master' of github.com:twbs/bootstrap 2014-03-09 16:16:02 -07:00
Mark Otto
4883605624 Fix bad grunt merge and then G R U N T 2014-03-09 16:15:53 -07:00
XhmikosR
5f0c0c9ed1 Merge pull request #12975 from ZDroid/parens 
Remove redundant parens
 2014-03-10 01:15:52 +02:00
mrmrs
fc74ee5f67 Changes compiled assets after changing mixins.less 2014-03-09 16:15:35 -07:00
mrmrs
aedee95dbf Adds basic table of contents for mixins.less. You know for the kids. 2014-03-09 16:13:37 -07:00
Mark Otto
b263a0197b Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	Gruntfile.js
 2014-03-09 16:11:04 -07:00
Mark Otto
2f7b04a192 Reorder the Gruntfile a bit 2014-03-09 16:09:36 -07:00
XhmikosR
68b3e3f3be Merge pull request #12986 from twbs/unneeded-quotes 
Remove unneeded quotes.
 2014-03-10 01:07:14 +02:00