rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-26 23:54:23 +01:00
Code Issues Actions Packages Releases Activity

Ugh, Sass doesn't do extends across media, so we can't use placeholder here

Browse Source
This commit is contained in:
Mark Otto 2016-02-06 11:48:28 -08:00
parent 50e854affa
commit 15018a6d8a
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scss/_grid.scss
View File

@ -30,23 +30,10 @@
} }
} }
// Columns // Columns
// //
// Common styles for small and large grid columns // Common styles for small and large grid columns
@if $enable-grid-classes { @if $enable-grid-classes {
[class^="col"] {
position: relative;
min-height: 1px;
padding-right: ($grid-gutter-width / 2);
padding-left: ($grid-gutter-width / 2);
//
// // Allow `.col` to use an automatic, even width when flex mode is enabled
// @if $enable-flex {
// flex: 1;
// }
}
@include make-grid-columns(); @include make-grid-columns();
} }

5
scss/mixins/_grid-framework.scss
View File

@ -10,10 +10,13 @@
@include media-breakpoint-up($breakpoint, $breakpoints) { @include media-breakpoint-up($breakpoint, $breakpoints) {
@if $enable-flex { @if $enable-flex {
.col-#{$breakpoint} { .col-#{$breakpoint} {
@extend column-basics; // Relative position, min-height, and horizontal padding position: relative;
max-width: 100%; max-width: 100%;
min-height: 1px;
flex-basis: 0; flex-basis: 0;
flex-grow: 1; flex-grow: 1;
padding-right: ($grid-gutter-width / 2);
padding-left: ($grid-gutter-width / 2);
} }
} }

8
scss/mixins/_grid.scss
View File

@ -33,17 +33,11 @@
margin-right: ($gutter / -2); margin-right: ($gutter / -2);
} }
// Used here for `make-col` and in the `grid-framework` for generating @mixin make-col($size, $columns: $grid-columns) {
// predefined grid classes.
%column-basics {
position: relative; position: relative;
min-height: 1px; min-height: 1px;
padding-right: ($grid-gutter-width / 2); padding-right: ($grid-gutter-width / 2);
padding-left: ($grid-gutter-width / 2); padding-left: ($grid-gutter-width / 2);
}
@mixin make-col($size, $columns: $grid-columns) {
@extend column-basics;
@if $enable-flex { @if $enable-flex {
flex: 0 0 percentage($size / $columns); flex: 0 0 percentage($size / $columns);