diff --git a/app/pods/components/music-tab/mixins/helpers.js b/app/pods/components/music-tab/mixins/helpers.js index bdfcdcd..69777aa 100644 --- a/app/pods/components/music-tab/mixins/helpers.js +++ b/app/pods/components/music-tab/mixins/helpers.js @@ -23,7 +23,7 @@ export default Em.Mixin.create({ if(value === 0) { value = 'More'; } else if(value === 0.25) { - value = 'Neutral'; + value = ''; } else { value = 'Less'; } diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs index ebcc03e..435edad 100644 --- a/app/pods/components/music-tab/template.hbs +++ b/app/pods/components/music-tab/template.hbs @@ -142,25 +142,25 @@
{{#if usingBeatPreferences}} - + {{paper-icon class=dimmerOnClass icon="star"}} {{/if}}
-
+
Sensitivity {{range-slider start=threshold orientation="vertical" step=beatOptions.threshold.step range=beatOptions.threshold.range slide="thresholdChanged" pips=beatOptions.threshold.pips}}
{{#if usingMicAudio}}
- Microphone boost + Mic Boost {{range-slider start=micBoost orientation="vertical" step=beatOptions.micBoost.step range=beatOptions.micBoost.range slide="micBoostChanged" pips=beatOptions.micBoost.pips}}
{{/if}} -
+
{{#paper-checkbox checked=flashingTransitions}}Flashing Transitions{{/paper-checkbox}} diff --git a/app/styles/app.scss b/app/styles/app.scss index 1ab7f50..f10191c 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -514,7 +514,7 @@ md-toolbar { transform: translateY(-50%); .tooltip { margin-top: 5px !important; - margin-left: -30px !important; + left: 0 !important; } } @@ -825,6 +825,7 @@ md-switch.md-default-theme.md-checked .md-thumb { #beatArea { height: $playerBottomHeight; position: relative; + padding: 0; } .noUi-target { diff --git a/assets/intro.psd b/assets/intro.psd index 2fc0005..4f1d8f8 100644 Binary files a/assets/intro.psd and b/assets/intro.psd differ diff --git a/public/assets/images/intro.jpg b/public/assets/images/intro.jpg new file mode 100644 index 0000000..1cce1d7 Binary files /dev/null and b/public/assets/images/intro.jpg differ diff --git a/public/assets/images/intro.png b/public/assets/images/intro.png deleted file mode 100644 index 8c4dee0..0000000 Binary files a/public/assets/images/intro.png and /dev/null differ