0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-05 17:24:20 +01:00
Commit Graph

2647 Commits

Author SHA1 Message Date
Thomas McDonald
d8acb36777 fix breadcrumbs libsass content 2015-08-12 22:14:58 -07:00
Mark Otto
faacbdb49f Remove .help-block entirely
- Fixes #13267 somewhat.
- Instead of a single, block-level class, let's use a combination of existing elements and classes.
- For block-level help text, use p.text-muted.
- For inline-level help text, use span.text-muted or small.text-muted.
2015-08-12 22:14:31 -07:00
Mark Otto
5e928c7c2b Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-12 21:16:56 -07:00
Mark Otto
699f307112 fix fat's broke js... jk it was my shitty css 2015-08-12 21:14:59 -07:00
Thomas McDonald
1d631e6ca3 remove .badge class from buttons 2015-08-12 21:07:41 -07:00
Mark Otto
b1a74195c8 simpler type, docs callout for reproducing the v3 style headings and small text 2015-08-12 20:45:21 -07:00
Mark Otto
314161cb17 remove hella vars from the jumbotron 2015-08-12 20:28:46 -07:00
Mark Otto
786b1682a5 small vars change 2015-08-12 18:22:02 -07:00
Mark Otto
a90f6c7093 reorder variables, rename -color to -color 2015-08-10 23:38:41 -07:00
Mark Otto
67765587d9 no more use for that 2015-08-10 23:30:13 -07:00
Mark Otto
8c173cd4f8 remove unused badge vars 2015-08-10 23:29:54 -07:00
Mark Otto
c871e4c130 clarify comment 2015-08-10 23:29:36 -07:00
Mark Otto
8e0324362e remove unused variable 2015-08-10 23:29:04 -07:00
Mark Otto
d7f4985639 addresses #14217, add responsive text alignment classes 2015-08-10 22:47:08 -07:00
Mark Otto
121615ceba dropdown fixes and dropdown docs tweaks 2015-08-10 16:31:28 -07:00
Mark Otto
743717fbce really fix those outline buttons 2015-08-09 23:45:36 -07:00
Mark Otto
eaeee93fa3 docs rearrange 2015-08-09 23:38:16 -07:00
Mark Otto
e7b1123310 update button borders to match bgs for easier outline button styling 2015-08-09 22:49:21 -07:00
Mark Otto
68e4d897ba shoutout to outline buttons 2015-08-09 22:48:48 -07:00
Mark Otto
08d6dc5b71 add basic figure support 2015-08-09 21:42:47 -07:00
Mark Otto
7a50a2cbe8 introduce display heading classes 2015-08-09 21:17:27 -07:00
Mark Otto
7c3f5b6d59 rewrite some forms docs, use new validation styles and icons 2015-08-08 14:15:09 -07:00
Mark Otto
cdb06e544c fix list group button variation by including text-align inherit and a width 100% 2015-08-05 23:49:39 -07:00
Mark Otto
f534cabc7e wider horizontal padding 2015-08-05 23:14:41 -07:00
Mark Otto
97bcfb9e7f rip badges 2015-08-05 00:48:42 -07:00
Mark Otto
9330c4a947 Run just as fast as I can
To the middle of nowhere
To the middle of my frustrated fears
And I swear you're just like a pill
Instead of makin' me better,
You keep makin' me ill
You keep makin' me ill

