diff --git a/assets/src/scss/layout/_grid.scss b/assets/src/scss/object/component/_grid.scss similarity index 87% rename from assets/src/scss/layout/_grid.scss rename to assets/src/scss/object/component/_grid.scss index 568ef7a4..504050e6 100644 --- a/assets/src/scss/layout/_grid.scss +++ b/assets/src/scss/object/component/_grid.scss @@ -1,4 +1,4 @@ -.#{$bs-prefix}container, .#{$bs-prefix}container-fluid { +.#{$bs-prefix}c-container, .#{$bs-prefix}c-container-fluid { margin-right: auto; margin-left: auto; padding-right: $bs-margin * 2; @@ -6,7 +6,7 @@ overflow: hidden; } -.#{$bs-prefix}container { +.#{$bs-prefix}c-container { @include bs-bp-min( $bs-screen-lg-min ) { max-width: $bs-max-width; } @@ -15,13 +15,13 @@ /** * flex container */ -.#{$bs-prefix}row { +.#{$bs-prefix}c-row { display: flex; flex-wrap: wrap; overflow: hidden; &--auto { - > .#{$bs-prefix}row__col { + > .#{$bs-prefix}c-row__col { flex: auto; } } @@ -77,7 +77,7 @@ &#{$prefix}-collapse { @include bs-row-gutter(0); - > .#{$bs-prefix}row__col { + > .#{$bs-prefix}c-row__col { @include bs-col-gutter(0); } } @@ -85,14 +85,14 @@ &#{$prefix}-margin { @include bs-row-gutter($bs-margin * -2); - > .#{$bs-prefix}row__col { + > .#{$bs-prefix}c-row__col { @include bs-col-gutter($bs-margin * 2); } &-s { @include bs-row-gutter($bs-margin * -1); - > .#{$bs-prefix}row__col { + > .#{$bs-prefix}c-row__col { @include bs-col-gutter($bs-margin * 1); } } @@ -100,7 +100,7 @@ &-l { @include bs-row-gutter($bs-margin * -3); - > .#{$bs-prefix}row__col { + > .#{$bs-prefix}c-row__col { @include bs-col-gutter($bs-margin * 3); } } @@ -112,7 +112,7 @@ /** * flex item */ -.#{$bs-prefix}row__col { +.#{$bs-prefix}c-row__col { flex: 1; } @@ -124,7 +124,7 @@ @for $i from 1 through $max_columns { $gcd: bs-gcd( $i, $max_columns ); - .#{$bs-prefix}row__col#{$prefix}-#{$i}-#{$max_columns} { + .#{$bs-prefix}c-row__col#{$prefix}-#{$i}-#{$max_columns} { @if $i != $max_columns { @extend %bs-item#{$prefix}-gcd-#{$i / $gcd}-#{$max_columns / $gcd}; } @else { @@ -170,7 +170,7 @@ @for $i from 1 through $max_columns - 1 { $gcd: bs-gcd( $i, $max_columns ); - .#{$bs-prefix}row__col#{$prefix}-offset-#{$i}-#{$max_columns} { + .#{$bs-prefix}c-row__col#{$prefix}-offset-#{$i}-#{$max_columns} { @extend %bs-item#{$prefix}-offset-gcd-#{$i / $gcd}-#{$max_columns / $gcd}; } } @@ -201,7 +201,7 @@ @include bs-bp-min( $bs-screen-min ) { $prefix: bs-bp-prefix( $bs-size ); - .#{$bs-prefix}row__col#{$prefix}-offset-0 { + .#{$bs-prefix}c-row__col#{$prefix}-offset-0 { margin-left: 0; } } @@ -217,7 +217,7 @@ /** * child element height 100% */ - .#{$bs-prefix}row__col#{$prefix}-flex { + .#{$bs-prefix}c-row__col#{$prefix}-flex { display: flex; > * { diff --git a/assets/src/scss/style.scss b/assets/src/scss/style.scss index 1cd5f3ef..82c7666a 100644 --- a/assets/src/scss/style.scss +++ b/assets/src/scss/style.scss @@ -36,10 +36,6 @@ @import 'foundation/normalize'; @import 'foundation/base'; -/* ======================================== - * layout - ======================================= */ -@import 'layout/grid'; /* ======================================== * object - component @@ -48,6 +44,7 @@ @import 'object/component/btn'; @import 'object/component/media'; @import 'object/component/form'; +@import 'object/component/grid'; /* ======================================== * object - utility