diff options
| author | Danielh112 <Daniel@sbgsportssoftware.com> | 2020-08-18 11:29:25 +0100 |
|---|---|---|
| committer | Danielh112 <Daniel@sbgsportssoftware.com> | 2020-08-18 11:29:25 +0100 |
| commit | f7e9ee56d2ed5447f59e5548f005fabdab2f0a72 (patch) | |
| tree | a16300fa62e68b3310ae96e36dba65981f0024ef /demo/src/sass/layout/grid.scss | |
| parent | 22af7f16ea4a4269321d29242d63ec23718c92da (diff) | |
| parent | 423b7b276f1572eb666de32094a9aacd32e87d18 (diff) | |
| download | plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.tar.lz plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.tar.xz plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.zip | |
Fix merge conflicts
Diffstat (limited to 'demo/src/sass/layout/grid.scss')
| -rw-r--r-- | demo/src/sass/layout/grid.scss | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/demo/src/sass/layout/grid.scss b/demo/src/sass/layout/grid.scss index 40dd829e..fd3f8fdc 100644 --- a/demo/src/sass/layout/grid.scss +++ b/demo/src/sass/layout/grid.scss @@ -3,17 +3,17 @@ // ========================================================================== .grid { - margin: 0 auto; - padding: $spacing-base; + margin: 0 auto; + padding: $spacing-base; - @media only screen and (min-width: $screen-md) { - align-items: center; - display: flex; - max-width: $container-max-width; - width: 100%; + @media only screen and (min-width: $screen-md) { + align-items: center; + display: flex; + max-width: $container-max-width; + width: 100%; - > * { - flex: 1; - } + > * { + flex: 1; } + } } |