rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Code Issues Actions Packages Releases Activity
14,354 Commits 108 Branches 89 Tags 547 MiB
cd64975f48
Commit Graph

14354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vicary Archangel
c0f931d050 Multiple input-group-addon support 
1. Invert `:first-child` into `:not(:last-child)` and vice versa
2. Remove double border at the left of `.form-control`
3. Shifts negative margins of `.btn` and `.btn-group` to retain
rightmost border when using at the left of `.form-control`.
 2015-12-09 16:40:32 +08:00
Chris Rebert
2f257445c3 Merge pull request #18486 from vsn4ik/v4-unnecessary-style-aliging-images 
Remove unnecessary style attribyte on docs (aligning-images)
 2015-12-08 18:51:36 -08:00
Chris Rebert
771cb5a0a1 v4's Gruntfile doesn't currently use htmlmin 
[ci skip]
 2015-12-08 18:26:43 -08:00
Chris Rebert
efc089a79b Merge pull request #18483 from jdorfman/v4-dev-jd 
Updated CDN URLs in v4-dev docs
 2015-12-08 18:19:14 -08:00
Chris Rebert
31d4139a74 Update version numbers using npm script 
Errata from:
* 8ce5da3026
* 5d3144e8fb
which missed a few numbers.

[skip sauce]
[skip validator]
 2015-12-08 18:16:47 -08:00
Chris Rebert
cc8600a287 Merge pull request #18489 from vsn4ik/v4-remove-grid-scss-example-default-flag 
Remove !default Scss flag in docs grid example
 2015-12-08 16:07:12 -08:00
vsn4ik
f3aaccd46f Remove !default Scss flag in docs grid example 2015-12-09 00:20:37 +03:00
vsn4ik
fd2a3825aa Remove unnecessary style attribyte on docs (aligning-images) 2015-12-08 23:14:16 +03:00
Justin Dorfman
e2482cca98 Updated CDN URLs in v4-dev docs 2015-12-08 11:04:36 -08:00
Mark Otto
9a35ccbf73 derp, wrong highlight syntax 2015-12-08 10:23:22 -08:00
Mark Otto
d244ba42e1 Merge pull request #18481 from lachlanjc/patch-1 
Fix utility page code example Markdown
 2015-12-08 10:18:01 -08:00
Lachlan Campbell
9f31574f17 add extra line before spacing utilities example 2015-12-08 13:11:42 -05:00
Mark Otto
48938155eb Merge pull request #18479 from twbs/v4a2 
v4 alpha 2
 2015-12-08 09:51:50 -08:00
Mark Otto
d1bb7639c5 Merge branch 'v4-dev' into v4a2 2015-12-08 09:51:02 -08:00
Mark Otto
7f595a3bde missed a grunt i think 2015-12-08 09:50:43 -08:00
Mark Otto
8ce5da3026 bump more versions in config 2015-12-08 09:38:58 -08:00
Mark Otto
ef00fa0a6d grunt after version bump 2015-12-08 09:37:12 -08:00
Mark Otto
5d3144e8fb manually bump versions because npm script wasn't working for me 2015-12-08 09:36:08 -08:00
Chris Rebert
3b2be4701f Update docs for spacing utilities themselves to account for #18185 
/fyi @mdo There might be prettier/better ways of explaining these,
        but for the sake of having accurate docs for tomorrow,
        this should do in a pinch.

[skip sauce]
 2015-12-08 04:13:15 -08:00
Alexandr Kondrashov
c4c9e1959f Fix size of validation feedback icons 2015-12-08 14:54:37 +03:00
Chris Rebert
85032786c3 Update examples to account for #18185 
[skip sauce]
 2015-12-08 03:41:51 -08:00
Chris Rebert
c5a3e897d6 Regenerate dist/css/bootstrap.css for diffing purposes 
[skip sauce]
[skip validator]
 2015-12-08 01:51:49 -08:00
