diff options
| author | Mark Otto <[email protected]> | 2016-10-02 19:26:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-02 19:26:29 -0700 |
| commit | 1db3586dc0798485d5ca82a9b8de477e82ba351c (patch) | |
| tree | 721b7f5c2e901c100e758b8b1ad7c2f820124fbc /docs/assets | |
| parent | d11c93341f392d654b2cb5cbefd399bbf1d81f00 (diff) | |
| parent | 4699fd4b4076f325652a5f51cd0c734d900faac3 (diff) | |
| download | bootstrap-1db3586dc0798485d5ca82a9b8de477e82ba351c.tar.xz bootstrap-1db3586dc0798485d5ca82a9b8de477e82ba351c.zip | |
Merge branch 'v4-dev' into v4-navbars
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/brand/bootstrap-social-logo.png | bin | 0 -> 46176 bytes | |||
| -rw-r--r-- | docs/assets/brand/bootstrap-social.png | bin | 0 -> 337454 bytes | |||
| -rw-r--r-- | docs/assets/scss/_component-examples.scss | 2 | ||||
| -rw-r--r-- | docs/assets/scss/_featurettes.scss | 4 | ||||
| -rw-r--r-- | docs/assets/scss/_masthead.scss | 2 | ||||
| -rw-r--r-- | docs/assets/scss/_page-header.scss | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/docs/assets/brand/bootstrap-social-logo.png b/docs/assets/brand/bootstrap-social-logo.png Binary files differnew file mode 100644 index 000000000..a2f0168c5 --- /dev/null +++ b/docs/assets/brand/bootstrap-social-logo.png diff --git a/docs/assets/brand/bootstrap-social.png b/docs/assets/brand/bootstrap-social.png Binary files differnew file mode 100644 index 000000000..cfac9c5fc --- /dev/null +++ b/docs/assets/brand/bootstrap-social.png diff --git a/docs/assets/scss/_component-examples.scss b/docs/assets/scss/_component-examples.scss index 1ab49218c..a429b9aae 100644 --- a/docs/assets/scss/_component-examples.scss +++ b/docs/assets/scss/_component-examples.scss @@ -324,7 +324,7 @@ .highlight { padding: 1rem; - margin: 1rem (-$grid-gutter-width / 2); + margin: 1rem (-$grid-gutter-width-base / 2); background-color: #f7f7f9; @include media-breakpoint-up(sm) { diff --git a/docs/assets/scss/_featurettes.scss b/docs/assets/scss/_featurettes.scss index a74834387..03119ce50 100644 --- a/docs/assets/scss/_featurettes.scss +++ b/docs/assets/scss/_featurettes.scss @@ -26,10 +26,10 @@ @include media-breakpoint-up(md) { .col-sm-6:first-child { - padding-right: ($grid-gutter-width * 1.5); + padding-right: ($grid-gutter-width-base * 1.5); }; .col-sm-6:last-child { - padding-left: ($grid-gutter-width * 1.5); + padding-left: ($grid-gutter-width-base * 1.5); } } } diff --git a/docs/assets/scss/_masthead.scss b/docs/assets/scss/_masthead.scss index f0ebe9363..aa59ffbfc 100644 --- a/docs/assets/scss/_masthead.scss +++ b/docs/assets/scss/_masthead.scss @@ -2,7 +2,7 @@ .bd-masthead { position: relative; - padding: 3rem ($grid-gutter-width / 2) 2rem; + padding: 3rem ($grid-gutter-width-base / 2) 2rem; color: $bd-purple-light; text-align: center; background-image: linear-gradient(135deg, darken($bd-purple, 20%), $bd-purple, lighten(saturate($bd-purple, 5%), 15%)); diff --git a/docs/assets/scss/_page-header.scss b/docs/assets/scss/_page-header.scss index 457d3fbef..e51459903 100644 --- a/docs/assets/scss/_page-header.scss +++ b/docs/assets/scss/_page-header.scss @@ -1,7 +1,7 @@ // scss-lint:disable ImportantRule .bd-pageheader { - padding: 2rem ($grid-gutter-width / 2); + padding: 2rem ($grid-gutter-width-base / 2); margin-bottom: 1.5rem; color: $bd-purple-light; text-align: center; |
