clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-23 19:47:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,450 Commits 116 Branches 89 Tags 625 MiB
25ec09f06a
Commit Graph

7450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
XhmikosR
cbfbf1b2dd Add csslint support. 2013-12-08 13:23:25 +02:00
XhmikosR
fdc5d1dc34 Minify css with clean-css. 2013-12-08 13:05:10 +02:00
Mark Otto
b5613c9af5 Merge pull request #10709 from XhmikosR/quotes 
Quotes
 2013-12-08 02:52:15 -08:00
XhmikosR
eca8ff3803 Use single quotes consistently. 2013-12-08 12:44:14 +02:00
Mark Otto
ed63dfd8d3 Merge pull request #11739 from XhmikosR/lint-assets 
Lint docs-assets/js/application.js and docs-assets/js/customizer.js.
 2013-12-08 02:16:16 -08:00
Mark Otto
e349fb2114 fix validation failure 2013-12-08 02:14:43 -08:00
Mark Otto
1f9bfa89dc Fixes #11741: Don't set headings font-family again, just use inherit 2013-12-08 02:14:24 -08:00
Mark Otto
c37b710e85 Merge branch 'master' into pr/11744 
Conflicts:
	dist/css/bootstrap.min.css
 2013-12-08 02:00:37 -08:00
Mark Otto
b5008ebf9c add vertical-align back to where it's necessary since we reset from block to inline-block on several inputs 2013-12-08 01:59:44 -08:00
Mark Otto
e43e87b2f3 Merge pull request #11748 from bganicky/patch-1 
Updated .scale() mixin so that it accepts optional vertical scale factor...
 2013-12-08 01:49:38 -08:00
Mark Otto
12500047f9 Merge branch 'master' into pr/11750 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
 2013-12-08 01:45:42 -08:00
Mark Otto
475bbd4d38 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-08 00:17:17 -08:00
Mark Otto
d70f4e895c image compression 2013-12-07 23:49:03 -08:00
Mark Otto
adf8209b9c Merge pull request #11772 from KostyaTretyak/correction 
Fixed some errors in the docs javascript.html
 2013-12-07 23:29:36 -08:00
Mark Otto
90cbfc76e4 Add new template, Cover 2013-12-07 23:23:41 -08:00
kostyatretyak
34070af4a3 Merge branch 'master' of https://github.com/twbs/bootstrap into correction 2013-12-08 09:13:22 +02:00
kostyatretyak
6145cc026d Fixed some errors in the docs javascript.html 2013-12-08 09:11:43 +02:00
Mark Otto
6273604601 Add .container-fluid variation for full-width containers and layouts 
/cc #10711 #9862
 2013-12-07 20:52:51 -08:00
Mark Otto
73bc7d9f12 Add new template, Dashboard 2013-12-07 20:51:25 -08:00
Mark Otto
5fdd917918 improve icon display on narrow devices 2013-12-07 16:28:29 -08:00
Mark Otto
5e6f9b9a37 prevent horizontal scroll on components 2013-12-07 16:22:43 -08:00