From a54e7cb0b49d2e48c0151e2753ba9074bb8aaf16 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Fri, 17 Jul 2015 09:36:47 -0500
Subject: [PATCH] * updated mute/volume icon

---
 web/app/assets/images/content/icon_mute_new.png  | Bin 0 -> 1507 bytes
 web/app/assets/images/content/icon_mute_sm.png   | Bin 0 -> 1160 bytes
 .../react-components/SessionTrack.css.scss       |   9 ++++++++-
 .../assets/stylesheets/client/session.css.scss   |   4 ++--
 .../dialogs/sessionMasterMixDialog.css.scss      |   1 -
 web/config/scheduler.yml                         |   2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 web/app/assets/images/content/icon_mute_new.png
 create mode 100644 web/app/assets/images/content/icon_mute_sm.png

diff --git a/web/app/assets/images/content/icon_mute_new.png b/web/app/assets/images/content/icon_mute_new.png
new file mode 100644
index 0000000000000000000000000000000000000000..f198ae33dbc55594f58b94cdf266dd737c0421d5
GIT binary patch
literal 1507
zcmaJ>drT8|96urWLgUPEqUd%WaiXqwy}pj#=t$|c0#c-<*t&;!v{!n<J-j<@!3AxN
z_z1?iDHG5z5m6^PrY`C_GeC`xI2qAt20ArHoH{3&)i`y!D}wG1=P$Y6<D1Xt`~7?$
zxm9_&Ge!;{KO6vnky)99T|QIfFJb6ld4FbE5|)o~lG!EYb6&|$3KU@Ua77fD#gN66
zogzJD3r<pL01%r(J6w{>nuEJJ1}38zIKc2S8vxSM13c+2p(L<~DyCTjbT|AX1kxS@
z<kVV~R^CMU=*)6~$}i7#xXVl2dJmNT0hkuRWd{r;kzjx+Wkoz-fcpI6@;z!sAg~W2
zl^CGsqFmNI(8LK8sD*V3w^E0Jm>x#87^cDA164{?izwBITB%T}ag7q!sKEXO$<YLl
z7q=6Z{#f$M0Qn?|#}UNu_rrcQ%n8K^s@Llgr3z806f!~~ma!5UP_Sb1fCqvS-2%-^
zG{=Hbk7N<IP%=QW(&s5Kyw&=`F)Q{LN-h}^AbA9Zl?cN`^Xfy3lAU@f<CSR9QN~k<
zof5f)f?Mu~H+g_8*Y5R!qCi;<PH^sp48=-WgaMK*u!r{GYK+Lxp%$}BqcowYS!=}1
z7=fA1O3Z?xdLuT#&0<A~WZl#Nmww45UdzQz0!2!k;NZB@f$rt`IEfQ|91ogIecb|6
ztfZS}qsFPx0{82s1bPwWu?QRk_EiX{U!lT;nv52V(4hp85zQbqRjsk4qI#WHrLmaQ
z8mOP^c}4d9T<m|jh%5$)w)a2n9x%x>6urI}UitB2{3%wRc|jiTgL(1K03gPeMHn4{
zuG7^sefh?ON|DR=?aFk9?3da3F`=>hUB<B?czr|NBcN?f$hT7><6)`OzO$j=jZfD@
z-|v8%hc|@c<F>3k2?s-?5~f{hTCFRXRI&X@5UPEAVhrAU-TUs<j(V|Y)41)9X_I^I
zWqSAh3SKS=&hEGeAB}|fmG^F+JMmoWfxkkxlO6HLuj-|v^G?sYn|QIZ2^{?85#`6h
zxZcCrqA^m+j2hA2kUiMn`etfke)c~RUAz6@pbI4O2a?o0`a#8{O_h&Z;D(x(@-_S%
z`heo+_-p+6oGE38e8*zaTbC&|R2b?zuv>Q=_-6RJaHz5BbfbOe&6e`2P{U%2Wo@f9
zbyPU#cjClQW|_@U*bYe3%x6bON+WdAgryY$U<$+1DU}I}hkkSAt<I08iv~ip*N;t3
zd@}69SA!n3Ee;H+yV#OlJ^Sr28TZ5TSv*{sacXJobnSt;t{WCxd*hwDaP6W~ktO5S
zjrhE4cUsq&!?vFLXyDt>-t<Q{@%9F@^Z3j}(c8290lBYw#T<Xn1g9-`<JS4-s%r{b
z#{aglZPG-<)HTFd`{(5D6^-Y=UKHyJHh112@0UtPyot8p{x((J`!zXDvkUk3ekkP{
zFBC%P8ET7uo+jqz)Y$XR`dc@DszHMH_hesu7+3hq-`xdUR;^SdSIspVxUjvnGiTR=
zB~P8}(n6bgq^T%!Hfh<g)aLFp?t|By$KJW}+0##K*8R1k2@XyB;$%ifv3DD~H5AyL
tG~>G?vpV(^Ij_zvYpc2Ie0n)%1n@AlZSAFdJG!I4-7Ir1u_t3*=wGX`IS~K=

literal 0
HcmV?d00001

diff --git a/web/app/assets/images/content/icon_mute_sm.png b/web/app/assets/images/content/icon_mute_sm.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3d9534606d8adce899d6d9c235cbed27b82ce58
GIT binary patch
literal 1160
zcmeAS@N?(olHy`uVBq!ia0vp^GC<77!3HF4glkxUlw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6H#24;=Skcg59UmvUF{9L_6kQ%*;+ybC(pfUCp1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYFX0Bjvsb^?v
zZf;_(qhMrUXsT~utZ!_fYh-L?Vqj%rqyPm<K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT-VtFWlg~VrW1CgG|37u|VHY&p<yn7vwLn>f(~1RD?6IsxA(xEJ)Q4
zN-fSWElLK)N18HBGcfG%TLe-Fbd8luesXDUYF>$_i>(q+L@y;X#mdmY$;{Hgz{SYK
z*xb<2)zs14)!fD0)z!e<&D_w^(Hy4NGq1QLF)uk4rZ*Fz*BP%~E9aur#FG4?ko^1{
zSnLI4<d@_ZXXF<sI6H%5OF_doF*!32B&Z1rV5oaji!#enQ{0O3a}~fLWR;1<6_(Df
zCXS}ACWbC979by3SQwkQSr}THnHrh6IUAcOLG`9!@jX<pDNeomK*#8Vq8BN;VM4$(
z1Y*JyFOUOI{;7GuG+zWv+~@OErvNj?H%}MGkcwM-rWo=y8}PV3?qF1_>d4zrxLt3p
zi&5EY#VQ%M8C4yZIyY|B7H`#<(XueU%co=h9E-k%udP&H^fJF#oGCSR!OYJ~!yBe8
z3|U*~#&u&CU+2Ly*Jkm($zyz4S+~HDhk1d>Egtr>+?}6OZoZceU|F?F>Y~lb_3x{H
zl`gdWXYb0QwReit-l=w0GdCYrj+UPJZF>Fks_qr9XEjK(S8mvvwY+4>eF=@<v8R;&
z_Dnuy*2q0CU=O#>ltY|lsnvZx*)Po*&MI((T3Nmpjy{mI%X?0+Nw-$3L-uF+f}Cvb
vqH}X^-`~t(d&zdL+oNZuKgvJ<<1k>jxhyRD#?|dlKxKoctDnm{r-UW|(0q#>

literal 0
HcmV?d00001

diff --git a/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss b/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss
index 3223a3001..98ea20ae8 100644
--- a/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss
+++ b/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss
@@ -85,7 +85,7 @@
   .track-icon-mute {
     float:left;
     position:relative;
-    top:0;
+    top:-1px;
     left:0;
     opacity: 0.7;
     &:hover {
@@ -149,6 +149,13 @@
     }
   }
 
+  &.music-mixer, &.chat-mixer {
+    width:210px;
+    .track-controls {
+      float:right;
+    }
+  }
+
   &.metronome {
     .track-instrument {
       float:left;
diff --git a/web/app/assets/stylesheets/client/session.css.scss b/web/app/assets/stylesheets/client/session.css.scss
index f1d2cdc8f..d3d408e76 100644
--- a/web/app/assets/stylesheets/client/session.css.scss
+++ b/web/app/assets/stylesheets/client/session.css.scss
@@ -705,8 +705,8 @@ table.vu td {
     top:230px;
     left:29px;
     width: 20px;
-    height: 18px;
-    background-image:url('/assets/content/icon_mute.png');
+    height: 20px;
+    background-image:url('/assets/content/icon_mute_new.png');
     background-repeat:no-repeat;
     text-align: center;
 }
diff --git a/web/app/assets/stylesheets/dialogs/sessionMasterMixDialog.css.scss b/web/app/assets/stylesheets/dialogs/sessionMasterMixDialog.css.scss
index 570e07ac7..bf051cff1 100644
--- a/web/app/assets/stylesheets/dialogs/sessionMasterMixDialog.css.scss
+++ b/web/app/assets/stylesheets/dialogs/sessionMasterMixDialog.css.scss
@@ -42,7 +42,6 @@
     overflow-x: hidden;
     overflow-y: auto;
     width: 100%;
-    text-align:center;
     padding: 0 15px 0 0;
     @include border_box_sizing;
     left: 0;
diff --git a/web/config/scheduler.yml b/web/config/scheduler.yml
index 90ecfff55..ea694ba60 100644
--- a/web/config/scheduler.yml
+++ b/web/config/scheduler.yml
@@ -71,7 +71,7 @@ ScoreHistorySweeper:
   description: "Creates 'ScoreHistory' tables from Scores (disabled for now)"
 
 SessionReminder:
-  cron: */5 * * * *
+  cron: "*/5 * * * *"
   class: "JamRuby::MusicSessionReminder"
   description: "Creates session reminder emails and notifications as needed."