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

2273 Commits

Author SHA1 Message Date
XhmikosR
d7bf9372ec Remove extra newline from banner. 2014-01-08 13:41:17 +02:00
XhmikosR
016d573a80 Use the docs banner for all the docs generated files. 2014-01-08 13:41:17 +02:00
XhmikosR
9b71314fd8 Turn advanced optimizations off until it's fixed in clean-css. 2014-01-08 13:41:17 +02:00
XhmikosR
f00bbdd994 Minify docs CSS too. 2014-01-08 13:41:17 +02:00
XhmikosR
ebf7807985 docs-assets: concatenate and minify all javascript files. 2014-01-08 13:41:16 +02:00
Chris Rebert
c891be5e5f adjust filename to indicate that customize JS is minified 2014-01-07 19:10:31 -08:00
Chris Rebert
ef7bf0abf8 grunt dist build-customizer 2014-01-07 19:05:29 -08:00
Chris Rebert
c635d8f547 have customizer output Bootstrap Theme too; fixes #12003 2014-01-07 18:57:15 -08:00
Chris Rebert
07309edce5 make customizer compilation code more generic 2014-01-07 18:55:13 -08:00
Julian Thilo
7fcfe61f4d Update copyright notices in all places 
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
 2014-01-07 01:05:24 +01:00
Chris Rebert
9fa2c95d78 make CSSLint happier; refs #12094 2014-01-05 21:29:26 -08:00
Gregory HOULLIER
a53cf55be2 Replace getElementsByTag by querySelector for IE10 Mobile plateform. 2014-01-05 20:15:48 +01:00
Zlatan Vasović
1c83d68ca4 New Year 2014-01-01 15:37:08 +01:00
Mark Otto
50cf0b1a9d Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030: navbar toggle focus state 2013-12-31 18:23:10 -08:00
Mark Otto
0df96d8c32 Merge branch 'master' into docs_dir 2013-12-31 10:38:31 -08:00
Mark Otto
a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00
Mark Otto
d1f69d4a7e scope styles to masthead, not homepage 2014-01-22 15:37:05 -06:00
Mark Otto
317aa8092d spacing 2014-01-20 22:11:51 -06:00
Chris Rebert
336f5f1dce rename raw-files.js to raw-files.min.js 
it's not /technically/ minified, but close enough
it's autogenerated, not terribly human-readable, and not meant to be directly modified
 2014-01-19 22:29:51 -08:00
Chris Rebert
06a7bdd0b0 grunt build-raw-files dist 2014-01-19 22:27:01 -08:00
Chris Rebert
b67cba2b4d make WP8 device-width hack code fully consistent between docs HTML & docs JS 2014-01-18 18:35:47 -08:00
Mark Otto
a521e982d5 Merge pull request #12281 from XhmikosR/vendor 
Move docs third-party libraries to a separate folder.
 2014-01-18 11:42:34 -08:00
Mark Otto
7b42103df6 kill bottom margin on last docs section 2014-01-18 11:33:50 -08:00
XhmikosR
4bca3c79b3 Move docs third-party libraries to a separate folder. 2014-01-18 08:15:21 +02:00
Mark Otto
d07e8fece4 grunt 2014-01-16 15:03:34 -08:00
fat
3b2418e688 remove flaky pos bottom test which is effect by unit scroll pos 2014-01-16 13:44:08 -08:00
Mark Otto
78e81a1de9 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	docs/assets/css/pack.min.css
 2014-01-15 16:25:29 -08:00
Mark Otto
7e7264e224 fix ad placement 2014-01-15 16:25:04 -08:00
Julian Thilo
95f24dca9a Fix customizer's toggle buttons' margin 2014-01-16 01:19:00 +01:00
Mark Otto
6986bdb2a7 Fix page headers 2014-01-15 15:01:41 -08:00
Mark Otto
a633fc042d Merge branch 'master' into docs_derp 
Conflicts:
	docs/components.html
	docs/css.html
 2014-01-15 13:08:35 -08:00
