sharpetronics/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-11-04 00:03:15 -05:00
Code Issues Projects Releases Wiki Activity
9,195 Commits 125 Branches 94 Tags
Commit Graph

9195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
4f60a7fae9 don't change code bg on callouts 2014-05-22 21:34:49 -07:00
Mark Otto
64bb8be707 more callout tweaks 2014-05-22 21:34:24 -07:00
Mark Otto
abbf6da6aa tighten up callouts and remove backgrounds 2014-05-22 21:12:13 -07:00
Mark Otto
a375069704 Merge branch 'master' of github.com:twbs/bootstrap 2014-05-22 20:57:10 -07:00
Mark Otto
ef360b61b5 clarify and danger-ify affix docs usage requirements, per #10235 2014-05-22 20:14:32 -07:00
Mark Otto
68de4bf387 Merge pull request #13463 from twbs/docs-theme-toggler 
add button to toggle the optional theme when viewing the docs
 2014-05-22 19:20:32 -07:00
Mark Otto
326f6b2b87 Merge branch 'master' into docs-theme-toggler 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-05-22 18:54:25 -07:00
Mark Otto
fab9ab8fe9 Reset the padding on radio/checkbox labels in form-inline 2014-05-22 18:42:21 -07:00
Mark Otto
12b5d46f17 move it to the sidebar 2014-05-22 18:38:43 -07:00
XhmikosR
cae7dee236 Revert 4f9270cc20c29cd3fbb0664379d620d14bb24a91. 
The validator doesn't choke anymore on this and even though it's not spec compliant, it's needed for some IE versions. So until we move favicon.ico in root, this should do the job.
 2014-05-22 10:55:28 +03:00
Chris Rebert
1340a491e5 grunt dist 2014-05-21 23:37:06 -07:00
Mark Otto
707b362b80 Merge branch 'master' into docs-theme-toggler 
Conflicts:
	docs/assets/css/docs.min.css
 2014-05-20 23:27:40 -07:00
XhmikosR
3dd1531d81 Merge pull request #13624 from robertdodd/master 
Reassigned minification of CSS files to the cssmin task.
 2014-05-19 15:07:40 +03:00
Chris Rebert
e9b99d475c fix typo in assertion description 2014-05-19 00:47:06 -07:00
Chris Rebert
7d75734e10 Merge pull request #13615 from twbs/namespacing 
add missing event namespacing in modal.js
 2014-05-19 00:42:10 -07:00
Robert Dodd
8e354c4240 Reassigned minification of CSS to cssmin task. 
Reassigned minification of CSS files from the less task to the cssmin
task
 2014-05-19 17:07:31 +10:00
Chris Rebert
082bc20bb9 Merge pull request #13623 from twbs/skip-ci-steps 
add [skip sauce] and [skip validator]
 2014-05-18 17:26:14 -07:00
Chris Rebert
4a9ab6011d prove that [skip validator] works 
removes the extra newline added in the previous commit
 2014-05-18 17:20:55 -07:00
Chris Rebert
ca23e3913b prove that [skip sauce] works 
add extra newline to .travis.yml that I'll remove momentarily
 2014-05-18 17:20:54 -07:00
Chris Rebert
6638fc1649 Gruntfile: skip steps when $TWBS_DO_*=0 2014-05-18 17:20:54 -07:00
Chris Rebert
db26c9f4b4 Gruntfile: extract runSubset() func 2014-05-18 17:20:54 -07:00
Chris Rebert
df9f576583 Travis: skip RubyGems install+cache when TWBS_DO_VALIDATOR=0 2014-05-18 17:20:54 -07:00
Chris Rebert
1da03a1e73 add to TRAVIS_COMMIT_MSG, TWBS_DO_VALIDATOR, TWBS_DO_SAUCE vars to Travis 2014-05-18 17:20:54 -07:00
Chris Rebert
511240b377 update link to Grunt setup & info 2014-05-17 22:55:29 -07:00
Chris Rebert
5f59f96020 Merge pull request #13600 from twbs/resize-note-correction 
change note in .resizable() mixin for accuracy
 2014-05-17 15:29:07 -07:00
