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

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

Browse source 
Conflicts:
	airtime_mvc/public/js/airtime/common/common.js
This commit is contained in:
Duncan Sommerville 2015-08-14 10:54:53 -04:00
commit 12c4e4a374
18 changed files with 318 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

117
airtime_mvc/public/css/_showbuilder.css
View file

@ -2,15 +2,15 @@ div.ColVis_collectionBackground {
background-color: transparent;
}
.wrapper {
/*background: #242424;*/
/*.wrapper {
*//*background: #242424;*//*
background: #111;
top: 139px;
top: 105px;
left: 130px;
right: 0;
bottom: 0;
padding: 10px 10px 40px;
/*padding: 0;*/
padding: 5px 10px 40px;
*//*padding: 0;*//*
border: none;
display: -webkit-box;
@ -29,13 +29,13 @@ div.ColVis_collectionBackground {
transition: top 0.2s linear, padding 0.2s linear;
}
/* Usability hint */
*//* Usability hint *//*
.usability_hint {
left: 130px;
flex: 0 100%;
width: 100%;
}
}*/
/* Scroll bars */
@ -251,18 +251,6 @@ thead th.ui-state-default:focus {
outline: none;
}
/* Library Context Menu */
.context-menu-item.icon {
min-height: 26px;
padding: 0 5px;
background-position: 4px 5px;
}
.context-menu-item > span {
padding: 0 20px;
line-height: 26px;
}
/* Library Search */
@ -619,76 +607,6 @@ li.ui-state-default {
padding-top: 4px;
}
/* Media type selector */
#media_type_nav {
position: fixed;
top: 139px;
bottom: 0;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
width: 130px;
flex: 1 auto;
padding: 0;
background: #353535;
border: 1px solid #242424;
border-top: 1px solid #7e7e7e;
/* border: 1px solid #242424; */
-moz-box-shadow: 0 2px 5px rgba(0,0,0,.35);
-webkit-box-shadow: 0 2px 5px rgba(0,0,0,.35);
box-shadow: 0 2px 5px rgba(0,0,0,.35);
z-index: 100;
text-align: left;
}
#media_type_nav .btn-group {
padding: 4px;
}
#new_media_selector {
width: 100%;
font-size: 14px;
}
.media_type_selector {
cursor: pointer;
color: #cecece;
font-family: Roboto, "Open Sans", sans-serif;
font-size: 16px;
font-weight: 400;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
/*margin: 20px 20px 0 5px;*/
padding: 10px 10px 10px 10px;
-webkit-transition: color 0.1s linear;
-moz-transition: color 0.1s linear;
-o-transition: color 0.1s linear;
transition: color 0.1s linear;
}
.media_type_selector.selected {
color: #fff;
background-color: #444;
-webkit-transition: color 0.1s linear;
-moz-transition: color 0.1s linear;
-o-transition: color 0.1s linear;
transition: color 0.1s linear;
}
.media_type_selector:hover {
color: #fff;
-webkit-transition: color 0.1s linear;
-moz-transition: color 0.1s linear;
-o-transition: color 0.1s linear;
transition: color 0.1s linear;
}
/* DataTables */
.ColVis_collection.TableTools_collection.ui-buttonset.ui-buttonset-multi {
@ -776,24 +694,3 @@ th.library_checkbox {
border: none;
}
/* Uploads/Dropzone */
#upload_form {
width: 100%;
min-width: 555px;
background: none;
border: 2px dashed #efefef;
color: #efefef;
font-family: Roboto, "Open Sans", sans-serif;
font-size: 20px;
font-weight: 300;
line-height: 14px;
margin-top: 10px;
}
.dropzone .dz-message {
margin: 0;
}

13
airtime_mvc/public/css/jquery.contextMenu.css
View file

@ -167,3 +167,16 @@
.context-menu-accesskey {
text-decoration: underline;
}
/* Library Context Menu */
.context-menu-item.icon {
min-height: 26px;
padding: 0 5px;
background-position: 4px 5px;
}
.context-menu-item > span {
padding: 0 20px;
line-height: 26px;
}

10
airtime_mvc/public/css/player-form.css
View file

@ -14,6 +14,9 @@
}
.player-preview {
width: 100%;
background-color: #111;
padding-top: 25px;
padding-bottom: 25px;
}
.player-preview iframe {
margin: 0 auto;
@ -31,15 +34,13 @@
padding-bottom: 10px;
font-size: 14px;
/*font-weight: bold;*/
color: #333;
margin-bottom: 10px;
margin-top: 10px;
}
.player-title {
clear: left;
color: #5b5b5b;
float: left;
font-size: 13px;
font-weight: bold;
width: 40px;
padding: 4px 0;
text-align: left;
@ -55,7 +56,6 @@
#player_embed_src-element p {
margin: 0px;
font-size: 13px;
color: #333;
}
@ -75,7 +75,7 @@ table#player_compatibility_chart{
#player_compatibility_chart th
{
color: #5b5b5b;
color: #1f1f1f;
border: 0px;
}

21
airtime_mvc/public/css/pro_dropdown_3.css
View file

