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

13668 Commits

Author SHA1 Message Date
Chris Rebert
6d591edcb7 .dropdown-menu: Swap color and font-size property order to make SCSS Lint happy 2015-11-13 00:21:43 -08:00
Chris Rebert
2315bc6052 scss/_nav.scss: Remove trailing whitespace
[ci skip]
2015-11-13 00:20:03 -08:00
Chris Rebert
98ec749117 Swap margin-right and margin-left ordering in .dropdown-toggle::after to make SCSS Lint happy
[ci skip]
2015-11-13 00:19:19 -08:00
Chris Rebert
0cdb204867 scss/_card.scss: Remove trailing whitespace
[ci skip]
2015-11-13 00:17:25 -08:00
Mark Otto
763cec82fb Merge pull request #18089 from almirsarajcic/v4-dev
Rename .help-block to .text-help
2015-11-12 23:57:22 -08:00
Mark Otto
0aec084cae Merge pull request #18093 from AndersMad/patch-1
Card fix static -> variable border radius
2015-11-12 23:56:45 -08:00
Mark Otto
cbb5e25482 Merge pull request #17939 from chrisbell08/#17895_alert_border_width
#17895 Added $alert-border-width that defaults to $border-width
2015-11-12 23:50:51 -08:00
Chris Rebert
5abd4e0142 Ports c256aca13c to v4
Refs #15947, #17542

[ci skip]
2015-11-12 23:47:13 -08:00
Chris Rebert
920f7fd695 Revert "Drop cursor pointer for button role"
This reverts commit 61067304cd.

