mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Merge branch 'customizable-grid-gutters-per-breakpoint' of https://github.com/pixelbandito/bootstrap into pixelbandito-customizable-grid-gutters-per-breakpoint

Browse Source
This commit is contained in:
Mark Otto
2016-10-02 19:10:25 -07:00
parent 06d95cbba7 0ef64d89f7
commit 49153ecf4f
8 changed files with 87 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/scss/_component-examples.scss
+1 -1
View File
@@ -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) {
docs/assets/scss/_featurettes.scss
+2 -2
View File
@@ -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);
}
}
}
docs/assets/scss/_masthead.scss
+1 -1
View File
@@ -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%));
docs/assets/scss/_page-header.scss
+1 -1
View File
@@ -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;