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
7,584 Commits 108 Branches 89 Tags 547 MiB
43c3d785ef
Commit Graph

7584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chris Rebert
95992ef7e9 enable strictMath in grunt-contrib-less config 2013-12-09 16:27:42 -08:00
Chris Rebert
28d8be1634 Merge pull request #11808 from twbs/strict-math-fixes 
more LESS strictMath fixes
 2013-12-09 16:20:26 -08:00
Chris Rebert
ab29b1a335 misc strictMath compliance fixes 2013-12-09 16:14:44 -08:00
Chris Rebert
9664f8da58 add parens around arithmetic in recursive mixin calls to comply with LESS strictMath 
<3 @seven-phases-max for helping to confirm & debug this
X-Ref: https://github.com/less/less.js/issues/1725
 2013-12-09 16:02:24 -08:00
Chris Rebert
88d8cd90e2 Merge pull request #11807 from twbs/stricter-math 
improve compliance with LESS's strictMath
 2013-12-09 15:37:56 -08:00
Chris Rebert
10e74a94e6 improve compliance with LESS's strictMath 2013-12-09 15:35:13 -08:00
Mark Otto
25ec09f06a Merge pull request #11790 from twbs/drop_recess_for_less 
Drop grunt-recess for grunt-contrib-less
 2013-12-09 11:30:10 -08:00
Mark Otto
d466d527a4 Undo merge of #11778 and use cleancss min option 2013-12-09 00:12:11 -08:00
Mark Otto
b9b17bc72b grunt 2013-12-09 00:09:52 -08:00
Mark Otto
de218bbba8 Merge branch 'pr/11779' into drop_recess_for_less 
Conflicts:
	Gruntfile.js
	package.json
 2013-12-08 23:56:22 -08:00
Mark Otto
7d4171ccd1 Merge pull request #11792 from twbs/list-group-nest 
more nesting in .list-group-item-variant mixin
 2013-12-08 23:55:03 -08:00
Mark Otto
ea61a19a04 Merge branch 'pr/11778' into drop_recess_for_less 
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.min.css
 2013-12-08 23:48:07 -08:00
Chris Rebert
9ceff60057 more nesting in .list-group-item-variant mixin 2013-12-08 23:34:24 -08:00
Mark Otto
0016c17f93 Switch to &:extend(.clearfix all) for clearfix mixin 
Original discussion:
https://github.com/less/less.js/issues/1437#issuecomment-21383639.

Since we’re switching to `grunt-contrib-less`, we can take advantage of
newer LESS features than what RECESS supported. Included in that is the
ability to `:extend`, and not only that, but `:extend(.mixin-name
all)`. By doing so, we remove duplicate CSS for all our elements that
were being clearfix-ed.

Fixes #8947, #8968, #8991, #9257, #9268, #9291, #9430, #9604, #9686,
#9929, #10731, #10793, #11305, #11498, #11533, #11570, #11604, #11652.

(dem issues, tho)
 2013-12-08 23:18:28 -08:00
Mark Otto
2a4621b71f Merge branch 'master' into drop_recess_for_less 
Conflicts:
	dist/css/bootstrap.min.css
 2013-12-08 23:00:01 -08:00
Mark Otto
e4c1ef7c6d more closely align property order with recess 2013-12-08 22:55:09 -08:00
Mark Otto
0991c7c341 specify block indent as numeral to prevent fubared media query output 2013-12-08 22:33:24 -08:00
Mark Otto
e90ce1c0d5 single array == no rogue spaces 2013-12-08 22:32:07 -08:00
Mark Otto
4540f9e2d2 derp, don't sort min /cc @cvrebert 2013-12-08 22:16:43 -08:00
Mark Otto
aae9c2d136 merge, compile 2013-12-08 22:11:46 -08:00
Chris Rebert
dbe95f027d fixups to csscomb grunt task 2013-12-08 20:46:12 -08:00
Mark Otto
6df909ad9b Fixes #11786: Nest media queries within print utilities for mixin-friendliness 2013-12-08 19:19:06 -08:00
Mark Otto
6b55e93570 adding json 2013-12-08 19:17:43 -08:00
Mark Otto
f1cb57c8c2 restore original options value 2013-12-08 19:12:37 -08:00
Mark Otto
c0200426ee Drop grunt-recess for grunt-contrib-less & co 2013-12-08 19:09:27 -08:00
Mark Otto
768f8b00f3 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-08 17:50:26 -08:00
Chris Rebert
ae0d48057e fix #11787: document stateful button JS 2013-12-08 17:42:59 -08:00
Mark Otto
cdb7d9839e grunt 2013-12-08 17:21:37 -08:00
Mark Otto
b98d6ed12b Merge branch 'master' of github.com:twbs/bootstrap 2013-12-08 17:19:45 -08:00
Mark Otto
e1247e3edc Match customizer banner to Gruntfile banner 2013-12-08 17:17:51 -08:00
Mark Otto
997a1f4ed2 fix dependency mapping of buttons and button-groups in customizer 2013-12-08 17:17:04 -08:00
Chris Rebert
1f35b6ec5c fix <button>s with .btn but missing accompanying .btn-* 2013-12-08 17:15:26 -08:00
Julian Thilo
bab736c7d7 Fix typo in new author meta tag 2013-12-08 22:39:29 +01:00
Mark Otto
5eeaf114cc Merge pull request #11780 from ZDroid/grunt-dev 
Don't ignore Gruntfile, it's required for compile
 2013-12-08 10:47:24 -08:00
Zlatan Vasović
a5d9b358ab Don't ignore Gruntfile, it's required for compile 2013-12-08 13:36:52 +01:00