adds .label-pill to replace .badge
2015-08-05 00:45:41 -07:00
Mark Otto
d80f26fe49 unaffix sidebar and simplify styles of docs side nav to be more like v3 2015-08-05 00:38:36 -07:00
Mark Otto
0156fc1c9d mathematical! 2015-08-05 00:16:00 -07:00
Mark Otto
1ddc3f5e21 Merge branch 'master' into v4m 2015-08-04 22:29:45 -07:00
Mark Otto
b451104bcd use mixin on input transition 2015-07-03 18:35:53 -07:00
Mark Otto
4665b9dd6f Add new variable for -box-shadow 2015-07-03 18:35:46 -07:00
Mark Otto
932ac79611 remove -darker 2015-07-03 18:33:31 -07:00
Mark Otto
18da568b8b rewrite some navbar stuff, clean out some commented out code 2015-06-22 23:24:55 -07:00
Mark Otto
ed42fc9b76 line-height-base to line-height var 2015-06-22 23:24:32 -07:00
Mark Otto
03a5ff6b82 remove commented out var 2015-06-22 22:52:14 -07:00
Mark Otto
057f82f8c3 indentation 2015-06-22 22:52:09 -07:00
Mark Otto
acca337ced Remove var 2015-06-22 19:02:30 -07:00
Mark Otto
75cf69a1ab drop more -base, clean up var spacing 2015-06-22 18:57:56 -07:00
Mark Otto
0ca9b21c34 drop the base (hahaha), no but seriously drop the -base from our vars since it's cleaner 2015-06-22 18:53:04 -07:00
Mark Otto
d703396bce comment 2015-06-22 17:37:52 -07:00
Mark Otto
4565281df3 rename -horizontal and -vertical vars to -x and -y for consistency 2015-06-22 16:33:17 -07:00
Mark Otto
ce9c0f0125 tweak small forms, small inputs; trying to equalize their rendered dimensions 2015-06-22 16:30:31 -07:00
Mark Otto
bc29c016b7 Merge branch 'v4' into v4_builds 2015-06-19 16:26:33 -07:00
Mark Otto
eaa67a82d3 fix scss linting 2015-06-19 00:14:36 -07:00
Mark Otto
930ed8df32 nuke unused .csslintrc 2015-06-19 00:05:40 -07:00
Mark Otto
e4d72c914d fix vars, grunt that shit 2015-06-19 00:01:57 -07:00
Mark Otto
ecc7d9ba26 fix placement of mixin 2015-06-19 00:00:21 -07:00
Mark Otto
169d2a4a78 Merge branch 'master' into v4 2015-06-18 23:56:43 -07:00
Mark Otto
df2ca92d77 Use percentages in responsive embed modifiers
- Credit: @adammacias
- Originally proposed in #16499 with previous commit
2015-06-18 16:03:48 -07:00
Mark Otto
331b8d2250 Add 21x9 responsive embed modifier
- Credit: @adammacias
- Fixes #16499
2015-06-18 16:01:52 -07:00
Mark Otto
8410afe0e1 Create new stylesheets for optional builds and add them to Gruntfile tasks 2015-06-18 10:19:50 -07:00
Mark Otto
840938f09d tweak code styles 2015-06-09 16:28:17 -07:00
Mark Otto
9863eb75d2 move spacing utils to separate file, document them a bit 2015-06-01 01:19:02 -07:00
Mark Otto
97a6275e54 add updated scss lint yml file 2015-05-31 20:17:57 -07:00
Mark Otto
7783ef8fab remove utils from media alignment 2015-05-29 16:05:42 -07:00
Mark Otto
933639729f enforce line-height on badges at all times 2015-05-29 14:05:02 -07:00
Mark Otto
8e6df4325e cards update 2015-05-29 13:09:54 -07:00
Mark Otto
587f5f8efd clean up card styles. add new vars 2015-05-29 01:59:54 -07:00
Mark Otto
74d17ab7a0 rewrite much of cards and the docs 2015-05-28 14:07:34 -07:00
Mark Otto
e07cebc90e add flexbox variation for .card-group 2015-05-28 10:37:12 -07:00
Mark Otto
6e3d4331db new card sizing maybe 2015-05-27 19:00:11 -07:00
Mark Otto
4bc58b9a5a when using flexbox, don't add a clearfix
doing so fubars the grid column rounding (in safari at least) and causes layout problems
2015-05-27 17:37:22 -07:00
Mark Otto
663576a7ae Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css
2015-05-27 15:49:55 -07:00
Mark Otto
ddafee6ece disable flex to start 2015-05-22 22:33:45 -07:00
Chris Rebert
82c9038f20 Unquote to avoid NUL chars in the output CSS 2015-05-15 12:17:13 -07:00
Chris Rebert
62da5947a8 Permanent proper fix for dist-css
Bump mq4-hover-shim to ^0.2.0