Chris Rebert
5ead87d519 revert unnecessary customizations of Blob.js & FileSaver.js 
Per https://github.com/eligrey/Blob.js/pull/20
& https://github.com/eligrey/FileSaver.js/pull/63
The library author has deemed the existing /*! @source URL */ comments to be
sufficient attribution, and these already survive minification.

Refs ea591748ed
 2014-01-14 20:46:25 -08:00
Mark Otto
cae63200d8 Merge branch 'master' into docs_derp 
Conflicts:
	docs/_includes/old-bs-docs.html
 2014-01-14 15:53:06 -08:00
Chris Rebert
46b0874ef5 add copyright notice to raw-files.js 2014-01-14 13:27:50 -08:00
Zlatan Vasović
c335104957 Rename uglify.js to uglify.min.js for consistency 2014-01-14 13:41:21 +01:00
Mark Otto
c4b41ceae3 header masthead changes 2014-01-13 22:59:09 -08:00
Mark Otto
b776749507 make page headers like masthead 2014-01-13 22:54:22 -08:00
Mark Otto
eca81939cc Merge branch 'master' into docs_derp 
Conflicts:
	docs/assets/css/pack.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
 2014-01-13 22:43:18 -08:00
Chris Rebert
ea591748ed sort out attribution banners of docs assets; fixes #11976 2014-01-13 21:58:27 -08:00
Chris Rebert
aff64cffce avoid redundant banner in minified docs CSS 2014-01-13 21:31:40 -08:00
Chris Rebert
2d038186e3 add a title/description to customizer.js's attribution comment 2014-01-13 21:08:04 -08:00
Mark Otto
b17dca240e Merge branch 'master' into docs_derp 
Conflicts:
	docs/assets/js/docs.min.js
 2014-01-12 16:10:57 -08:00
Mark Otto
4b1ff7fa49 Formatting and docs changes 2014-01-12 00:04:24 -08:00
Mark Otto
36aa3afb4f Improve spacing and alignment of sections and their headings 2014-01-11 23:15:37 -08:00
Mark Otto
613a95d838 brand guidelines cleanup 2014-01-11 19:42:10 -08:00
Mark Otto
79c18da452 homepage improvements 2014-01-11 19:35:40 -08:00
Mark Otto
bacfd65cb2 Merge branch 'master' into docs_derp 
Conflicts:
	docs/getting-started.html
 2014-01-11 19:13:10 -08:00
Mark Otto
ea20f44815 Merge branch 'master' into docs_derp 
Conflicts:
	docs/assets/css/docs.css
 2014-01-09 20:33:55 -08:00
Mark Otto
04161a8c75 more derp 2014-01-09 18:05:04 -08:00
Mark Otto
ed5c7baaf1 Merge branch 'master' into docs_derp 2014-01-05 17:49:40 -08:00
Mark Otto
9f44f17057 updates to homepage 2014-01-02 10:54:10 -08:00
Mark Otto
70459c1454 Merge branch 'master' into docs_derp 
Conflicts:
	docs/_includes/footer.html
	docs/assets/css/docs.css
 2014-01-01 12:27:09 -08:00
Mark Otto
905adb5b83 fix homepage images 2013-12-31 13:56:20 -08:00
Mark Otto
b253cb2c1e Merge branch 'master' into docs_derp 
Conflicts:
	_config.yml
	docs/_includes/footer.html
	docs/_includes/nav-main.html
	docs/_includes/old-bs-docs.html
	docs/_layouts/default.html
	docs/_layouts/home.html
	docs/getting-started.html
	docs/index.html
 2013-12-31 13:53:33 -08:00
