Mark Otto
|
325748ff68
|
Merge branch 'master' into v4
Conflicts:
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs/_includes/components/thumbnails.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/template.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/assets/css/docs.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/src/customizer.js
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.js
docs/dist/js/bootstrap.min.js
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/theme/index.html
grunt/configBridge.json
less/alerts.less
less/badges.less
less/jumbotron.less
less/panels.less
less/tables.less
less/theme.less
less/variables.less
package.json
scss/_button-group.scss
scss/_buttons.scss
scss/_forms.scss
|
2015-01-19 14:48:12 -08:00 |
|
Gleb Mazovetskiy
|
93f51eb0e9
|
Automate breakpoints
Breakpoints and container widths are now defined as maps.
|
2014-12-24 22:27:11 +02:00 |
|
Gleb Mazovetskiy
|
e11208cc0b
|
variables: fix fade-in
|
2014-12-20 16:37:43 +00:00 |
|
Mark Otto
|
1e136a70a2
|
Clean up some navbar.scss, drop the -float-breakpoint var entirely
|
2014-12-11 14:47:10 -08:00 |
|
Mark Otto
|
826aeec6e8
|
Merge pull request #13 from twbs/default-vars
Apply !default to SCSS variables
|
2014-12-11 12:20:05 -08:00 |
|
Chris Rebert
|
23aa0340df
|
Apply !default to SCSS variables
Per @thomas-mcdonald
|
2014-12-09 16:24:05 -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 |
|
Mark Otto
|
bc3a2f669d
|
fix vars order, remove rando grid class from mixin
|
2014-12-04 22:32:39 -08:00 |
|
Mark Otto
|
a1a3a007b6
|
tweak grid docs, add new tier
|
2014-12-04 21:02:04 -08:00 |
|
Mark Otto
|
4474630d77
|
restore px to base font size var
|
2014-12-04 00:10:24 -08:00 |
|
Mark Otto
|
c213ff820a
|
fix the variables i broke, temporarily disabling line-height-computed
|
2014-12-04 00:09:37 -08:00 |
|
Mark Otto
|
27df020852
|
convert to scss
|
2014-12-02 14:02:35 -08:00 |
|