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 000000000..f198ae33d Binary files /dev/null and b/web/app/assets/images/content/icon_mute_new.png differ 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 000000000..e3d953460 Binary files /dev/null and b/web/app/assets/images/content/icon_mute_sm.png differ 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."