Mark Otto
a8005b3d0b flatten docs dir back into root 2013-07-18 17:41:30 -07:00
Mark Otto
3abfe029ea vertically center ad 2013-07-18 13:35:55 -07:00
Mark Otto
a34470ac5d Merge branch 'bs3_old_docs_callout' into bs3_rc1 2013-07-18 13:07:49 -07:00
Mark Otto
9425382376 Merge branch 'bs3_add_ads' into bs3_rc1 2013-07-18 13:07:17 -07:00
Mark Otto
64efa86036 for some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed dimensions 2013-07-18 02:19:13 -07:00
Mark Otto
3ed05f60fd Quick pass at new touch and favicons 2013-07-18 02:05:41 -07:00
Mark Otto
6e04925328 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-18 01:25:28 -07:00
Mark Otto
e72b524d41 Fixes #8374: ensure navbar is always at least 50px 2013-07-18 01:25:08 -07:00
fat
6ec8a1e44f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-07-18 01:08:19 -07:00
fat
4b40ee692d cleaner way of preventing double click events + clean up tests for jshint 2013-07-18 01:07:11 -07:00
Mark Otto
181b276774 Fixes #8397: better navbar padding with grid gutter stuff 2013-07-18 01:04:54 -07:00
fat
37e899d766 get button js working with actual form elements p cooll 2013-07-18 00:59:31 -07:00
Mark Otto
f757cf4cf3 run make on mixin changes from #8380 2013-07-18 00:50:57 -07:00
Mark Otto
8dc7807dcd change characters 2013-07-18 00:48:02 -07:00
Mark Otto
1363ffa473 Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip 2013-07-18 00:43:48 -07:00
Mark Otto
79a10feb7a Fixes #8452: adds .active to table classes 2013-07-18 00:10:22 -07:00
Mark Otto
87adbf7aa4 make on collapse changes 2013-07-17 23:56:38 -07:00
Mark Otto
bc79f8a399 Bump tooltips to use @font-size-small (11px to 12px) 2013-07-17 23:55:58 -07:00
Mark Otto
e57758cbb4 Drop .nav-header for .dropdown-header 
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
 2013-07-17 23:54:09 -07:00
Mark Otto
4d73aa60f9 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-07-17 23:34:31 -07:00
Mark Otto
d3a139622e fixes #8491: add vars for table padding 2013-07-17 23:34:04 -07:00
Mark Otto
ba0c6cd57c make on prev js changes 2013-07-17 23:33:34 -07:00
fat
8cf04911db fixes #7776 2013-07-17 23:25:26 -07:00
Mark Otto
d7d1c2a767 add ads to v3 docs 2013-07-17 23:22:28 -07:00
Mark Otto
3ad0cf9e94 add callouts for bootstrap 2.3.2 docs and 3.0 rc1 post 2013-07-17 22:58:49 -07:00
Mark Otto
9efba239b6 Merge pull request #8511 from twitter/bs3_remove_examples 
BS3: Move examples to @twbs/bootstrap-examples
 2013-07-17 22:17:30 -07:00
fat
18d23b892c rebuild js + fixes #7583 2013-07-17 21:35:28 -07:00
fat
2cccc0889f make sure triggering element is visible before focusing #7521 2013-07-17 21:30:38 -07:00
fat
102df4ff33 Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-07-17 21:14:02 -07:00
fat
eb3333a612 fix #7000 2013-07-17 21:08:50 -07:00
Mark Otto
f0d0718322 Merge branch '3.0.0-wip' into bs3_remove_examples 
Conflicts:
	docs/_includes/nav-getting-started.html
	docs/examples/navbar-fixed-top.html
	docs/examples/navbar-static-top.html
	docs/examples/navbar.html
	docs/getting-started.html
 2013-07-17 20:44:27 -07:00
fat
392bf0c9c9 fixes #6691 2013-07-17 20:29:41 -07:00
fat
5396c40877 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 19:33:49 -07:00
Mark Otto
542e03ae3a Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam 
Conflicts:
	docs/components.html
	docs/css.html
	docs/customize.html
 2013-07-17 19:33:30 -07:00
fat
f97dd5af49 rebuild doe 2013-07-17 19:33:21 -07:00
Mark Otto
5967ef64a3 remove margin from left side of navs since it's no longer being set 2013-07-16 11:49:04 -07:00
Mark Otto
522004e67a remove webkit-overflow-scrolling from modal for now /cc #8495 2013-07-16 11:26:48 -07:00
liuyl
0d5c3c2ecf simplify type.less 2013-07-09 09:22:36 +08:00
Mark Otto
1045226544 Merge pull request #8415 from cvrebert/code.less-cleanup 
code.less: cleanup styles that get immediately overriden later in the file
 2013-07-08 06:57:37 -07:00
