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