Revert "fix dist css"
This reverts commit b12d4bfa9a.
2015-05-15 12:12:29 -07:00
fat
b12d4bfa9a fix dist css 2015-05-14 13:13:33 -07:00
fat
dbaffd43c0 Merge pull request #116 from twbs/fat-es6Alert
es6 - wip
2015-05-13 15:01:39 -07:00
fat
a58febf71a popover passing as well 2015-05-12 14:35:00 -07:00
fat
3452e8dc83 rewritten tooltip + tether integration and death to our positioner jank 2015-05-11 23:32:37 -07:00
Chris Rebert
ee33891e42 Merge pull request #60 from twbs/libsass-185
Remove libsass @media nesting bug workaround
2015-05-06 13:29:02 -07:00
Mark Otto
d31ec33908 Fix no-label checkboxes/radios
Because we use `position: absolute` on our inputs, when there’s no
label the `.checkbox` ends up having no computed height. To avoid
rendering errors when there’s no label text, we reset the `position` to
`static` for normal rendering.
2015-04-29 12:01:57 -07:00
Mark Otto
ed89be1f44 Remove $line-height-computed
We have it set to `1` right now just to avoid compilation errors, but
it’s been replaced everywhere with our new spacer classes anywho. We’ll
likely want to remap that var to custom component vars though (e.g.,
`$pagination-margin` instead of `$spacer-y`).
2015-04-29 12:00:11 -07:00
Mark Otto
7db7e59682 spacing 2015-04-29 11:49:41 -07:00
Mark Otto
b849be2edc rename media query var to match /cc @cvrebert 2015-04-29 11:49:25 -07:00
Mark Otto
95771f9658 clean up vars file a smidge 2015-04-29 11:48:58 -07:00
Mark Otto
47dfdc2880 darker secondary button border color 2015-04-29 11:42:38 -07:00
Mark Otto
a399d19dd3 add comments 2015-04-29 11:32:49 -07:00
Mark Otto
35f45bafed Merge pull request #113 from twbs/at-root-group
Wrap `@viewport` with `@at-root` for nested import support
2015-04-29 11:30:09 -07:00
Mark Otto
d9d351e2fe more flex grid stuff 2015-04-27 14:11:07 -07:00
Gleb Mazovetskiy
b832c3cb97 Wrap @viewport with @at-root for nested import
See https://github.com/twbs/bootstrap-sass/pull/805
2015-04-27 20:15:17 +01:00
Mark Otto
15692d5e5b flex variation for media 2015-04-27 01:50:38 -07:00
Mark Otto
391b62f968 stub out flexbox variation for input group 2015-04-27 01:43:30 -07:00
Mark Otto
9d4d6ef3a2 stub out flexbox grid variation via -flex 2015-04-27 01:43:14 -07:00
Mark Otto
28d8849216 remove some un-used grid class resets in input groups 2015-04-26 00:18:13 -07:00
Mark Otto
efd28a5e78 unnecessary comment 2015-04-26 00:14:27 -07:00
Mark Otto
219c4cbf87 remove another extend 2015-04-26 00:08:40 -07:00
Mark Otto
6489e19530 remove more old navbar styles 2015-04-26 00:07:37 -07:00
Mark Otto
b688fe822c remove the old navbar-form class 2015-04-26 00:06:45 -07:00
Mark Otto
7853a675f6 remove extends: navs and unstyled lists 2015-04-26 00:02:25 -07:00
Chris Rebert
78c18954a8 _reboot.scss: fix typo in comment 2015-04-23 16:27:03 -07:00
Mark Otto
1770df724e update input groups to use new form control size classes 2015-04-23 01:14:43 -07:00
Mark Otto
cc7c27dd71 drop .form-horizontal 2015-04-23 01:11:10 -07:00
Mark Otto
2cf5213c15 remove commented out code 2015-04-23 01:10:57 -07:00
Mark Otto
490294e68b Fix up some form docs styles, sizing, etc 2015-04-23 01:10:14 -07:00
Mark Otto
dc3abb5f12 Update labels and form grid examples 2015-04-23 00:51:39 -07:00
Mark Otto
209cdf33f9 update navbar and nav link values 2015-04-18 18:15:24 -07:00
Mark Otto
8f94078da8 New form control sizing, new navbar condensed variation, update nav and navbar spacing 2015-04-18 18:12:10 -07:00
Mark Otto
250c2200bf no more dl-horizontal offset or page-header vars 2015-04-18 11:53:10 -07:00
Mark Otto
35be16cffa remove legend vars as we no longer use them 2015-04-18 11:39:13 -07:00
Mark Otto
ac1ed746ef more comments and formatting clean up 2015-04-18 11:38:47 -07:00
Mark Otto
2237572e8b clean up commented out code in forms 2015-04-18 11:30:29 -07:00
Mark Otto
09886480e0 remove commented out code for auto aligning navbar dropdown menus 2015-04-18 11:17:42 -07:00
Mark Otto
ddf4867a5e comments and spacing 2015-04-18 11:17:32 -07:00
Mark Otto
49f874468b comments and spacing 2015-04-18 11:17:28 -07:00
Mark Otto
b88c05d564 clean up comments and spacing 2015-04-18 11:15:40 -07:00
Mark Otto
88a92e433d move abbr stuff for tooltip to reboot, clean up type scss 2015-04-18 11:13:45 -07:00
Mark Otto
bf085b1a02 delete the .page-header and its docs 2015-04-17 20:00:38 -07:00
Mark Otto
611a127a1e change the type scale a bit again 2015-04-17 16:49:48 -07:00
Mark Otto
bf5931b5ee massive rewrite of forms docs and some css 2015-04-17 16:02:41 -07:00
Mark Otto
7c1635cdb8 narrower borders to get closer to 1px everywhere 2015-04-17 00:44:36 -07:00
Mark Otto
7049a07444 More reboot work, commenting out things that have been moved over 2015-04-17 00:22:35 -07:00
Mark Otto
af9ab7b1a7 tweak the font-sizes for headings 2015-04-17 00:21:57 -07:00
Mark Otto
0ab1576ae2 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-04-16 18:54:17 -07:00
Mark Otto
605990400e collapsing navbar tools 2015-04-16 18:50:32 -07:00
Mark Otto
06c2862d25 start stubbing out a new reboot section and file 2015-04-16 18:39:45 -07:00
Mark Otto
7001dece8a edit comments a bit 2015-04-16 17:15:29 -07:00
Mark Otto
585f857e71 rename scaffolding to reboot 2015-04-16 17:12:19 -07:00
Mark Otto
36e4cd0287 Move .img- classes to new _images.scss; move hr to _type.scss 2015-04-16 17:10:47 -07:00
Mark Otto
cd3bc6a089 Merge pull request #101 from twbs/institutional-memory
Revert "Images are responsive by default"
2015-04-16 17:03:58 -07:00
Mark Otto
236a86502e fix spacer vars 2015-04-15 15:30:26 -07:00
Mark Otto
038d6f8061 more utilities 2015-04-14 01:01:30 -07:00
Mark Otto
8303b7b8c9 nuke shadows for now 2015-04-14 01:01:15 -07:00
Mark Otto
53a3ff74ca redo sidenav 2015-04-13 19:00:59 -07:00
Mark Otto
982c255c28 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-04-13 16:45:19 -07:00
Mark Otto
4fdd63a516 remove pre styles -- see #4547 2015-04-13 16:36:36 -07:00
Chris Rebert
2057124cf2 Merge pull request #105 from twbs/beautiful-colors
Print with all the colors of the wind
2015-04-13 10:34:30 -07:00
Chris Rebert
b9164b3690 Remove half-assed inclusion of link URLs (hrefs) when printing
* Relative URLs were output as-is, which is suboptimal or even confusing for end-users
* Ditto for fragment identifiers
* Outputting long URLs inline with prose isn't good UX