Mark Otto
e0d1b83e25 Merge pull request #8412 from cvrebert/pagination-nesting 
use nesting more in pagination.less
 2013-07-08 06:55:50 -07:00
Mark Otto
46378c7ba3 Merge pull request #8411 from cvrebert/navbar-LESS-nesting 
more nesting in navbar.less
 2013-07-08 06:55:16 -07:00
Chris Rebert
e40aee9c9e code.less: cleanup styles that get immediately overriden later in the file 2013-07-07 20:03:52 -07:00
Chris Rebert
6bda16f6be use nesting more in pagination.less 2013-07-07 19:30:51 -07:00
Chris Rebert
d9cd5e4e0c more nesting in navbar.less 2013-07-07 19:22:18 -07:00
Chris Rebert
6e03639af2 more nesting in buttons.less 2013-07-07 19:16:38 -07:00
Maurice Wahba
8a84da6341 Carousel no longer dependent on glyphicons 
Used laquo/raquo for control buttons
Updated docs
 2013-07-06 22:26:40 +04:00
Mark Otto
95655e7275 Remove more Glyphicons 2013-07-05 14:27:54 -05:00
Mark Otto
fffb37ecea Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:24:40 -05:00
Mark Otto
3279181f42 Merge pull request #8378 from liuyl/aftertosibling 
optimize breadcrumb
 2013-07-05 12:23:14 -07:00
