Commits · 826aeec6e8a3b51ff98f1c6ee4c9ee01eb19701f · Administrator / bootstrap

11 Dec, 2014 8 commits
- Merge pull request #13 from twbs/default-vars · 826aeec6
  Mark Otto authored Dec 11, 2014
```
Apply !default to SCSS variables
```
  826aeec6
- Merge pull request #8 from twbs/scss-lint · 30fe3d97
  Mark Otto authored Dec 11, 2014
```
Add SCSS-Lint to Grunt
```
  30fe3d97
- Merge branch 'v4' into scss-lint · 2edc7793
  Mark Otto authored Dec 11, 2014
```
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
```
  2edc7793
- Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 · f7e103a6
  Mark Otto authored Dec 11, 2014
  
  f7e103a6
- grunt · 2a78159a
  Mark Otto authored Dec 11, 2014
  
  2a78159a
- fix all validation, turn off some settings, add sort order · fef873a8
  Mark Otto authored Dec 11, 2014
  
  fef873a8
- Merge pull request #6 from twbs/grid-framework-refactor · 76d6b17f
  Gleb Mazovetskiy authored Dec 11, 2014
```
Refactor grid_framework
```
  76d6b17f
- Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 · 0e371ddf
  Mark Otto authored Dec 11, 2014
```
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/css/docs.min.css.map
```
  0e371ddf
10 Dec, 2014 2 commits
- grunt · 63d4423f
  Mark Otto authored Dec 10, 2014
  
  63d4423f
- Apply !default to SCSS variables · 23aa0340
  Chris Rebert authored Dec 10, 2014
```
Per @thomas-mcdonald
```
  23aa0340
09 Dec, 2014 13 commits
- Merge pull request #9 from twbs/less-vendor-prefixing · 63639f99
  Mark Otto authored Dec 09, 2014
```
_progress.scss: remove unnecessary @-webkit-keyframes
```
  63639f99
- Merge pull request #10 from twbs/bye-gradient-vendors · 70855a7d
  Mark Otto authored Dec 09, 2014
```
remove explicit vendor prefixes from _gradients.scss
```
  70855a7d
- Merge pull request #11 from twbs/card-columns-vendor · c6ec27a5
  Mark Otto authored Dec 09, 2014
```
remove explicit vendor prefixing from _card.scss
```
  c6ec27a5
- remove explicit vendor prefixing from _card.scss · 86f834e3
  Chris Rebert authored Dec 09, 2014
  
  86f834e3
- remove explicit vendor prefixes from _gradients.scss · b59abb40
  Chris Rebert authored Dec 09, 2014
  
  b59abb40
- _progress.scss: remove unnecessary @-webkit-keyframes · 94eecb84
  Chris Rebert authored Dec 09, 2014
```
Autoprefixer already takes care of this for us.
```
  94eecb84
- SCSS-Lint: StringQuotes: double_quotes , to match current style · 16bd4a27
  Chris Rebert authored Dec 09, 2014
  
  16bd4a27
- temporarily disable PropertySortOrder since it defaults to alphabetical · 2e91a3d6
  Chris Rebert authored Dec 09, 2014
  
  2e91a3d6
- SCSS-Lint: disable arbitrary selector/nesting depth limits · 1e4f280b
  Chris Rebert authored Dec 09, 2014
  
  1e4f280b
- SCSS-Lint: SpaceBeforeBrace: allow_single_line_padding: true · 895be6ef
  Chris Rebert authored Dec 09, 2014
  
  895be6ef
- add test-scss Grunt task · 5a986744
  Chris Rebert authored Dec 09, 2014
  
  5a986744
- add default SCSS-Lint config · 2d244d11
  Chris Rebert authored Dec 09, 2014
  
  2d244d11
- Travis: install scss-lint · 405410a9
  Chris Rebert authored Dec 09, 2014
  
  405410a9
07 Dec, 2014 2 commits

Refactor grid-framework followup · 5fefe06c

Gleb Mazovetskiy authored Dec 07, 2014

* Split up calc-grid-column, generate selectors in make-grid
* Iterate over $grid-breakpoints and (pull, push, offset)

5fefe06c

Refactor grid_framework · 795a5845

Gleb Mazovetskiy authored Dec 05, 2014

A more idiomatic refactoring of the grid framework

* Use %-placeholder instead of generating a class name list
* Use if expression
* Remove loop-grid-columns

795a5845

06 Dec, 2014 5 commits
- inline-block on labels now instead of inline · 2ade44a9
  Mark Otto authored Dec 06, 2014
  
  2ade44a9
- remove docs warning on inline vs inline-block for labels · 6f2e9d81
  Mark Otto authored Dec 06, 2014
  
  6f2e9d81
- clean up some docs css · 8ef926b4
  Mark Otto authored Dec 06, 2014
  
  8ef926b4
- stub out extend section a bit · d9c2ecd7
  Mark Otto authored Dec 06, 2014
  
  d9c2ecd7
- tweak label component padding · ebfe3584
  Mark Otto authored Dec 06, 2014
  
  ebfe3584
05 Dec, 2014 10 commits
- grunt--fuuuuuuuuuuuuuck you line comments · 57071cc6
  Mark Otto authored Dec 05, 2014
  
  57071cc6
- Merge pull request #7 from twbs/gemfile · 18304134
  Gleb Mazovetskiy authored Dec 05, 2014
```
Specify ruby dev deps in Gemfile
```
  18304134
- Merge pull request #4 from twbs/disable-source-comments · 9b59e077
  Gleb Mazovetskiy authored Dec 05, 2014
```
Disable source comments
```
  9b59e077
- Update test-infra/npm-shrinkwrap.json · 2033f169
  Gleb Mazovetskiy authored Dec 05, 2014
  
  2033f169
- Specify ruby dev deps in Gemfile · d5e159c8
  Gleb Mazovetskiy authored Dec 05, 2014
  
  d5e159c8
- Disable source comments · 7fe70cb0
  Gleb Mazovetskiy authored Dec 05, 2014
```
Require latest grunt-sass, bumped dep
```
  7fe70cb0
- Merge pull request #3 from twbs/v4_grid · a4e991c1
  Mark Otto authored Dec 05, 2014
```
Add new grid tier
```
  a4e991c1
- fix vars order, remove rando grid class from mixin · bc3a2f66
  Mark Otto authored Dec 05, 2014
  
  bc3a2f66
- Merge branch 'v4' into v4_grid · be147312
  Mark Otto authored Dec 05, 2014
  
  be147312
- Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 · 8454382b
  Mark Otto authored Dec 05, 2014
  
  8454382b