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

Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing

This commit is contained in:
Duncan Sommerville 2015-11-17 11:53:07 -05:00
parent 2523391d4d b94164107f
commit 041adb5c1f
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/views/scripts/index/index.phtml
View File

@ -70,7 +70,7 @@
<div id="jp_container_1" class="jp-audio"> <div id="jp_container_1" class="jp-audio">
<div class="jp-type-playlist"> <div class="jp-type-playlist">
<div class="current-track">Now Playing: <span></span></div> <div class="current-track track-overflow">Now Playing: <span class="track-overflow"></span></div>
<div class="jp-gui jp-interface"> <div class="jp-gui jp-interface">
<div class="playbar playbar-buttons"> <div class="playbar playbar-buttons">
<ul class="jp-controls rss-buttons"> <ul class="jp-controls rss-buttons">

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

@ -64,6 +64,7 @@ body {
.bottom_bar .button { .bottom_bar .button {
width: 50px; width: 50px;
min-width: 50px;
height: 50px; height: 50px;
display: inline-block; display: inline-block;
margin: 35px 40px; margin: 35px 40px;

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

@ -80,22 +80,20 @@ span.login-img {
transition-delay: 2s; transition-delay: 2s;
} }
#schedule_iframe.schedule, .about_us, .login, .podcast { .tab_content {
/* -webkit-transition-delay: 1s; /* -webkit-transition-delay: 1s;
transition-delay: 1s;*/ transition-delay: 1s;*/
transition: all 0.4s ease; transition: opacity 0.4s ease 0.4s;
opacity: 0; opacity: 0;
} }
.about_us.current, .login.current, .schedule.current, .podcast.current { .current {
opacity: 1; opacity: 1;
-webkit-transition-delay: 0.4s; -webkit-transition: opacity 0.4s ease 0.0s;
transition-delay: 0.4s; transition: opacity 0.4s ease 0.0s;
} }
#schedule_iframe.schedule.current {
opacity: 1;
}
.about_us h1 { .about_us h1 {
font-size: 80px; /** Fallback if vw is not suppoted */ font-size: 80px; /** Fallback if vw is not suppoted */
@ -164,9 +162,6 @@ span.login-img {
width:auto; width:auto;
border:0; border:0;
} }
#rss-title, #rss-subscribe {
text-align: center;
}
} }

14
airtime_mvc/public/css/radio-page/station-podcast.css
View File

@ -369,16 +369,27 @@ div.jp-title,
display: block; display: block;
text-transform: uppercase; text-transform: uppercase;
clear: both; clear: both;
text-overflow: ellipsis;
overflow: hidden;
word-wrap: break-word;
} }
.current-track span { .current-track span {
display: inline-block; display: inline;
margin-left:10px; margin-left:10px;
color: #FF6F01; color: #FF6F01;
width: 90%;
}
.track-overflow {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.podcast ul li .podcast_info { .podcast ul li .podcast_info {
display: inline-block; display: inline-block;
width: 99%;
} }
.podcast ul li span, .playlist-item-no-preview span { .podcast ul li span, .playlist-item-no-preview span {
@ -570,6 +581,7 @@ div.jp-jplayer {
} }
} }
@media (max-width: 590px) { @media (max-width: 590px) {
.jp-time-block { .jp-time-block {
display:block !important; display:block !important;