Commit Graph

11298 Commits

Author SHA1 Message Date
Chris Rebert
4484700d10 Merge pull request #15452 from twbs/bump-load-grunt-tasks
bump load-grunt-tasks to ~2.0.0
2014-12-28 18:50:51 -08:00
Chris Rebert
6099bfdea8 update shrinkwrap
[skip sauce]
[skip validator]
2014-12-28 18:45:56 -08:00
Chris Rebert
93cd02cd29 bump load-grunt-tasks to ~2.0.0 2014-12-28 18:43:47 -08:00
Chris Rebert
688780eb07 Merge pull request #15451 from twbs/bump-remarkable
bump remarkable to ~1.6.0
2014-12-28 18:40:44 -08:00
Chris Rebert
952f7e9a4e update shrinkwrap 2014-12-28 18:32:02 -08:00
Chris Rebert
2879049163 bump remarkable to ~1.6.0 2014-12-28 18:25:49 -08:00
Chris Rebert
a1ce6a1968 Merge pull request #21 from twbs/deprecated-tooltip-placements
Remove deprecated tooltip placements
2014-12-26 12:55:08 -08:00
Mark Otto
489f2bc1fa no results in search form accounted for 2014-12-25 22:40:25 -08:00
Mark Otto
7e25a958a2 sidenav for custom forms 2014-12-25 17:50:41 -08:00
Mark Otto
b92534c632 improve code quality on custom forms 2014-12-25 15:40:24 -08:00
Mark Otto
dacac2ab72 select menu custom form element 2014-12-24 21:48:49 -08:00
Mark Otto
57d15cb4f8 add more explanation text 2014-12-24 17:00:43 -08:00
Mark Otto
cd60cf3386 custom forms: checkbox and radio stacked option 2014-12-24 15:45:37 -08:00
Gleb Mazovetskiy
556758f3d3 Merge pull request #48 from twbs/breakpoints-min
Automate breakpoints
2014-12-24 22:27:39 +02: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
4d9aa90c8e Merge pull request #17 from twbs/test-with-two-sasses
Also support Ruby Sass
2014-12-24 22:22:39 +02:00
Gleb Mazovetskiy
c0c16edc41 Update styles for Ruby Sass compat 2014-12-24 22:22:15 +02:00
Gleb Mazovetskiy
0d96695f5e Docs: Use another Sass compiler 2014-12-24 22:21:39 +02:00
Gleb Mazovetskiy
8a51daf280 Compile with Ruby Sass or libsass.
* Separate configs for libsass and sass.
* Sass compiler selected based on `process.env.TWBS_SASS`.
* Travis:
  * Use Gemfile to manage ruby dependencies.
  * Run core tests with both Sass compilers.
  * Only install/cache ruby gems required by the test subset.
* Grunt: `update-gemfile-lock` task a la `update-shrinkwrap`.
2014-12-24 22:21:39 +02:00
Mark Otto
e500a9a354 some cleanup 2014-12-24 04:47:08 -08:00
Mark Otto
18e08e777b add custom forms, stub out examples for radios and checkboxes 2014-12-24 04:13:23 -08:00
Mark Otto
e1bb907050 rearrange contents docs--type, tables, images, forms, etc--into own docs section 2014-12-24 03:26:51 -08:00
Mark Otto
73e59c26e6 basic docs search 2014-12-24 02:44:38 -08:00
Mark Otto
952be04cb0 grunt 2014-12-23 22:57:03 -08:00
Mark Otto
6011b4678b rearrange some docs css 2014-12-23 22:56:45 -08:00
Mark Otto
b500713dd2 missed an end tag 2014-12-23 14:11:10 -08:00
Mark Otto
b67b2c7f49 fix up helpers docs again for .invisible and [hidden] 2014-12-23 14:00:34 -08:00
Mark Otto
6b394ab067 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
	docs/components/helpers.md
	scss/_utilities.scss
2014-12-23 13:59:26 -08:00
Mark Otto
1f5a75e2d7 increase spacing in docs h2s 2014-12-23 13:56:11 -08:00
Mark Otto
ca53c93f3d no need to mention jquery in the layout scaffolding docs 2014-12-23 13:26:37 -08:00
Mark Otto
e63a0acd3b fix some getting started links 2014-12-23 13:25:59 -08:00
Mark Otto
0972c64e7a fix sidenav links 2014-12-23 13:23:03 -08:00
Mark Otto
491503e4ae audit helpers docs: fix mixins formatting for scss conversion 2014-12-23 04:53:19 -08:00
Mark Otto
dfb6a679d2 audit helpers docs: quick floats 2014-12-23 04:40:42 -08:00
Mark Otto
9aa8239f88 add some utilities docs for new hidden and show changes 2014-12-23 04:28:01 -08:00
Mark Otto
f9aec74124 add [hidden] utility for hiding any html element (see #15274 for more context) 2014-12-23 04:10:59 -08:00
Mark Otto
2b16cb921c make some notes for myself 2014-12-23 03:57:55 -08:00
Mark Otto
5e102e2600 Merge pull request #50 from twbs/disabled-pseudo
use :disabled pseudo-class instead of [disabled] attribute
2014-12-22 20:13:09 -08:00
Mark Otto
c14823bd51 Merge pull request #53 from twbs/firefox-placeholder-opacity
Re-add Firefox placeholder opacity workaround
2014-12-22 20:11:54 -08:00
Mark Otto
c59ba4995c Merge pull request #45 from twbs/bye-hidden
Remove .hidden and .show classes
2014-12-22 20:11:04 -08:00
Mark Otto
d44a1f24bf Merge pull request #51 from twbs/old-firefox-device-pixel-ratio
Remove min--moz-device-pixel-ratio
2014-12-22 20:06:58 -08:00
Mark Otto
977646d7a0 grunt 2014-12-22 19:48:48 -08:00
Mark Otto
d06dcd8431 Merge pull request #27 from twbs/autoprefixer-bump-ios-safari
bump min iOS in Autoprefixer config to v7
2014-12-22 19:48:40 -08:00
Mark Otto
230294a63b Merge pull request #47 from twbs/migration-catch-up
Migration guide catch up
2014-12-22 19:42:37 -08:00
Mark Otto
b615bd938b Merge branch 'master' of https://github.com/twbs/bootstrap
Conflicts:
	dist/css/bootstrap.css.map
2014-12-22 19:30:51 -08:00
Mark Otto
c41970c579 Fixes #15422: Alternate fix for temporal input sizing in input groups 2014-12-22 19:28:29 -08:00
Bootstrap's Grunt bot
3668bde098 automatic grunt dist 2014-12-23 03:20:44 +00:00
Mark Otto
c4a23cc040 grunt 2014-12-22 19:18:26 -08:00
Chris Rebert
5e8dd7d438 Merge pull request #15428 from twbs/browser-bugs
add/update/summarize browser bug refs in Less comments
2014-12-22 19:10:23 -08:00
Mark Otto
fa08c932cd Merge pull request #15426 from twbs/hide-holder
Remove holder.js references from syntax-highlighted example HTML
2014-12-22 19:03:28 -08:00