@ -10,7 +10,7 @@ way to fit your requirements.
=================================================================== */
#nav {
padding:7px 0 0 6px;
/*padding:7px 0 0 6px;*/
margin:0;
list-style:none;
height:28px;
@ -18,16 +18,17 @@ way to fit your requirements.
position:relative;
z-index:500;
font-family:Arial, Helvetica, sans-serif;
border-top:1px solid #7e7e7e;
/*border-top:1px solid #7e7e7e;
border-bottom:1px solid #242424;
-moz-box-shadow: 0 2px 5px rgba(0,0,0,.35);
-webkit-box-shadow: 0 2px 5px rgba(0,0,0,.35);
box-shadow: 0 2px 5px rgba(0,0,0,.35);
box-shadow: 0 2px 5px rgba(0,0,0,.35);*/
}
#nav li.top {
display:block;
float:left;
margin:0 5px 0 0;
/*margin:0 5px 0 0;*/
padding: 10px;
}
#nav li a.top_link {
display:block;
@ -35,16 +36,16 @@ way to fit your requirements.
height:18px;
color:#ccc;
text-decoration:none;
font-size:11px;
text-transform:uppercase;
font-weight:bold;
padding:4px 0 0 14px;
font-size:16px;
/*text-transform:uppercase;*/
/*font-weight:bold;*/
/*padding:4px 0 0 10px;*/
cursor:pointer;
}
#nav li a.top_link span {
float:left;
display:block;
padding:0 14px 0 0;
padding: 0 14px 0 0;
}
#nav li a.top_link span.down {
float:left;
@ -55,7 +56,7 @@ way to fit your requirements.
}
#nav li:hover a.top_link, #nav li.active a.top_link, #nav li.active:hover a.top_link {
color:#fff;
background:#000;
/*background:#000;*/
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;

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

@ -1787,7 +1787,7 @@ button, input {
.user-management {
width:910px;
height: 410px;
min-height: 410px;
}
.user-management-expanded {
width:910px;
@ -3395,15 +3395,12 @@ dd .stream-status {
margin-bottom: 20px;
}
#weekly-schedule-widget label {
font-weight: bold;
}
.schedule_iframe_wrapper {
width: 100%;
float: left;
text-align: center;
padding: 10px;
background-color: #111;
padding-top: 25px;
padding-bottom: 25px;
margin-bottom: 25px;
}
#schedule_iframe {
@ -3412,6 +3409,21 @@ dd .stream-status {
/* Usability Hints */
/*
* This is a temporary solution to a larger issue;
* we should revisit this (and really all of the
* absolute positioning in Airtime) when we want
* to focus on responsive design.
*/
.usability_hint:not(.hidden) + .wrapper {
top: 105px;
-webkit-transition: top 0.2s linear;
-moz-transition: top 0.2s linear;
-o-transition: top 0.2s linear;
transition: top 0.2s linear;
}
.usability_hint {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
@ -3425,9 +3437,10 @@ dd .stream-status {
text-shadow: -1px -1px 1px rgba(0, 0, 0, 0.2);
position: fixed;
top: 139px;
width: 100%;
top: 105px;
width: 90%;
z-index: 1;
margin: 5px 10px;
}
.usability_hint a {
@ -3443,3 +3456,131 @@ dd .stream-status {
#upload_form, #recent_uploads_wrapper {
box-sizing: border-box;
}
button.btn-icon-text > i.icon-white {
margin-right: 4px;
}
/* Media type selector */
#media_type_nav {
position: absolute;
top: 105px;
bottom: 0;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
width: 130px;
flex: 1 auto;
padding: 0;
background: #353535;
border: 1px solid #242424;
border-top: 1px solid #7e7e7e;
/* border: 1px solid #242424; */
-moz-box-shadow: 0 2px 5px rgba(0,0,0,.35);
-webkit-box-shadow: 0 2px 5px rgba(0,0,0,.35);
box-shadow: 0 2px 5px rgba(0,0,0,.35);
z-index: 100;
text-align: left;
}
#media_type_nav .btn-group {
padding: 4px;
}
#new_media_selector {
width: 100%;
font-size: 14px;
}
.media_type_selector {
cursor: pointer;
color: #cecece;
font-family: Roboto, "Open Sans", sans-serif;
font-size: 16px;
font-weight: 400;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
/*margin: 20px 20px 0 5px;*/
padding: 10px 10px 10px 10px;
-webkit-transition: color 0.1s linear;
-moz-transition: color 0.1s linear;
-o-transition: color 0.1s linear;
transition: color 0.1s linear;
}
.media_type_selector.selected {
color: #fff;
background-color: #444;
-webkit-transition: color 0.1s linear;
-moz-transition: color 0.1s linear;
-o-transition: color 0.1s linear;
transition: color 0.1s linear;
}
.media_type_selector:hover, .media_type_selector a:hover {
color: #fff;
-webkit-transition: color 0.1s linear;
-moz-transition: color 0.1s linear;
-o-transition: color 0.1s linear;
transition: color 0.1s linear;
}
.media_type_selector a {
text-decoration: none;
color: #cecece;
}
.dashboard_sub_nav {
padding-left: 20px;
}
.wrapper {
/*background: #242424;*/
background: #111;
top: 105px;
left: 130px;
right: 0;
bottom: 0;
padding: 5px 10px 40px;
/*padding: 0;*/
border: none;
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
-webkit-flex-flow: row wrap;
flex-flow: row wrap;
overflow: auto;
-webkit-transition: top 0.2s linear;
-moz-transition: top 0.2s linear;
-o-transition: top 0.2s linear;
transition: top 0.2s linear;
}
/* Usability hint */
.usability_hint {
left: 130px;
flex: 0 100%;
width: 100%;
}
/* Uploads/Dropzone */
#upload_form {
width: 100%;
min-width: 555px;
margin-bottom: 10px;
}