Mark Otto
30c138c4bf Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:22:46 -05:00
Mark Otto
61823dbff1 Move hr to scaffolding.less (out of type.less) and simplify styles 2013-07-05 14:21:05 -05:00
Mark Otto
88a266b800 Add tfoot back (addresses more than #8387) 2013-07-05 14:15:00 -05:00
Mark Otto
14056409c3 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:13:24 -05:00
Mark Otto
817972724a Remove further mentions of Glyphicons 2013-07-05 14:11:12 -05:00
liuyl
e6529e9588 delete typeahead style 2013-07-05 15:09:16 +08:00
liuyl
5b69d34053 use sibling selector instead of pseudo selector 2013-07-03 20:37:36 +08:00
Chris Rebert
da072fff21 refactor tables.less to use nesting more 2013-07-02 11:42:37 -07:00
Mark Otto
749dc35328 comma for the guardian angel /cc @cvrebert 2013-07-01 20:18:44 -07:00
Mark Otto
a049dcb7f6 Merge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-responsive-tables 
Conflicts:
	less/mixins.less
 2013-07-01 20:06:16 -07:00
Mark Otto
5b2d933524 Fixes #8350: unfuck Chrome number input element cursor /cc @cvrebert @eintnohick 2013-07-01 19:49:29 -07:00
Mark Otto
08b3515fd7 fixes #8345: use inline-block on .img-responsive 2013-07-01 19:42:43 -07:00
Mark Otto
9da90adb4c fixes #8068: add .help-block to form field state mixin 2013-07-01 18:21:19 -07:00
Mark Otto
c9df1db502 fixes #7367: slightly larger carousel indicators 2013-07-01 18:16:59 -07:00
Mark Otto
7ad9fbef8b Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-01 17:32:14 -07:00
Mark Otto
a27ecfccf3 Make more components mixin-friendly 2013-07-01 17:32:07 -07:00
Julian Thilo
fea69df80c Fix responsive utilities for table elements 
This change prevents situations where specificity causes some rules to
be overridden by the ones intended for mobile.
* Added mixin `responsive-invisibility()`
* Swapped out `display: none !important;` for new mixin
 2013-07-01 21:13:57 +02:00
Francis Brunelle
6a20810ca4 reset left padding for .media-list, .pagination and .pager 2013-06-29 16:06:14 -04:00
Mark Otto
0a92efce0c Nuke hella things 
* Any mentions of .btn-mini
* Old docs page that somehow found it's way back
 2013-06-28 09:24:46 -07:00
Mu-An Chiou
55fa1acbd6 Tooltip: apply position class before positioning 2013-06-28 11:05:38 +01:00
Mark Otto
09cdee2f03 Overall responsive img styles 
`img`s are no longer responsive by default. Instead, use
`.img-responsive` as a class or mixin. Existing `.thumbnail > img` and
`.img-thumbnail` classes now make use of this as a mixin as well.
 2013-06-28 00:09:10 -07:00
Mark Otto
1a09eada35 Run make on JS 2013-06-28 00:08:19 -07:00
Mark Otto
8e6d5be8e4 update close button example display 2013-06-27 23:26:04 -07:00
Mark Otto
88ece4fc59 fixes #7961 a bit: adds css for extra tooltip placement options. /cc @fat you just need dat js prolly 2013-06-27 20:50:21 -07:00
Mark Otto
bf3c5e070e remove submenus. for more context: http://www.youtube.com/watch?v=ggWyUEuGcWY&feature=youtu.be&t=48s 2013-06-27 20:49:29 -07:00
Mark Otto
89117ec6b2 run make on last commit 2013-06-27 20:18:16 -07:00
Mark Otto
d9a662ed1d fixes #7977: prevent some table bullshit on input groups 2013-06-27 20:15:44 -07:00
Mark Otto
ca8ca2177f fixes #4852: popover carets fully functional in ie8 holy carp wtfbqq huge shoutout to @PumaOmaR 2013-06-27 19:36:56 -07:00
Mark Otto
6a2858f7bf make on js i guess? /cc @fat 2013-06-27 19:36:35 -07:00
Mark Otto
81b5e74057 remove glyphicons from compiled css 2013-06-27 19:36:09 -07:00
Mark Otto
2af67238a4 Merge pull request #8332 from twitter/bs3_remove_icons 
BS3: Remove Glyphicons
 2013-06-27 19:23:55 -07:00
Mark Otto
8cd5d0be71 add docs callout for glyphicons on homepage and CSS page 2013-06-27 19:22:11 -07:00
Mark Otto
879d517cb3 delete icons in assets 2013-06-27 18:49:59 -07:00
fat
94761c2216 use collapse in dropdown js example 2013-06-27 18:47:35 -07:00
Julian Thilo
b4e0e4fee6 Adjust info callout, add callouts to docs 
* Adjust the background-color of bs-callout-info to match danger and
warning in tone
* Convert all the callouts
* Change some callouts to info/warning
* Add new callout
 2013-06-26 15:59:33 +02:00
Julian Thilo
f00c885d4c Docs: create new callout classes 2013-06-25 23:12:36 +02:00
Luis Hdez
9ed5b5e653 Fix line breaks on add-ons with spaces 2013-06-25 14:34:57 +02:00
Mark Otto
55120d124c Merge pull request #8268 from luishdez/hotfix/sidebar-overlap 
Fix overlap sidebar for Tablets and up in docs
 2013-06-23 15:16:25 -07:00
Mark Otto
573a197417 Move grid offsets to desktop only (fixes #8229) 2013-06-23 15:15:42 -07:00
Mark Otto
164e88781b Make on previous commits 2013-06-23 15:05:58 -07:00
Luis Hdez
5af22ab89f Fix overlap sidebar for Tablets and up in docs 2013-06-23 23:15:32 +02:00
Mark Otto
976322b2a6 run make on previous merge 2013-06-22 18:56:55 -07:00
Mark Otto
b0e943399d Improve alignment of navbar brand and fix up left padding on list groups 2013-06-21 17:21:44 -07:00
Mark Otto
eba9b4de6c Reset padding on homepage links 2013-06-21 11:56:47 -07:00
Mark Otto
ef8e5853cb Fixes #8154: enforce full width .navbar-nav.pull-right in mobile 
Prevents an odd alignment issue in mobile views by forcing the nav
links to be full width without undoing the float.
 2013-06-20 17:15:09 -07:00
Mark Otto
82f9de9459 Fixes #8159: Be more specific about disabled inputs to avoid iOS bug 
Attached disabled styles to the exact input types rather than all
inputs and reseting the checkbox/radios. If setting `background-color:
transparent;`, iOS renders no background on the disabled control.
 2013-06-20 17:02:10 -07:00
Mark Otto
90d4343f66 Fixes #8093: Removes invalid focus styles on inputs 2013-06-20 16:42:05 -07:00