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,125 Commits 108 Branches 89 Tags 547 MiB
b790ea9011
Commit Graph

8125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
b790ea9011 Merge pull request #12219 from ZDroid/rn 
Rename docs/LICENSE-DOCS to docs/LICENSE
 2014-01-18 14:49:00 -08:00
Mark Otto
032869a439 Merge pull request #12248 from twbs/bg-variant 
refactoring: add & use .bg-variant() mixin
 2014-01-18 14:47:29 -08:00
Julian Thilo
10a158ff93 Fix typos, sentences in getting-started.html 2014-01-18 23:46:32 +01:00
Mark Otto
2115ac525b Run grunt dist after adding 'a' requirement to the text emphasis classes 2014-01-18 14:40:48 -08:00
Mark Otto
3b6ab5075e Merge branch 'master' into bg-variant 
Conflicts:
	less/mixins.less
 2014-01-18 14:40:17 -08:00
Mark Otto
572e6a959a Merge pull request #12286 from watilde/fixes-panel 
Fixes #12263: Remove border radius when it's not both ends in panel
 2014-01-18 14:29:11 -08:00
Mark Otto
b32d92ef71 Merge pull request #12249 from twbs/modal-md 
add & use @modal-md Less var for uniformity
 2014-01-18 14:28:45 -08:00
Mark Otto
9c9a2f3e08 Merge pull request #12247 from twbs/text-emphasis-variant 
refactoring: add & use .text-emphasis-variant() mixin
 2014-01-18 14:28:33 -08:00
Mark Otto
cfe38a4241 Merge branch 'master' into modal-md 2014-01-18 14:12:04 -08:00
Mark Otto
cd1bea0616 Merge branch 'master' into bg-variant 2014-01-18 14:11:55 -08:00
Mark Otto
689e75e4b1 Merge branch 'master' into text-emphasis-variant 2014-01-18 14:11:36 -08:00
Mark Otto
b1721f42cc Merge branch 'master' of github.com:twbs/bootstrap 2014-01-18 14:09:17 -08:00
Mark Otto
c322612218 move migration docs to new separate page, leave callout on getting started page; fixes #12244 2014-01-18 14:09:09 -08:00
Julian Thilo
67594cb544 Fix holder.js links in examples 
Replaces links to holder.js with links to the new docs.min.js.
The uncompressed holder.js file is now in docs/assets/js/vendor,
which is excluded from Jekyll builds. In turn, Holder is now
included in docs.min.js, which is smaller than holder.js,
so this should make everybody happy. :)
 2014-01-18 22:58:05 +01:00
Daijiro Wachi
6856c9f7f6 remove border radius when it's not both ends in panel 2014-01-19 06:43:57 +09: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
Julian Thilo
a56cf753ce Make spelling of Less uniform throughout the docs 2014-01-18 18:40:47 +01:00
Julian Thilo
092b1a47ef Fix typo in index.html 2014-01-18 18:15:37 +01:00
XhmikosR
4bca3c79b3 Move docs third-party libraries to a separate folder. 2014-01-18 08:15:21 +02:00
Mark Otto
dcdf716eef copy 2014-01-17 19:04:14 -08:00
Chris Rebert
172de467eb present browser compatibility info in a table 2014-01-17 17:12:52 -08:00
Chris Rebert
d8c87ddc28 fix #12277 
Thanks to @Quy for pointing these out.
 2014-01-17 14:28:01 -08:00
Tobias Lindig
084f0fb113 add namespace .bs also to the event dismiss.modal 2014-01-17 12:16:53 -08:00
Chris Rebert
d6e8006ea6 Merge pull request #12276 from twbs/grunt-contrib-qunit 
bump grunt-contrib-qunit to v0.4.0
 2014-01-17 12:06:12 -08:00
Chris Rebert
58c4a8c0f1 bump grunt-contrib-qunit to v0.4.0 2014-01-17 11:56:53 -08:00
Chris Rebert
ffdc18cbbf fix #12274 2014-01-17 11:52:35 -08:00
Chris Rebert
c5bed1a850 Merge pull request #12275 from ZDroid/ncss 
Replace Normalize with Normalize.css
 2014-01-17 11:43:18 -08:00
Zlatan Vasović
93ab926dc7 Replace Normalize with Normalize.css 2014-01-17 20:22:32 +01:00
Julian Thilo
af5cebf76b Merge pull request #12271 from tlindig/modal_remove_needless_space 
remove needless space character
 2014-01-17 06:29:12 -08:00
Tobias Lindig
7fab3c30f2 remove needless space character 2014-01-17 13:34:03 +01:00
Chris Rebert
6af0013ac5 Revert "Add tooltip viewport option, respect bounds of the viewport" 
This reverts commit edb221a20c.
Reverting due to broken JS unit tests.

Conflicts:
	docs/javascript.html
 2014-01-16 20:32:59 -08:00
Chris Rebert
faa783e989 Merge pull request #12267 from twbs/ie-10 
enable IE10 for Sauce tests
 2014-01-16 20:07:43 -08:00
Mark Otto
03f4534307 Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benogle-bo-tooltip-viewport 
Conflicts:
	docs/javascript.html
 2014-01-16 20:01:28 -08:00
Mark Otto
8eef0a47ee Merge branch 'master' of github.com:twbs/bootstrap 2014-01-16 20:00:36 -08:00
Mark Otto
380019ccb2 Split box-sizing reset for faster rendering 2014-01-16 20:00:28 -08:00
Chris Rebert
ee396aeb8e enable IE10 for Sauce tests 2014-01-16 19:53:02 -08:00
Chris Rebert
bd8ef99028 temporarily disable OS X Chrome Sauce test since it's being flaky 
e.g.:
Tested http://127.0.0.1:3000/js/tests/index.html
Environment: OS X 10.9::chrome
>> Timeout, waited for more than 300000 milliseconds
 2014-01-16 19:52:24 -08:00
Chris Rebert
600f62dc78 Merge pull request #12265 from twbs/ie-11 
enable IE11 in Sauce tests
 2014-01-16 17:00:46 -08:00
Chris Rebert
ecf8148c3f Merge pull request #12264 from twbs/mavericks-safari-7 
upgrade to Safari 7 in Sauce tests
 2014-01-16 16:10:50 -08:00
Chris Rebert
4a50ac0bdd enable IE11 in Sauce tests 2014-01-16 15:35:08 -08:00
Chris Rebert
60fb8b76f9 Merge pull request #12262 from twbs/osx-firefox 
re-enable OS X Firefox in Sauce tests
 2014-01-16 15:25:50 -08:00
Mark Otto
d07e8fece4 grunt 2014-01-16 15:03:34 -08:00
Chris Rebert
ded7008e40 upgrade to Safari 7 in Sauce tests 2014-01-16 14:51:41 -08:00
Chris Rebert
1ca0f8dbc0 re-enable OS X Firefox in Sauce tests 2014-01-16 14:47:11 -08:00
fat
4bd6a52562 add missing paren 2014-01-16 14:28:21 -08:00
fat
82ff4e2e40 tooltip subpixel test fixes 2014-01-16 14:25:28 -08:00
fat
3b2418e688 remove flaky pos bottom test which is effect by unit scroll pos 2014-01-16 13:44:08 -08:00
fat
2f76821a4d new qunit 2014-01-16 13:33:09 -08:00
Chris Rebert
bc074d5488 Merge pull request #12260 from patricker/patch-1 
Update javascript.html to fix Tabs example
 2014-01-16 10:55:22 -08:00