diff --git a/components/01_Layouts/flexGrid/_flexGrid.scss b/components/01_Layouts/flexGrid/_flexGrid.scss index 0ff81b1..6b4d0dd 100644 --- a/components/01_Layouts/flexGrid/_flexGrid.scss +++ b/components/01_Layouts/flexGrid/_flexGrid.scss @@ -1,20 +1,22 @@ -RV-FlexGrid{ - display: grid; - grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); +@mixin RV-FlexGrid { + &__Container { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); - &--sameHeight { - grid-auto-rows: 1fr; + &--sameHeight { + grid-auto-rows: 1fr; + } + + &--spacing { + gap: 10px; + } } - &--spacing { - gap: 10px; + &__Item { + @include align-content; } } -.RV-FlexGrid__Container { - @extend RV-FlexGrid; - - .RV-FlexGrid__Item { - @include align-content; - } -} +.RV-FlexGrid{ + @include RV-FlexGrid; +} diff --git a/components/01_Layouts/flexRow/_flexRow.scss b/components/01_Layouts/flexRow/_flexRow.scss index b8a2f72..24fd0b6 100644 --- a/components/01_Layouts/flexRow/_flexRow.scss +++ b/components/01_Layouts/flexRow/_flexRow.scss @@ -1,22 +1,21 @@ -RV-FlexRow { - display: flex; - flex-direction: row; - gap: 10px; - justify-content: space-around; +@mixin RV-FlexRow { + &__Container { + display: flex; + flex-direction: row; + gap: 10px; + justify-content: space-around; - &--wrap { - flex-wrap: wrap; + &--wrap { + flex-wrap: wrap; + } } - * { + &__Item { width: 100%; + @include align-content; } } -.RV-FlexRow__Container { - @extend RV-FlexRow; - - .RV-FlexRow__Item { - @include align-content; - } +.RV-FlexRow{ + @include RV-FlexRow; } \ No newline at end of file diff --git a/components/rcss.scss b/components/rcss.scss index 8de0204..74afc07 100644 --- a/components/rcss.scss +++ b/components/rcss.scss @@ -1,2 +1,2 @@ -@import './components'; -@import './pink.css'; \ No newline at end of file +@import './pink.css'; +@import './components'; \ No newline at end of file diff --git a/public/rcss.css b/public/rcss.css index 316f11c..7bf37c4 100644 --- a/public/rcss.css +++ b/public/rcss.css @@ -1,68 +1,64 @@ @import url(./pink.css); -RV-FlexRow, .RV-FlexRow__Container { +.RV-FlexRow__Container { display: flex; flex-direction: row; gap: 10px; justify-content: space-around; } - RV-FlexRow--wrap { + .RV-FlexRow__Container--wrap { flex-wrap: wrap; } - RV-FlexRow *, .RV-FlexRow__Container * { - width: 100%; } -.RV-FlexRow__Container .RV-FlexRow__Item * { - text-align: unset; - display: flex; - flex-direction: row; } +.RV-FlexRow__Item { + width: 100%; } + .RV-FlexRow__Item * { + text-align: unset; + display: flex; + flex-direction: row; } + .RV-FlexRow__Item--fixedSize { + flex: 0 0; + width: min-content; } + .RV-FlexRow__Item--center { + text-align: center; } + .RV-FlexRow__Item--center * { + justify-content: center; } + .RV-FlexRow__Item--left { + text-align: left; } + .RV-FlexRow__Item--left * { + justify-content: flex-start; } + .RV-FlexRow__Item--right { + text-align: right; } + .RV-FlexRow__Item--right * { + justify-content: flex-end; } -.RV-FlexRow__Container .RV-FlexRow__Item--fixedSize { - flex: 0 0; - width: min-content; } - -.RV-FlexRow__Container .RV-FlexRow__Item--center { - text-align: center; } - .RV-FlexRow__Container .RV-FlexRow__Item--center * { - justify-content: center; } - -.RV-FlexRow__Container .RV-FlexRow__Item--left { - text-align: left; } - .RV-FlexRow__Container .RV-FlexRow__Item--left * { - justify-content: flex-start; } - -.RV-FlexRow__Container .RV-FlexRow__Item--right { - text-align: right; } - .RV-FlexRow__Container .RV-FlexRow__Item--right * { - justify-content: flex-end; } - -RV-FlexGrid, .RV-FlexGrid__Container { +.RV-FlexGrid__Container { display: grid; grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); } - RV-FlexGrid--sameHeight { + .RV-FlexGrid__Container--sameHeight { grid-auto-rows: 1fr; } - RV-FlexGrid--spacing { + .RV-FlexGrid__Container--spacing { gap: 10px; } -.RV-FlexGrid__Container .RV-FlexGrid__Item * { +.RV-FlexGrid__Item * { text-align: unset; display: flex; flex-direction: row; } -.RV-FlexGrid__Container .RV-FlexGrid__Item--fixedSize { +.RV-FlexGrid__Item--fixedSize { flex: 0 0; width: min-content; } -.RV-FlexGrid__Container .RV-FlexGrid__Item--center { +.RV-FlexGrid__Item--center { text-align: center; } - .RV-FlexGrid__Container .RV-FlexGrid__Item--center * { + .RV-FlexGrid__Item--center * { justify-content: center; } -.RV-FlexGrid__Container .RV-FlexGrid__Item--left { +.RV-FlexGrid__Item--left { text-align: left; } - .RV-FlexGrid__Container .RV-FlexGrid__Item--left * { + .RV-FlexGrid__Item--left * { justify-content: flex-start; } -.RV-FlexGrid__Container .RV-FlexGrid__Item--right { +.RV-FlexGrid__Item--right { text-align: right; } - .RV-FlexGrid__Container .RV-FlexGrid__Item--right * { + .RV-FlexGrid__Item--right * { justify-content: flex-end; } RV-ContentCrop, .RV-ContentCrop__Container, RV-ContentCrop *, .RV-ContentCrop__Container * {