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

Merge branch 'saas-dev' into saas-stream-settings

Browse source 
Conflicts:
	airtime_mvc/application/models/Preference.php
This commit is contained in:
Duncan Sommerville 2015-07-10 10:29:38 -04:00
commit 37ed35f5b2
16 changed files with 94 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/public/css/embed/weekly-schedule-widget-basic.css
View file

@ -217,11 +217,11 @@ background: rgba(53, 53, 53, 1.0);
@media (max-width: 400px) {
.schedule_item div.time_grid {
width: 90%;
width: 95%;
}
.schedule_item div.name_grid {
width: 90%;
width: 95%;
}
}

4
airtime_mvc/public/css/embed/weekly-schedule-widget.css
View file

@ -167,11 +167,11 @@ body {
@media (max-width: 400px) {
.schedule_item div.time_grid {
width: 90%;
width: 95%;
}
.schedule_item div.name_grid {
width: 90%;
width: 95%;
}
}

34
airtime_mvc/public/css/radio-page/premium_player.css
View file

@ -39,6 +39,7 @@ body {
.on_air {
display: inline-block;
margin-left: 40px;
width: 65%
}
.bottom_bar p.now_playing {
@ -47,11 +48,19 @@ body {
font-weight: 300;
float: left;
margin: 28px 0px;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.bottom_bar p.now_playing span {
display: block;
font-weight: 100;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.bottom_bar .button {
@ -88,6 +97,30 @@ body {
float: right;
}
@media (max-width: 1230px) {
.on_air {
width: 60%;
}
}
@media (max-width: 1075px) {
.on_air {
width: 55%;
}
}
@media (max-width: 960px) {
.on_air {
width: 50%;
}
}
@media (max-width: 850px) {
.on_air {
width: 45%;
}
}
@media (max-width: 780px) {
.bottom_bar {
height: 80px;
@ -122,6 +155,7 @@ body {
left: 0px;
right: 0px;
padding-top: 40px;
width: 100%;
background: rgba(0,0,0,0);
background: -moz-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 69%, rgba(0,0,0,1) 100%);
background: -webkit-gradient(left top, left bottom, color-stop(0%, rgba(0,0,0,0)), color-stop(69%, rgba(0,0,0,1)), color-stop(100%, rgba(0,0,0,1)));

5
airtime_mvc/public/css/styles.css
View file

@ -47,6 +47,11 @@ select {
border:1px solid #9d9d9d;
}
/* Fix for Firefox */
fieldset {
clear: both;
}
.logo {
background: transparent url(images/airtime_logo.png) no-repeat 0 0;
height: 35px;