rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity
10,862 Commits 108 Branches 89 Tags 547 MiB
2edc779391
Commit Graph

10862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
2edc779391 Merge branch 'v4' into scss-lint 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	scss/_card.scss
 2014-12-11 12:07:09 -08:00
Mark Otto
f7e103a6ac Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2014-12-11 12:06:16 -08:00
Mark Otto
2a78159a20 grunt 2014-12-11 12:06:08 -08:00
Mark Otto
fef873a840 fix all validation, turn off some settings, add sort order 2014-12-11 12:05:29 -08:00
Gleb Mazovetskiy
76d6b17f4f Merge pull request #6 from twbs/grid-framework-refactor 
Refactor grid_framework
 2014-12-11 15:16:42 +00:00
Mark Otto
0e371ddf87 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/css/docs.min.css.map
 2014-12-10 20:51:17 -08:00
Mark Otto
63d4423fc0 grunt 2014-12-10 13:49:53 -08:00
Mark Otto
63639f9913 Merge pull request #9 from twbs/less-vendor-prefixing 
_progress.scss: remove unnecessary @-webkit-keyframes
 2014-12-08 22:48:03 -08:00
Mark Otto
70855a7d29 Merge pull request #10 from twbs/bye-gradient-vendors 
remove explicit vendor prefixes from _gradients.scss
 2014-12-08 22:47:42 -08:00
Mark Otto
c6ec27a5c8 Merge pull request #11 from twbs/card-columns-vendor 
remove explicit vendor prefixing from _card.scss
 2014-12-08 22:47:17 -08:00
Chris Rebert
86f834e356 remove explicit vendor prefixing from _card.scss 2014-12-08 22:05:50 -08:00
Chris Rebert
b59abb40f7 remove explicit vendor prefixes from _gradients.scss 2014-12-08 22:00:05 -08:00
Chris Rebert
94eecb84bf _progress.scss: remove unnecessary @-webkit-keyframes 
Autoprefixer already takes care of this for us.
 2014-12-08 20:36:33 -08:00
Chris Rebert
16bd4a2787 SCSS-Lint: StringQuotes: double_quotes , to match current style 2014-12-08 20:00:13 -08:00
Chris Rebert
2e91a3d6a7 temporarily disable PropertySortOrder since it defaults to alphabetical 2014-12-08 19:59:23 -08:00
Chris Rebert
1e4f280b19 SCSS-Lint: disable arbitrary selector/nesting depth limits 2014-12-08 19:58:25 -08:00
Chris Rebert
895be6efb0 SCSS-Lint: SpaceBeforeBrace: allow_single_line_padding: true 2014-12-08 19:57:05 -08:00
Chris Rebert
5a986744f7 add test-scss Grunt task 2014-12-08 19:02:25 -08:00
Chris Rebert
2d244d118b add default SCSS-Lint config 2014-12-08 19:00:05 -08:00
Chris Rebert
405410a924 Travis: install scss-lint 2014-12-08 18:34:15 -08:00
Gleb Mazovetskiy
5fefe06c3d Refactor grid-framework followup 
* Split up calc-grid-column, generate selectors in make-grid
* Iterate over $grid-breakpoints and (pull, push, offset)
 2014-12-07 16:22:39 +00:00
Gleb Mazovetskiy
795a584561 Refactor grid_framework 
A more idiomatic refactoring of the grid framework

* Use %-placeholder instead of generating a class name list
* Use if expression
* Remove loop-grid-columns
 2014-12-07 13:44:24 +00:00
Mark Otto
2ade44a9ca inline-block on labels now instead of inline 2014-12-06 00:33:36 -08:00
Mark Otto
6f2e9d8111 remove docs warning on inline vs inline-block for labels 2014-12-06 00:30:28 -08:00
Mark Otto
8ef926b4fb clean up some docs css 2014-12-06 00:20:57 -08:00
Mark Otto
d9c2ecd70d stub out extend section a bit 2014-12-06 00:18:44 -08:00
Mark Otto
ebfe358495 tweak label component padding 2014-12-06 00:18:11 -08:00
Mark Otto
57071cc68a grunt--fuuuuuuuuuuuuuck you line comments 2014-12-05 14:56:29 -08:00
Gleb Mazovetskiy
1830413460 Merge pull request #7 from twbs/gemfile 
Specify ruby dev deps in Gemfile
 2014-12-05 22:39:51 +00:00
Gleb Mazovetskiy
9b59e07784 Merge pull request #4 from twbs/disable-source-comments 
Disable source comments
 2014-12-05 22:39:32 +00:00
Gleb Mazovetskiy
2033f169b5 Update test-infra/npm-shrinkwrap.json 2014-12-05 11:38:19 +00:00
Gleb Mazovetskiy
d5e159c895 Specify ruby dev deps in Gemfile 2014-12-05 11:23:50 +00:00
Gleb Mazovetskiy
7fe70cb083 Disable source comments 
Require latest grunt-sass, bumped dep
 2014-12-05 10:53:14 +00:00
Mark Otto
a4e991c1a6 Merge pull request #3 from twbs/v4_grid 
Add new grid tier
 2014-12-04 23:27:08 -08:00
Mark Otto
bc3a2f669d fix vars order, remove rando grid class from mixin 2014-12-04 22:32:39 -08:00
Mark Otto
be1473128b Merge branch 'v4' into v4_grid 2014-12-04 21:21:30 -08:00
Mark Otto
8454382b6a Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2014-12-04 21:20:54 -08:00
Mark Otto
a1a3a007b6 tweak grid docs, add new tier 2014-12-04 21:02:04 -08:00
Chris Rebert
fc9b7e5464 Merge pull request #2 from twbs/data-example-id 
Add support for example IDs to {% example %} template tag
 2014-12-04 19:14:55 -08:00
Mark Otto
156750941b move media queries docs to new section of layout 2014-12-04 16:51:19 -08:00
Mark Otto
824f26a3c0 grunt dist 2014-12-04 15:29:53 -08:00
Mark Otto
32878bca7f fix margin on tables 2014-12-04 15:25:57 -08:00
Mark Otto
7bc020cce0 sass, not less 2014-12-04 15:25:24 -08:00
Mark Otto
d05e58449a linting 2014-12-04 15:20:55 -08:00
Mark Otto
2fa4ab8209 grunt 2014-12-04 15:20:45 -08:00
Mark Otto
854dc065e4 fix blockquote margins, remify values 2014-12-04 15:19:23 -08:00
Mark Otto
8e454b6f1d fix hr margins, remify border width 2014-12-04 15:18:16 -08:00
Mark Otto
aab9218c7f rem-ify blog example and clean a few visuals up 2014-12-04 14:32:13 -08:00
Mark Otto
b811553147 new look for carousel example, convert to rems 2014-12-04 14:18:13 -08:00
Mark Otto
908f776c08 more rem fixes for examples 2014-12-04 14:02:38 -08:00