diff --git a/src/assets/scss/5-modules/controls.scss b/src/assets/scss/5-modules/controls.scss new file mode 100644 index 0000000..f82021c --- /dev/null +++ b/src/assets/scss/5-modules/controls.scss @@ -0,0 +1,106 @@ +/* ----------------------------------------------------------- */ +/* == control module */ +/* ----------------------------------------------------------- */ + +.controls { + display: flex; + justify-content: space-between; + align-items: center; +} + +/* Volume +-------------------------------------------------------------- */ + +.controls__volume { + display: flex; + align-items: center; + flex-shrink: 0; + margin-right: 1rem; + padding-top: .1rem; +} + +/* Controls +-------------------------------------------------------------- */ + +.controls__controls { + display: flex; + justify-content: center; + align-items: center; + flex-grow: 1; +} + +.controls__prevnext { + padding: 1rem; + border: none; + border-radius: .2rem; + background: none; + color: $color-primary; + font-size: 0; +} + +.controls__prevnext.disabled { + color: rgba($color-primary, .4); +} + +.controls__prevnext svg { + width: 1.8rem; + height: 2rem; +} + +.playerBig .controls__prevnext svg { + width: 2.1rem; + height: 2.2rem; +} + +.controls__playpause { + margin: 0 2rem; + padding: 0; + border: none; + border-radius: 4.2rem; + background: none; + color: $color-primary; + font-size: 0; +} + +.controls__playpause svg { + width: 4.6rem; + height: 4.6rem; +} + +.playerBig .controls__playpause { + margin: 0 3rem; +} + +.playerBig .controls__playpause svg { + width: 5.6rem; + height: 5.6rem; +} + +.controls__playpause.disabled { + color: rgba($color-primary, .4); +} + +/* Menu +-------------------------------------------------------------- */ + +.controls__menu { + margin-right: -1rem; +} + +.controls__menuBtn { + padding: 1rem; + border: none; + background: none; + color: $color-primary; + font-size: 0; +} + +.controls__menuBtn svg { + width: 2.5rem; + height: .5rem; +} + +.playerBig .controls__menuBtn svg { + width: 3.2rem; + height: .6rem; +} diff --git a/src/assets/scss/5-modules/player-big.scss b/src/assets/scss/5-modules/player-big.scss index e46f4e5..30018f4 100644 --- a/src/assets/scss/5-modules/player-big.scss +++ b/src/assets/scss/5-modules/player-big.scss @@ -2,6 +2,10 @@ /* == Big player */ /* ----------------------------------------------------------- */ +.playerBig { + margin-bottom: 6rem; +} + .playerBig__player { position: relative; overflow: hidden; diff --git a/src/assets/scss/5-modules/volume.scss b/src/assets/scss/5-modules/volume.scss index 184a368..76df5db 100644 --- a/src/assets/scss/5-modules/volume.scss +++ b/src/assets/scss/5-modules/volume.scss @@ -4,7 +4,12 @@ .volume { position: relative; - margin: 1rem 0; + margin: 0; +} + +.playerBig .volume { + transform: scale(1.11); + transform-origin: left center; } .volume__bg, diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss index fd0fc1c..43cd932 100755 --- a/src/assets/scss/style.scss +++ b/src/assets/scss/style.scss @@ -66,6 +66,7 @@ @import "5-modules/player-progress"; @import "5-modules/player-track"; @import "5-modules/volume"; +@import "5-modules/controls"; // -------------------------------------------------------------- diff --git a/src/components/Controls.svelte b/src/components/Controls.svelte index 65b19f7..c5d4892 100644 --- a/src/components/Controls.svelte +++ b/src/components/Controls.svelte @@ -1,29 +1,29 @@
-
+
-
- - - - - +
+ + $paused = !$paused}> +
-
- - +
+
@@ -40,20 +40,13 @@ loading } from '/store.js' import Volume from '/components/Volume' + import PlayPause from '/components/icons/controls/PlayPause' + import Prev from '/components/icons/controls/Prev' + import Next from '/components/icons/controls/Next' + import IconMenu from '/components/icons/Menu'