The normalize.css pull request (https://github.com/necolas/normalize.css/pull/379 )
was REJECTED, *NOT* merged!
2015-11-12 23:44:29 -08:00
Mark Otto
73b02c833d Merge pull request #17954 from risan/patch-1
[V4] Fixes #17953: Add migration docs of .btn-default removal
2015-11-12 23:43:32 -08:00
Mark Otto
f25d709025 Merge pull request #18061 from mathisonian/patch-1
remove bro from comment
2015-11-12 23:37:02 -08:00
Mark Otto
92cdb0b562 Merge pull request #17808 from alberto/fix-17781
fixes #17781: Add migration docs note that .control-label is gone in v4
2015-11-12 23:36:37 -08:00
Mark Otto
97b0d37732 space 2015-11-12 23:33:15 -08:00
Mark Otto
d18cc5f77b Merge branch 'reboot-cursor' of https://github.com/flexbox/bootstrap into flexbox-reboot-cursor 2015-11-12 23:31:19 -08:00
Mark Otto
d917f474f4 Merge pull request #17708 from biokillos/feature/add-variable-for-card-link-hover-state
Add variable for card-link hover state
2015-11-12 23:29:48 -08:00
Mark Otto
99219bac55 Merge pull request #17317 from dmbaughman/v4-media-breakpoint-between
v4 - Added  mixin to handle media queries that span multiple breakpoints
2015-11-12 23:27:16 -08:00
Mark Otto
6a526d4890 Merge pull request #17596 from neilhem/remove-fallback-colors
remove not used popover fallback variables
2015-11-12 23:23:53 -08:00
Mark Otto
1c9b773293 Merge pull request #17733 from chrisbell08/v4
Fix for Issue #17711 - Added clearfix mixin to the nav-pills class.
2015-11-12 23:20:35 -08:00
Mark Otto
11cc63b511 Merge pull request #17545 from rbrs/disable-autocomplete
v4 - disabled browser autocomplete on search input in docs
2015-11-12 23:17:22 -08:00
Mark Otto
ffa3b7c296 grunt 2015-11-12 23:15:38 -08:00
Mark Otto
9f66e7309c fix broke shit, ugh my bad 2015-11-12 23:15:31 -08:00
Chris Rebert
7757c46853 README: Tweak tooling setup link
Fixup #17505
[skip sauce]
2015-11-12 22:53:25 -08:00
Chris Rebert
02e8517916 Merge pull request #17505 from hkdobrev/v4-bundle-instructions
Recommend using bundle for running docs locally
[skip sauce]
2015-11-12 22:50:47 -08:00
Mark Otto
114a2d913e Merge pull request #17467 from Corbzilla/v4-dev-remove-holderjs-docs
V4 remove holderjs references from carousel and card docs
2015-11-12 22:45:53 -08:00
Mark Otto
6fd1c80d37 Merge pull request #17153 from kkirsche/patch-17
v4 — Change .has-error to .has-danger for uniformity.
2015-11-12 22:20:07 -08:00
Mark Otto
c1af4aa227 Merge pull request #17277 from kkirsche/patch-5
v4 — Use the body color for dropdown menu text in navbars
2015-11-12 22:17:02 -08:00
Mark Otto
fd8cd7ea88 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-11-12 22:15:09 -08:00
O'meid
677b7bd1c0 scss: move Figures from _type to _images 2015-11-12 22:13:13 -08:00
Mark Otto
f29eb4d213 Merge pull request #17241 from tagliala/font-size-sm-fix
v4: Change the default value of $font-size-sm to .875rem
2015-11-12 22:07:06 -08:00
Mark Otto
078c7cac8d manually pull in #17212 from @azmenak 2015-11-12 22:02:35 -08:00
Mark Otto
edce1b509a Merge pull request #17204 from petetnt/petetnt/v4-dev-patch-2
modal.md - wrapped rows to a .container-fluid, added .bd-example-row...
2015-11-12 21:36:45 -08:00
Mark Otto
c28c380dd5 Merge pull request #17138 from kkirsche/patch-11
Provide V4 JSBin template in CONTRIBUTING.md
2015-11-12 21:33:11 -08:00
Mark Otto
8d46755f99 Merge pull request #17137 from kkirsche/patch-10
v4: Dropdown caret is not horizontally alligned
2015-11-12 21:32:22 -08:00
Chris Rebert
87b11578c3 Merge pull request #18235 from twbs/fix-18230
Move [hidden] style from _utilities.scss to _reboot.scss
2015-11-12 19:21:40 -08:00
Chris Rebert
be5e223177 Move [hidden] style from _utilities.scss to _reboot.scss; fixes #18230
[skip sauce]
2015-11-12 19:15:54 -08:00
Chris Rebert
fcbf49ae0a Merge pull request #18109 from twbs/color-utils-important
Add !important to text and background color utility classes
2015-11-12 17:02:56 -08:00
Chris Rebert
4f49654196 Merge pull request #18033 from twbs/invisible-important
Add !important to .invisible (visibility:hidden) utility class
2015-11-12 17:02:10 -08:00
Chris Rebert
019069a8b3 Merge pull request #18032 from twbs/text-transform-important
Add !important to text transform utility classes
2015-11-12 17:01:40 -08:00
Chris Rebert
8e34b21dab Merge pull request #18229 from twbs/fix-18224
Exclude unnecessary old Node.js combos from Travis CI build matrix
2015-11-12 01:09:59 -08:00
Chris Rebert
cfbf036e84 Exclude unnecessary old Node.js combos from Travis CI build matrix; fixes #18224 2015-11-12 00:58:16 -08:00
XhmikosR
7b19dfc06f Travis CI: Use Ruby 2.2.
Fixes #18225.

[skip sauce]
2015-11-12 09:18:34 +02:00
XhmikosR
f1223195b3 Run grunt.
[ci skip]
2015-11-12 09:17:52 +02:00
XhmikosR
5a26a13868 Downgrade grunt-contrib-uglify to fix the comments issue.
Fixes #18224.

[sauce skip]
2015-11-12 09:17:26 +02:00
Chris Rebert
f4147c4da9 Merge pull request #17652 from twbs/v4-dev-xmr-node-4
Travis CI: test against Node.js 4 & stable
2015-11-11 17:03:45 -08:00
Chris Rebert
cfd9c30eed Merge pull request #18182 from twbs/img-fluid-doc
Add comments explaining why we don't make `<img>`s responsive by default
2015-11-10 23:28:02 -08:00
Chris Rebert
91005397b3 Merge pull request #18094 from twbs/util-resp-comment
scss/_utilities-responsive.scss: Fix outdated comment heading
2015-11-10 23:26:46 -08:00
XhmikosR
bf92923e9f Travis CI: test against node.js "4" and "stable". 2015-11-11 09:02:18 +02:00
XhmikosR
a291d79ecb Run grunt.
[ci skip]
2015-11-11 09:00:47 +02:00
XhmikosR
a8c04056fc Update devDependencies.
[sauce skip]
2015-11-11 09:00:19 +02:00
Chris Rebert
c831e83ec8 Merge pull request #18215 from twbs/hN-simplify
Consolidate redundant heading style declaration
2015-11-10 21:25:44 -08:00