Chris Rebert
3d1723d689 add missing event namespacing in modal.js 2014-05-16 17:05:03 -07:00
Chris Rebert
e44f5b15b1 Merge branch 'impl-13342'; Closes #13342. 2014-05-16 14:30:31 -07:00
Attila Dobi
f47ad79538 add target option to Affix plugin 2014-05-16 13:07:45 -07:00
Chris Rebert
a40ff40b8f Merge pull request #13601 from twbs/tooltip-popover-doc 
Sync tooltip & popover docs
 2014-05-15 01:58:19 -07:00
Chris Rebert
00fcf072c6 update default 'template' value in popover docs 2014-05-14 18:43:14 -07:00
Chris Rebert
3465d984fb add 'container' option motivation to tooltip docs 2014-05-14 18:23:58 -07:00
Chris Rebert
6fdbd8e3cf add 'selector' option motivation to tooltip docs 2014-05-14 18:21:19 -07:00
Chris Rebert
e839a49995 add multiple triggers info to popover docs 2014-05-14 18:21:19 -07:00
Chris Rebert
90cfa1a44d add 'viewport' option to popover docs; #12328 erratum 2014-05-14 18:20:55 -07:00
Chris Rebert
99f6f700f4 docs: sort tooltip & container options for sanity 2014-05-14 18:12:18 -07:00
Chris Rebert
f6bebbd83a reference other more recent source regarding the IE viewport bug 2014-05-14 17:08:53 -07:00
Chris Rebert
7287582cf2 more precise docs link 2014-05-14 16:41:40 -07:00
Chris Rebert
95683ddfca change note in .resizable() mixin for accuracy 
Not a Safari bug. It's standards-compliant.

Quoting from http://www.w3.org/TR/css3-ui/#resize :
> ### 8.1. `resize` property
>
> * Applies to: elements with `overflow` other than `visible`
>
> The `resize` property applies to elements whose computed `overflow` value is something other than `visible`.

Original comment was added in commit 648c4689273647c321dd6e3979d910282e9a9339.
 2014-05-14 15:33:41 -07:00
Chris Rebert
5c11632baf Merge pull request #13594 from twbs/bump-saucelabs 
bump grunt-saucelabs to v5.1.3
 2014-05-13 15:35:07 -07:00
Chris Rebert
6fef447a62 bump grunt-saucelabs to v5.1.3 2014-05-13 14:54:41 -07:00
XhmikosR
ceda948372 Remove unneeded spaces from pre. 2014-05-13 17:14:34 +03:00
Chris Rebert
239d5e0e39 add link to StackOverflow question regarding Android <select> bug 2014-05-13 04:19:51 -07:00
Chris Rebert
828a5baa00 remove update-shrinkwrap from the default Grunt task 
Most folks shouldn't care about the shrinkwrap.
It should only be run on-demand, not as a routine/periodic thing.
 2014-05-13 02:08:25 -07:00
Chris Rebert
19ac6e59b3 Merge pull request #13579 from twbs/nuike-more-rtl-stuff 
Remove RTL leftovers.
 2014-05-13 00:06:03 -07:00
XhmikosR
d0fca8aaad Remove RTL leftovers. 2014-05-13 09:26:24 +03:00
XhmikosR
7a765d1f8b Update jQuery to v1.11.1. 2014-05-13 08:33:23 +03:00
Mark Otto
58f03754c6 unfuck the gruntifle 2014-05-12 22:01:29 -07:00
Mark Otto
e52920ca87 no more concurrency 2014-05-12 21:50:13 -07:00
Mark Otto
8ee6a6be80 grunt 2014-05-12 21:28:14 -07:00
Mark Otto
f39b272fed grunt 2014-05-12 21:19:01 -07:00