Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'saas' into saas-dev

This commit is contained in:
Duncan Sommerville 2015-09-09 18:47:53 -04:00
parent 1649d9db77 2296aab8d5
commit b26d4833fe
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/services/ShowService.php
View File

@ -764,7 +764,7 @@ SQL;
// Delete show images // Delete show images
$showId = $ccShowInstance->getDbShowId(); $showId = $ccShowInstance->getDbShowId();
if (!Rest_ShowImageController::deleteShowImagesFromStor($showId)) { if (!$singleInstance && !Rest_ShowImageController::deleteShowImagesFromStor($showId)) {
throw new Exception("Error deleting show images"); throw new Exception("Error deleting show images");
} }

1
airtime_mvc/public/css/radio-page/premium_player.css
View File

@ -58,7 +58,6 @@ body {
display: block; display: block;
font-weight: 100; font-weight: 100;
width: 100%; width: 100%;
overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }

6
airtime_mvc/public/css/radio-page/radio-page.css
View File

@ -98,13 +98,15 @@ span.login-img {
} }
.about_us h1 { .about_us h1 {
font-size: 80px; font-size: 80px; /** Fallback if vw is not suppoted */
font-size: 8vh;
font-weight: 300; font-weight: 300;
margin: 10px; margin: 10px;
} }
.about_us p { .about_us p {
font-size: 24px; font-size: 24px; /** Fallback if vw is not suppoted */
font-size: 4vh;
font-weight: 300; font-weight: 300;
margin: 10px; margin: 10px;
} }