JavaScript could potentially help with this (e.g. http://alistapart.com/article/improvingprint).
However, we're not currently interested in trying to tackle the hard problem of fancy print stylesheets/views
(particularly given the level of cross-browser inconsistency when it comes to printing).
So let's just keep things simple, vanilla, and unsurprising,
which should also make it easy for others to add their own print fanciness on top of Bootstrap.
2015-04-11 00:24:27 -07:00
Chris Rebert
d8423c0590 Print with all the colors of the wind
Forcing black-and-white text & backgrounds is too harsh. Printing speed isn't everything.
Users or authors can easily enable grayscale themselves if need be.
2015-04-11 00:22:45 -07:00
Mark Otto
309264509d Remove grid sizing styles on tables 2015-03-30 18:11:43 -07:00
Mark Otto
6749e5509c rewrite table modifiers to use .table- prefix 2015-03-30 18:08:01 -07:00
Mark Otto
608be81a43 Fixes #13583: Move .sr-only and .sr-only-focusable to mixins, then use them to create classes in _utilities.scss 2015-03-30 17:36:00 -07:00
Mark Otto
ef0b88f6b3 fix order 2015-03-29 00:13:30 -07:00
Mark Otto
2f7bfb44c2 fixes 2015-03-29 00:12:19 -07:00
Mark Otto
58082cd83e Merge branch 'master' into v4
Conflicts:
	.gitignore
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_includes/components/navbar.html
	docs/_includes/components/progress-bars.html
	docs/_includes/css/grid.html
	docs/_includes/css/overview.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/third-party-support.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.html
	docs/_includes/nav/javascript.html
	docs/_includes/nav/main.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/dist/css/bootstrap-theme.css
	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/migration.html
	js/affix.js
	js/alert.js
	js/button.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tests/visual/modal.html
	js/tooltip.js
	less/component-animations.less
	less/jumbotron.less
	less/mixins/background-variant.less
	less/mixins/buttons.less
	less/mixins/responsive-visibility.less
	less/mixins/text-emphasis.less
	less/navbar.less
	less/navs.less
	less/scaffolding.less
	less/tooltip.less
	less/utilities.less
	less/variables.less
	package.json
	scss/_buttons.scss
	scss/_forms.scss
	scss/_modal.scss
2015-03-29 00:08:54 -07:00
Chris Rebert
763d77e210 Revert "Images are responsive by default"
This reverts commit d29f851e82.

Making <img>s responsive by-default without opt-in can severely break
third-party widgets such as Google Maps.
This was an acknowledged problem in Bootstrap v2
(see https://github.com/twbs/bootstrap/issues/1506 ) and was fixed in v3
by requiring the .img-responsive class for explicit opt-in
(see 09cdee2f03).
The situation hasn't really changed since then. The responsive-by-default
approach hasn't become any more suitable in the intervening time.

So let's avoid having this regress in v4. :-)
2015-03-28 04:06:22 -07:00
Mark Otto
d29f851e82 Images are responsive by default 2015-03-11 19:19:03 +00:00
Mark Otto
454cc55e31 remove justified button groups 2015-03-09 14:32:30 +00:00
Mark Otto
7dcd9c5d63 remove all customizer comments from variables file 2015-03-09 14:18:25 +00:00
Mark Otto
517977fca4 fix validation, run grunt dist 2015-03-01 14:11:22 -08:00
Mark Otto
c16fee5efd Merge branch 'master' into v4
Conflicts:
	.travis.yml
	Gruntfile.js
	bower.json
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	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/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/template.html
	docs/_includes/header.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/vendor/FileSaver.js
	docs/assets/js/vendor/autoprefixer.js
	docs/assets/js/vendor/uglify.min.js
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.min.js
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/narrow-jumbotron/narrow-jumbotron.css
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/theme/index.html
	grunt/configBridge.json
	js/affix.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tooltip.js
	less/badges.less
	less/glyphicons.less
	less/type.less
	less/variables.less
	package.json
	scss/_dropdown.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
2015-03-01 13:44:10 -08:00
Chris Rebert
f265fed3eb account for mq4-hover-shim's renaming & org move 2015-02-04 21:15:01 -08:00
Chris Rebert
fd13e33aa4 add $use-hover-media-query to control @media (hover:hover) usage 2015-01-22 11:39:57 -08:00
Chris Rebert
8e374bd010 put all :hover styles within @media (hover: hover) 2015-01-22 11:37:37 -08:00
Mark Otto
c0f4dcd38e Merge pull request #65 from twbs/precision
Use expressions for thirds to avoid precision issues
2015-01-21 18:34:19 -08:00
Chris Rebert
f6ef89d6c3 Use expressions for thirds to avoid precision issues 2015-01-21 15:11:25 -08:00
Chris Rebert
a1126ef655 Reorg @viewport now that we don't need to worry about non-responsive layouts 2015-01-21 13:05:14 -08:00
Chris Rebert
8ecdda0b35 Merge pull request #52 from twbs/normalize-figure
Let Normalize.css normalize <figure>'s margin
2015-01-19 16:58:01 -08:00
Mark Otto
6ba05d95d5 properly reset button.close styles 2015-01-19 16:11:39 -08:00
Mark Otto
dfdb99c989 fix broken breadcrumb divider 2015-01-19 16:08:48 -08:00
Mark Otto
3fe96e8f50 fix border color on inverse tables 2015-01-19 15:52:40 -08:00
Mark Otto
7440c38469 fix invalid css 2015-01-19 14:50:41 -08:00
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
Chris Rebert
1e5ce1e1a9 Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss"
This reverts commit 2916ac43ed.
This reverts commit 3d635f3079.
This reverts commit 61a2120557.

This change broke the Grunt build.
2015-01-18 15:00:58 -08: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
Chris Rebert
807a837afe Remove libsass @media nesting bug workaround
https://github.com/sass/libsass/issues/185 has been fixed.
Refs #48
2015-01-08 21:41:33 +00: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
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
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
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
00e6fae8fb Remove affix from docs & CSS; add migration guidance 2015-01-05 11:36:51 -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
a6053b573c override the box-shadows on active, checked, and indeterminate states 2015-01-01 12:13:24 -08:00
Mark Otto
401ace65f4 add indeterminate checkbox support 2015-01-01 12:01:55 -08:00
Chris Rebert
4e8f769d44 fix typo in comment 2015-01-01 00:02:21 -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
Mark Otto
49ac4ea0fa fix some source code for custom forms 2014-12-31 10:07:34 -08:00
Chris Rebert
b342de4fa3 Merge pull request #22 from twbs/alert-heading
Use .alert-heading instead of hardcoding <h4>
2014-12-29 16:04:00 -08:00
Chris Rebert
10f703f3b0 un-nest .alert-heading & .alert-link 2014-12-29 16:03:22 -08:00
Chris Rebert
a0edcc9225 refactor tooltip+popover CSS to decrease chaining+nesting 2014-12-29 12:37:11 -08:00
Chris Rebert
654d0dffc9 CSS: prefix .{right,left,top,bottom} with 'tooltip-'/'popover' 2014-12-29 12:34:09 -08:00
Chris Rebert
d46a12e601 remove now-redundant .popover parent in .popover-arrow selectors 2014-12-29 12:33:06 -08:00
Chris Rebert
6a5bc63649 rename .arrow => .popover-arrow 2014-12-29 12:33:06 -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
b92534c632 improve code quality on custom forms 2014-12-25 15:40:24 -08:00
Mark Otto
cd60cf3386 custom forms: checkbox and radio stacked option 2014-12-24 15:45:37 -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
c0c16edc41 Update styles for Ruby Sass compat 2014-12-24 22:22:15 +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
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
f9aec74124 add [hidden] utility for hiding any html element (see #15274 for more context) 2014-12-23 04:10:59 -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
Chris Rebert
96d273e28f Re-add Firefox placeholder opacity workaround 2014-12-22 17:28:09 -08:00
Chris Rebert
2d30babed4 Let Normalize.css normalize <figure>'s margin 2014-12-22 16:40:05 -08:00
Chris Rebert
4d8559f895 Remove min--moz-device-pixel-ratio
Bootstrap v4 no longer supports the old versions of Firefox affected by this typo bug.
2014-12-22 16:32:25 -08:00
Chris Rebert
5b03c9ad63 [disabled] => :disabled
:disabled is supported in IE9+ and all modern browsers
2014-12-22 13:34:02 -08:00
Gleb Mazovetskiy
e11208cc0b variables: fix fade-in 2014-12-20 16:37:43 +00:00
Chris Rebert
3f3db41173 Merge pull request #46 from twbs/trailing-whitespace
rm trailing whitespace
2014-12-19 18:36:38 -08:00
Chris Rebert
8250f41948 rm trailing whitespace 2014-12-19 18:35:58 -08:00
Mark Otto
547f16b58e rewrite all table styles to remove in selectors 2014-12-18 22:59:47 -08:00
Chris Rebert
07ef67da20 Remove .hidden and .show classes
.hidden is incompatible with jQuery's $(...).hide()
2014-12-18 19:07:22 -08:00
Chris Rebert
e95b854301 Merge pull request #42 from twbs/pager
rename .previous => .pager-prev , .next => .pager-next
2014-12-18 15:32:12 -08:00
Chris Rebert
c7ef5810e1 rename .item => .carousel-item 2014-12-17 18:44:55 -08:00
Chris Rebert
12c5473e7a rename .previous => .pager-prev , .next => .pager-next 2014-12-17 18:39:43 -08:00
Mark Otto
a534020f99 Merge pull request #33 from twbs/rm-android-workaround
Remove defunct `background-image: none` Firefox-on-Android workaround
2014-12-17 12:29:03 -08:00
Mark Otto
456f60da60 Merge pull request #35 from twbs/rm-chrome-osx-print-workaround
Remove defunct OS X Chrome <select> printing bug workaround
2014-12-17 12:28:42 -08:00
Mark Otto
dab0b97ce4 Merge pull request #29 from twbs/ie9-minimum-docs
Remove ancillary references to IE<9 in comments+docs
2014-12-17 12:28:20 -08:00
Chris Rebert
07c11f5e92 Remove defunct OS X Chrome <select> printing bug workaround
Chrome fixed the bug as of v37:
https://code.google.com/p/chromium/issues/detail?id=282918
2014-12-16 19:59:05 -08:00
Chris Rebert
0766ecab60 Remove defunct background-image: none Firefox-on-Android workaround
Mozilla fixed the bug circa Firefox 33-35:
    https://bugzilla.mozilla.org/show_bug.cgi?id=763671
Firefox 34 is the current version.
Firefox 35 should be current by the time Bootstrap v4 is released.
2014-12-16 19:41:11 -08:00
Chris Rebert
a8299b5b45 Remove ancillary references to IE<9 in comments+docs 2014-12-16 19:06:57 -08:00
Chris Rebert
d0c2a82ea8 Use .alert-heading instead of hardcoding <h4> 2014-12-15 17:49:35 -08:00
Chris Rebert
27dcdd357d remove deprecated tooltip placements 2014-12-15 17:30:37 -08: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
3737cb1d46 Use grid classes or mixins on .dl-horizontal, update docs to include it, removes auto truncate and makes .text-overflow mixin into a .text-truncate class and mixin combo for better granularity 2014-12-11 14:12: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
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
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
Chris Rebert
23aa0340df Apply !default to SCSS variables
Per @thomas-mcdonald
2014-12-09 16:24:05 -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
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
2d244d118b add default SCSS-Lint config 2014-12-08 19:00: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
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
ebfe358495 tweak label component padding 2014-12-06 00:18:11 -08: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
32878bca7f fix margin on tables 2014-12-04 15:25:57 -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
b811553147 new look for carousel example, convert to rems 2014-12-04 14:18:13 -08:00
Mark Otto
6fe75ead07 no need for .container's max-width: 100% since we use max-width now on all containers 2014-12-04 01:03:41 -08:00
Mark Otto
248e0e4059 fix heading margins 2014-12-04 01:03:23 -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
bafd0b057e fix broken textarea.form-control reported by @thomas-mcdonald 2014-12-03 11:23:53 -08:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -08:00