From d6870ed854c7d323a95ee677d1440016b9868688 Mon Sep 17 00:00:00 2001
From: lone-cloud <lonecloud604@pm.me>
Date: Tue, 6 Oct 2015 17:49:59 -0700
Subject: [PATCH] trying out the dimmer

---
 app/pods/components/music-tab/component.js    |  7 ++++-
 .../components/music-tab/mixins/music-tab.js  |  7 ++++-
 app/pods/components/music-tab/template.hbs    |  8 +++---
 app/styles/app.scss                           | 28 +++++++++++--------
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js
index d77302b..1378db7 100644
--- a/app/pods/components/music-tab/component.js
+++ b/app/pods/components/music-tab/component.js
@@ -98,6 +98,8 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
           if(!replayPause){
             this.set('timeElapsed', Math.floor(dancer.getTime()));
           }
+
+          this.set('dimmerOn', false);
         } else {
           if(this.get('volumeMuted')) {
             dancer.setVolume(0);
@@ -111,7 +113,10 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
           }
 
           dancer.play();
-          this.set('incrementElapseTimeHandle', window.setInterval(this.incrementElapseTime.bind(this), 1000));
+          this.setProperties({
+            dimmerOn: true,
+            incrementElapseTimeHandle: window.setInterval(this.incrementElapseTime.bind(this), 1000)
+          });
         }
         this.toggleProperty('playing');
       }
diff --git a/app/pods/components/music-tab/mixins/music-tab.js b/app/pods/components/music-tab/mixins/music-tab.js
index 823a85e..00433c2 100644
--- a/app/pods/components/music-tab/mixins/music-tab.js
+++ b/app/pods/components/music-tab/mixins/music-tab.js
@@ -89,6 +89,7 @@ export default Em.Mixin.create({
   dragLeaveTimeoutHandle: null,
   visualizationsDisplayed: false,
   audioStream: null,
+  dimmerOn: false,
 
   notFoundHtml: '<div class="alert alert-danger" role="alert">A microphone was not found.</div>',
 
@@ -202,8 +203,12 @@ export default Em.Mixin.create({
       classes += ' draggingOver';
     }
 
+    if(this.get('dimmerOn')){
+      classes += ' dimmerFriendly';
+    }
+
     return classes;
-  }.property('dragging', 'draggingOverPlayListArea'),
+  }.property('dragging', 'draggingOverPlayListArea', 'dimmerOn'),
 
   usingLocalAudioClass: function() {
     return this.get('usingLocalAudio') ? 'playerControllIcon active' : 'playerControllIcon';
diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs
index 0040cb0..31d11fe 100644
--- a/app/pods/components/music-tab/template.hbs
+++ b/app/pods/components/music-tab/template.hbs
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row antiDimmer">
   <div id="playerArea" class="col-sm-8 col-xs-12" {{action "playerAreaPlay"}}>
     <div id="playNotification"
          class="material-icons {{if fadeOutNotification "fadeOut"}} {{if playing "play-arrow" "pause"}}"></div>
@@ -93,14 +93,14 @@
   </div>
 </div>
 
-<div id="slideToggle" class="text-center cursorPointer row" {{action "slideTogglePlayerBottom"}}>
+<div id="slideToggle" class="text-center cursorPointer row antiDimmer" {{action "slideTogglePlayerBottom"}}>
   <div class="col-xs-offset-5 col-xs-2">
     {{paper-icon icon=beatDetectionArrowIcon}}
   </div>
 </div>
 
 {{#if playerBottomDisplayed}}
-  <div id="playerBottom" class="row">
+  <div id="playerBottom" class="row antiDimmer {{if dimmerOn "dimmerFriendly"}}">
     <div id="beatArea" class="col-lg-8 col-xs-12">
       <div class="row">
         <div class="beatOption col-xs-3">
@@ -193,4 +193,4 @@
 {{/if}}
 
 {{ember-notify closeAfter=5000}}
-<!--<div id="dimmer" class="{{if playing "show"}}"></div>-->
\ No newline at end of file
+<div id="dimmer" class="{{if dimmerOn "show"}}"></div>
\ No newline at end of file
diff --git a/app/styles/app.scss b/app/styles/app.scss
index de494da..c528a5e 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -82,6 +82,7 @@ md-switch[disabled=disabled], md-switch[disabled=disabled] .md-container, md-sli
   bottom: 0;
   width: 100%;
   height: $footerHeight;
+  z-index: -1;
   p {
     padding-left: 0;
     margin-top: 10px;
@@ -139,7 +140,6 @@ md-progress-linear {
   position: absolute;
   background: white;
   box-shadow: 5px 10px 15px 5px rgba(0, 0, 0, .3);
-  z-index: 2;
   width: 200px;
   right: 0;
 }
@@ -193,7 +193,6 @@ md-list-item .md-no-style {
   background: rgba(0, 0, 0, 0.7);
   box-shadow: 5px 10px 15px 5px rgba(0, 0, 0, 0.3);
   color: #FFFFFF;
-  z-index: 2;
   position: absolute;
   width: 275px;
   height: 275px;
@@ -234,7 +233,6 @@ md-slider.md-default-theme .md-thumb:after {
   top: 20px;
   right: 0;
   position: absolute;
-  z-index: 2;
   background-color: white;
   max-height: 400px;
   overflow: auto;
@@ -403,7 +401,6 @@ md-toolbar {
 #slideToggle {
   color: $playerDefaultIconColor;
   background: #8C3E3E;
-  z-index: 2;
   div md-icon {
     color: inherit !important;
   }
@@ -499,7 +496,6 @@ md-switch.md-default-theme.md-checked .md-thumb {
   background-color: black;
   display: inline-block;
   padding: 0;
-  z-index: 2;
 }
 
 #playerArea:hover #playerControls {
@@ -510,7 +506,6 @@ md-switch.md-default-theme.md-checked .md-thumb {
   height: $playerHeight;
   background-color: #1E1E1E;
   padding: 0 5px 0 5px;
-  z-index: 2;
 }
 
 #playerArea * .noUi-origin {
@@ -674,7 +669,6 @@ md-switch.md-default-theme.md-checked .md-thumb {
 }
 
 #beatArea {
-  z-index: 2;
   position: relative;
   padding-top: 20px;
 }
@@ -712,13 +706,12 @@ md-switch.md-default-theme.md-checked .md-thumb {
   color: black;
   border: 1px solid black;
   width: 100%;
-  z-index: 2;
+  background: white;
 }
 
 #beatContainer {
   vertical-align: middle;
   padding: 0 10px;
-  z-index: 2;
   md-switch {
     bottom: 0;
     position: absolute;
@@ -943,8 +936,18 @@ $vibrateblur1:1px;
   display: none;
 }
 
-.noUi-value-vertical {
-  color: black;
+.antiDimmer {
+  position: relative;
+  z-index: 2;
+}
+
+.dimmerFriendly {
+  color: white !important;
+  background: #171717 !important;
+}
+
+.noUi-value-vertical, .noUi-pips {
+  color: inherit !important;
 }
 
 .noUi-vertical .noUi-handle {
@@ -955,3 +958,6 @@ $vibrateblur1:1px;
 .noUi-vertical .noUi-handle:after, .noUi-vertical .noUi-handle:before{
   background: grey;
 }
+
+
+