diff options
| author | Sam Potts <sam@potts.es> | 2020-03-30 10:45:57 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2020-03-30 10:45:57 +1100 |
| commit | da943b384ca334cad66fd261cb9a0f924716da9d (patch) | |
| tree | 5aaac37b474a2708c7910eb536b9d96d4c0dcff3 /demo/src/sass/layout | |
| parent | 50a7c2fad6f0d9b03788fe57a855894eafcf5ef7 (diff) | |
| parent | ad63af5096e014785bd22eac24bc8030c0dc70d6 (diff) | |
| download | plyr-da943b384ca334cad66fd261cb9a0f924716da9d.tar.lz plyr-da943b384ca334cad66fd261cb9a0f924716da9d.tar.xz plyr-da943b384ca334cad66fd261cb9a0f924716da9d.zip | |
Merge branch 'develop' into css-variables
# Conflicts:
# demo/dist/demo.css
# demo/dist/demo.min.js.map
# demo/index.html
# dist/plyr.css
# dist/plyr.min.js.map
# dist/plyr.min.mjs.map
# dist/plyr.polyfilled.min.js.map
# dist/plyr.polyfilled.min.mjs.map
# gulpfile.js
# src/sass/base.scss
# src/sass/components/control.scss
# src/sass/settings/colors.scss
# src/sass/settings/controls.scss
Diffstat (limited to 'demo/src/sass/layout')
| -rw-r--r-- | demo/src/sass/layout/core.scss | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/demo/src/sass/layout/core.scss b/demo/src/sass/layout/core.scss index 0501c1df..b9b2d4d5 100644 --- a/demo/src/sass/layout/core.scss +++ b/demo/src/sass/layout/core.scss @@ -35,11 +35,10 @@ main { aside { align-items: center; background: #fff; - color: $gray; display: flex; flex-shrink: 0; justify-content: center; - padding: ($spacing-base * 0.75); + padding: $spacing-base; position: relative; text-align: center; text-shadow: none; |