0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-03 15:24:19 +01:00
Commit Graph

7625 Commits

Author SHA1 Message Date
Mark Otto
ecc6f4e6bc Merge branch 'master' into pr/11868
Conflicts:
	dist/css/bootstrap.min.css
2013-12-14 11:36:54 -08:00
Mark Otto
22820d7151 Fixes #10495: Float Glyphicon and set margins in .navbar-brand to ensure there is no added height because wtf even is CSS 2013-12-13 23:06:04 -08:00
Chris Rebert
ce07ff84cd Merge pull request #11869 from twbs/cache-node_modules
use S3-based node_modules caching
2013-12-13 17:35:39 -08:00
Chris Rebert
6b6b059ac3 time all the things 2013-12-13 17:22:46 -08:00
Chris Rebert
42697a4ecb use S3-based node_modules caching 2013-12-13 17:20:32 -08:00
Chris Rebert
de6b9e9df1 Merge pull request #11874 from ZDroid/hotfix
';' isn't needed
2013-12-13 14:31:15 -08:00
Zlatan Vasović
e3d799fca3 ';' isn't needed 2013-12-13 23:15:02 +01:00
Tobias Lindig
37b2c8a812 add dist files. 2013-12-13 12:27:56 +01:00
Tobias Lindig
b7bf212995 use @zindex-modal for .modal and @zindex-modal-background for .modal-backdrop.
removed z-index for .modal-dialog, it was not necessary because the parent element (.modal) already has a z-index.
2013-12-13 12:24:20 +01:00
Mark Otto
5f9ecc7351 -ms-transform is for IE9 only, IE10+ don't require it 2013-12-12 23:01:11 -08:00
Mark Otto
0e6d34f24f Merge pull request #11819 from janpanschab/ms-transform-origin
Transform-origin mixin for IE
2013-12-12 22:59:08 -08:00
Chris Rebert
2d693def43 Merge pull request #11863 from twbs/update-osx
Sauce tests: update to later browsers supported by OS X 10.9
2013-12-12 22:16:31 -08:00
Chris Rebert
56d89ed7ae Sauce tests: update to later browsers supported by OS X 10.9 2013-12-12 21:58:44 -08:00
Mark Otto
0cb570724d quotes 2013-12-12 18:10:58 -08:00
Mark Otto
d2d2f77ffe text update 2013-12-12 15:21:49 -08:00
Mark Otto
885d14b042 move icons to partial 2013-12-12 15:21:34 -08:00
Mark Otto
d704bf0a52 just column width, not max 2013-12-12 14:59:25 -08:00
Mark Otto
0b4efcda90 more docs homepage cleanup 2013-12-12 14:57:43 -08:00
mrasscha
ce39cbe6fa Issue #11852 : create a new variable for the list group active item link text. 2013-12-12 20:48:08 +01:00
Mark Otto
f8a78d7de7 homepage images 2013-12-12 10:28:43 -08:00
Mark Otto
da24a3e118 typo 2013-12-12 10:28:37 -08:00
Chris Rebert
730ccd2a20 Merge pull request #11859 from dzwillia/add_dropdown_caret_color
Add @dropdown-caret-color variable back to variables.less
2013-12-12 10:02:53 -08:00
dzwillia
4b47c60835 Added @dropdown-caret-color variable back to variables.less (deprecated) 2013-12-12 12:53:59 -05:00
Mark Otto
4fc2907723 Merge branch 'master' into docs_derp
Conflicts:
	docs-assets/css/docs.css
	docs-assets/js/application.js
2013-12-11 22:39:03 -08:00
Mark Otto
0e8baab34a more homepage and sidenav overhaul 2013-12-11 22:37:59 -08:00
Mark Otto
fbf31f965e Add new template, Cover 2013-12-11 16:45:41 -08:00
Mark Otto
9966d035cd Merge branch 'master' of github.com:twbs/bootstrap 2013-12-11 10:52:55 -08:00
Mark Otto
a3a2525124 Fixes #11837: grid containers are fixed width now, no longer max-width 2013-12-11 10:52:47 -08:00
Mark Otto
bdd0890c0f Merge pull request #11841 from ZDroid/breadcrumbs
Use variables for breadcrumb padding
2013-12-11 10:48:51 -08:00
Mark Otto
5ec2b4b255 Merge pull request #11839 from XhmikosR/readme
Clarify Windows workarounds.
2013-12-11 10:47:54 -08:00
Zlatan Vasović
2547f1e20f Use variables for breadcrumb padding 2013-12-11 14:36:26 +01:00
Zlatan Vasović
27859f6b8f Improve pager customization 2013-12-11 14:25:21 +01:00
Chris Rebert
f3077ee424 Merge pull request #11838 from XhmikosR/customizer
customizer.js: Remove a workaround for older less.js.
2013-12-11 03:53:44 -08:00
XhmikosR
caa3d53dcb customizer.js: remove a workaround for older less.js. 2013-12-11 13:27:23 +02:00
XhmikosR
6355832e90 Clarify Windows workarounds. 2013-12-11 12:57:18 +02:00
Mark Otto
2bc08190ec Combine updates to Windows Jekyll stuff 2013-12-10 19:43:52 -08:00
Mark Otto
f32ef36daf Merge pull request #11830 from XhmikosR/jekyll-windows
Update Jekyll on Windows info
2013-12-10 19:40:51 -08:00
Mark Otto
352b6883e9 Merge pull request #11832 from twbs/run_jekyll_on_windows
Help Windows users install Jekyll
2013-12-10 19:40:31 -08:00
Julian Thilo
1d56211653 Help Windows users install Jekyll 2013-12-11 00:13:02 +01:00
XhmikosR
b9f12a5637 README.md: mention an alternative workaround for the jekyll issue on Windows. 2013-12-11 00:06:25 +02:00
XhmikosR
fc3e7433c2 Update README.md.
Mention that Python needs to be in PATH for Pygments to work and thus jekyll not fail.
2013-12-11 00:06:25 +02:00
Mark Otto
1bce8c9301 Merge pull request #11818 from XhmikosR/less.js
Update less.js to v1.5.1.
2013-12-10 10:03:33 -08:00
Mark Otto
52c87b30a9 Merge pull request #11812 from tlindig/load_grunt_tasks
Build process: use module "load-grunt-tasks" to load grunt tasks
2013-12-10 10:02:01 -08:00
Jan Panschab
3e0366a3df transform origin mixin for explorer 2013-12-10 17:15:41 +01:00
XhmikosR
11180e0fa7 Update less.js to v1.5.1.
This fixes an error with `&:extend(.clearfix all)` when using the customizer.
2013-12-10 18:09:14 +02:00
Tobias Lindig
3b5e0c9a3c hide space characters in input-group-btn to fix segmented buttons double border 2013-12-10 16:47:12 +01:00
Tobias Lindig
3583aa2774 correct indentation 2013-12-10 14:47:50 +01:00
Tobias Lindig
9f12f840b9 Buildprocess: use module "load-grunt-tasks" to load grunt tasks directly from the package.json 2013-12-10 10:28:44 +01:00
XhmikosR
5749039f8d Remove unused variables. 2013-12-10 10:11:10 +02:00
Mark Otto
a6b5c7db12 Merge pull request #11809 from twbs/enable-LESS-strictMath
enable strictMath in grunt-contrib-less config
2013-12-09 18:16:18 -08:00