Chris Rebert
|
61a2120557
|
fix main SCSS file paths
Fixes 2916ac43ed errata
FYI @glebm
|
2015-01-18 14:29:53 -08:00 |
|
Gleb Mazovetskiy
|
3d635f3079
|
Update grunt/bs-sass-compile/ to point to _bootstrap.scss
|
2015-01-15 21:28:14 +00:00 |
|
Gleb Mazovetskiy
|
2916ac43ed
|
Rename scss/bootstrap.scss -> scss/_bootstrap.scss
This is required for Compass compatibility. See
https://github.com/twbs/bootstrap-sass/issues/694
Also updates bower.json and package.json references to the main Sass
file.
|
2015-01-15 21:20:40 +00:00 |
|
Mark Otto
|
0531d6476c
|
Merge pull request #63 from twbs/team-unity
Core & Sass Teams are now one and the same bigger Team
|
2015-01-14 18:02:18 -08:00 |
|
Chris Rebert
|
e94a597685
|
Core & Sass Teams are now one and the same bigger Team
|
2015-01-14 10:45:07 -08:00 |
|
Gleb Mazovetskiy
|
720d02c5e5
|
Revert "Remove libsass @media nesting bug workaround"
This reverts commit d6a5ebf438.
There has not been a release of libsass with this fix yet, sorry!
|
2015-01-08 21:38:12 +00:00 |
|
Gleb Mazovetskiy
|
f4a00dc037
|
Merge pull request #58 from twbs/libsass-185
Remove libsass @media nesting bug workaround
|
2015-01-08 21:23:29 +00:00 |
|
Gleb Mazovetskiy
|
3be590dd5b
|
docs: fix typo in media-queries.md
|
2015-01-08 21:17:22 +00:00 |
|
Chris Rebert
|
d6a5ebf438
|
Remove libsass @media nesting bug workaround
https://github.com/sass/libsass/issues/185 has been fixed.
Refs #48
|
2015-01-07 19:17:45 -08:00 |
|
Chris Rebert
|
5951647b1a
|
Merge pull request #25 from twbs/autoprefixer-bump-chrome
bump min Chrome in Autoprefixer to v35
|
2015-01-07 19:15:52 -08:00 |
|
Chris Rebert
|
3c6a307011
|
bump min Chrome in Autoprefixer to v35
|
2015-01-07 17:49:43 -08:00 |
|
Chris Rebert
|
698b3a7ace
|
grunt
|
2015-01-07 17:04:59 -08:00 |
|
Chris Rebert
|
c8bfa7d353
|
Merge pull request #54 from twbs/overhaul-responsive-visibility
Overhaul of responsive visibility classes
|
2015-01-06 17:50:33 -08:00 |
|
Chris Rebert
|
e651b48eb6
|
update responsive utility docs post-overhaul
|
2015-01-06 17:49:33 -08:00 |
|
Chris Rebert
|
5868b5bc9c
|
add migration guidance regarding responsive visibility classes
|
2015-01-06 17:49:33 -08:00 |
|
Chris Rebert
|
11a574ce9e
|
Overhaul responsive visibility classes
Thanks to @glebm for help refactoring this to use the breakpoint mixins.
|
2015-01-06 17:47:13 -08:00 |
|
Chris Rebert
|
cbb3b1ff9a
|
Kill scss/mixins/_media-queries.scss
replaced media-xs => media-breakpoint-down(xs)
replaced media-sm => media-breakpoint-up(sm)
replaced media-sm-max => media-breakpoint-only(sm)
replaced media-md => media-breakpoint-up(md)
replaced media-md-max => media-breakpoint-only(md)
replaced media-lg => media-breakpoint-up(lg)
|
2015-01-06 17:47:13 -08:00 |
|
Chris Rebert
|
746e09f8ae
|
rename media-breakpoint-{min,max} => media-breakpoint-{up,down}
|
2015-01-06 17:47:13 -08:00 |
|
Chris Rebert
|
ff9c07f4aa
|
fix numerical typo in grid docs
|
2015-01-06 17:46:46 -08:00 |
|
Mark Otto
|
20cdb62200
|
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
|
2015-01-06 16:06:06 -08:00 |
|
Mark Otto
|
b542137dd5
|
streamline homepage nav
|
2015-01-06 16:05:58 -08:00 |
|
Mark Otto
|
82f460b20d
|
formatting of html
|
2015-01-06 15:35:49 -08:00 |
|
Chris Rebert
|
b361dacff1
|
Merge pull request #59 from twbs/probably-slightly-better-best-practice
Use improved box sizing reset
|
2015-01-06 00:04:53 -08:00 |
|
Chris Rebert
|
ef453fa6ce
|
Use improved box sizing reset
Based on http://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/
This allows us to significantly simplify the relevant part of the docs.
|
2015-01-05 15:20:46 -08:00 |
|
Chris Rebert
|
0bd8c7cb6a
|
grunt dist
|
2015-01-05 11:41:34 -08:00 |
|
Chris Rebert
|
0075de8ee8
|
Merge pull request #40 from twbs/bye-affix
Remove affix from docs & CSS; add migration guidance
|
2015-01-05 11:38:38 -08:00 |
|
Chris Rebert
|
00e6fae8fb
|
Remove affix from docs & CSS; add migration guidance
|
2015-01-05 11:36:51 -08:00 |
|
Chris Rebert
|
6cb417616c
|
Merge pull request #26 from twbs/autoprefixer-bump-mac-safari
bump min OS X Safari in Autoprefixer config to v7.1
|
2015-01-05 11:20:30 -08:00 |
|
Mark Otto
|
615eb99067
|
fix broke shit, recompile
|
2015-01-03 20:16:46 -08:00 |
|
Mark Otto
|
0e5d17d5f6
|
Merge branch 'master' into v4
Conflicts:
Gruntfile.js
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/_data/glyphicons.yml
docs/_includes/components/alerts.html
docs/_includes/components/badges.html
docs/_includes/components/breadcrumbs.html
docs/_includes/components/button-dropdowns.html
docs/_includes/components/button-groups.html
docs/_includes/components/dropdowns.html
docs/_includes/components/glyphicons.html
docs/_includes/components/input-groups.html
docs/_includes/components/jumbotron.html
docs/_includes/components/labels.html
docs/_includes/components/list-group.html
docs/_includes/components/media.html
docs/_includes/components/navbar.html
docs/_includes/components/navs.html
docs/_includes/components/page-header.html
docs/_includes/components/pagination.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/components/responsive-embed.html
docs/_includes/components/thumbnails.html
docs/_includes/components/wells.html
docs/_includes/css/buttons.html
docs/_includes/css/code.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.html
docs/_includes/css/tables.html
docs/_includes/css/type.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/disabling-responsiveness.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/whats-included.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/modal.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/nav/components.html
docs/_includes/nav/javascript.html
docs/_jade/customizer-variables.jade
docs/_layouts/default.html
docs/about.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/src/customizer.js
docs/customize.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/glyphicons.less
less/mixins/vendor-prefixes.less
less/navbar.less
less/popovers.less
less/tables.less
less/theme.less
less/tooltip.less
less/variables.less
package.json
scss/_carousel.scss
scss/_close.scss
scss/_forms.scss
test-infra/npm-shrinkwrap.json
|
2015-01-03 20:08:58 -08:00 |
|
Mark Otto
|
31610258de
|
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
|
2015-01-03 16:00:45 -08:00 |
|
Mark Otto
|
c6af78e8a4
|
grunt
|
2015-01-01 12:13:28 -08:00 |
|
Mark Otto
|
a6053b573c
|
override the box-shadows on active, checked, and indeterminate states
|
2015-01-01 12:13:24 -08:00 |
|
Mark Otto
|
e4fa95eb57
|
grunt dist
|
2015-01-01 12:02:02 -08:00 |
|
Mark Otto
|
401ace65f4
|
add indeterminate checkbox support
|
2015-01-01 12:01:55 -08:00 |
|
Bootstrap's Grunt bot
|
57260f16b3
|
automatic grunt dist
|
2015-01-01 19:02:43 +00:00 |
|
Mark Otto
|
401889a8dc
|
Merge pull request #15477 from ZDroid/2015
Happy New Year
|
2015-01-01 10:35:19 -08:00 |
|
Chris Rebert
|
4e8f769d44
|
fix typo in comment
|
2015-01-01 00:02:21 -08:00 |
|
Bootstrap's Grunt bot
|
548d46eb8b
|
automatic grunt dist
|
2015-01-01 03:01:40 +00:00 |
|
Zlatan Vasović
|
576230b92a
|
Happy New Year 🎅
|
2015-01-01 01:23:48 +01:00 |
|
Chris Rebert
|
df38cdad32
|
Merge pull request #15472 from twbs/address-15288
Document that responsive tables use `overflow-y: hidden`
|
2014-12-31 16:12:38 -08:00 |
|
Chris Rebert
|
c328b6254f
|
Merge pull request #15473 from twbs/autoprefixer-docs
Document that Autoprefixer is required
|
2014-12-31 16:11:42 -08:00 |
|
Chris Rebert
|
45f5841785
|
Merge pull request #15464 from twbs/address-15419
Address #15419
|
2014-12-31 16:11:04 -08:00 |
|
Bootstrap's Grunt bot
|
6c383c5102
|
automatic grunt dist
|
2015-01-01 00:02:16 +00:00 |
|
Mark Otto
|
82403407d8
|
Merge pull request #55 from twbs/xl-size
account for XL size tier in grid docs
|
2014-12-31 10:49:33 -08:00 |
|
Mark Otto
|
fb176a97e1
|
change values, remove grid column size row
|
2014-12-31 10:46:50 -08:00 |
|
Mark Otto
|
1a932b7e02
|
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
|
2014-12-31 10:39:56 -08:00 |
|
Mark Otto
|
a5e127fd16
|
grunt
|
2014-12-31 10:37:23 -08:00 |
|
Mark Otto
|
03e39251fa
|
larger hr border width so it shows up
|
2014-12-31 10:20:29 -08:00 |
|
Mark Otto
|
b873edce8e
|
tweak and improve jumbotrons
|
2014-12-31 10:20:12 -08:00 |
|