From f1a217d544cc33bca12496cf2de62320be9a9686 Mon Sep 17 00:00:00 2001 From: Egor Philippov Date: Wed, 16 Sep 2015 15:32:51 -0700 Subject: [PATCH] bridgeControls is now an id --- app/components/mixins/music-control.js | 2 +- app/styles/app.scss | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/components/mixins/music-control.js b/app/components/mixins/music-control.js index 06b3a59..a54b4a3 100644 --- a/app/components/mixins/music-control.js +++ b/app/components/mixins/music-control.js @@ -226,7 +226,7 @@ export default Em.Mixin.create({ Em.$('#' + type + 'Tooltip + .tooltip .tooltip-inner').html(text); //change the tooltip text for hover Em.$('#' + type + 'Tooltip').attr('data-original-title', text); - + if(Em.isNone(this.get(type + 'TooltipTxt'))) { this.set(type + 'TooltipTxt', text); } diff --git a/app/styles/app.scss b/app/styles/app.scss index 0188496..4998e14 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -97,9 +97,8 @@ md-progress-circular { } // BRIDGE CONTROLS -.bridgeControls { +#bridgeControls { max-width: 1000px; - position: relative; } .navigation {