Chris Rebert
c1c1b3885d Remove useless .col-*-offset-12 and .col-xs-offset-0 classes 
Fixes #18036

[skip sauce]
[skip validator]
 2015-12-08 01:50:42 -08:00
Chris Rebert
6faa260f84 Merge pull request #18185 from twbs/fix-18129 
Refactor _utilities-spacing.scss
 2015-12-08 01:33:03 -08:00
Chris Rebert
1861b05b5f Rename 2 navbar variables to comply with updated naming convention 
$navbar-padding-horizontal => $navbar-padding-x
$navbar-padding-vertical   => $navbar-padding-y

[skip sauce]
[skip validator]
 2015-12-08 01:30:23 -08:00
Chris Rebert
0330d4acc2 Introduce $btn-block-spacing-y variable 
[skip sauce]
 2015-12-08 01:14:09 -08:00
Chris Rebert
6798485323 Introduce $card-deck-margin variable 
[skip sauce]
[skip validator]
 2015-12-08 01:13:37 -08:00
Chris Rebert
de9ad37c5d Introduce $nav-item-margin variable 
[skip sauce]
 2015-12-08 01:12:57 -08:00
Mark Otto
223e3505ce Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-12-08 01:08:48 -08:00
Chris Rebert
c7851ed20c Regenerate dist/css/bootstrap.css for diffing purposes 
[skip validator]
[skip sauce]
 2015-12-08 01:08:03 -08:00
Chris Rebert
5871be0ce6 Refactor _utilities-spacing.scss; fixes #18129 2015-12-08 01:08:03 -08:00
Mark Otto
af8efad583 grunt 2015-12-08 01:07:14 -08:00
Chris Rebert
8d4f5c1c12 Make SCSS Lint happy 
[skip sauce]
[skip validator]
 2015-12-08 01:06:52 -08:00
Mark Otto
35389f46df order 2015-12-08 01:06:23 -08:00
Mark Otto
5073d07a47 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-12-08 00:49:42 -08:00
Mark Otto
ac5be12f24 unfuck that border from rem to px 2015-12-08 00:49:31 -08:00
Chris Rebert
4e6e3860a6 docs/components/navbar.md: Nitpick phrasing 
[ci skip]
 2015-12-08 00:36:42 -08:00
Mark Otto
8fa5fb2857 fixes #17887: restore hover/focus for cover nav 2015-12-08 00:20:43 -08:00
Mark Otto
11c287d1d7 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-12-08 00:16:56 -08:00
Mark Otto
60ad55b8f7 fixes #17776 2015-12-08 00:16:46 -08:00
Mark Otto
9c55815898 Merge pull request #17930 from zalog/patch-12 
v4 - .c-select shouldn't inherit white text color
 2015-12-08 00:05:52 -08:00
Mark Otto
46fa32e397 Merge pull request #17946 from supergibbs/NuGet_badge_v4 
Add NuGet badge
 2015-12-08 00:05:31 -08:00
Mark Otto
1132e0c11d Merge pull request #17952 from supergibbs/NuGet_Support 
Add NuGet support
 2015-12-08 00:04:05 -08:00
Chris Rebert
8b0d737a56 scss/_pagination.scss: Reassert #18257 
[skip sauce]
 2015-12-08 00:01:58 -08:00
Mark Otto
30aad997d0 tweak comment 2015-12-07 23:52:10 -08:00
Mark Otto
834ac49eee Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-12-07 23:50:17 -08:00
Mark Otto
4fc721fe4a grunt 2015-12-07 23:49:29 -08:00
Chris Rebert
bac09b7767 Add entry for pagination component changes to v4 migration guide 
Refs #18110

[skip sauce]
 2015-12-07 23:49:07 -08:00
Mark Otto
96dd9c57d2 Merge branch 'bassjobsen-patch-6' into v4-dev 2015-12-07 23:48:41 -08:00
Mark Otto
9e6d1c1ec6 Merge branch 'patch-6' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-6 2015-12-07 23:48:33 -08:00