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

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

Browse source
This commit is contained in:
drigato 2015-08-18 07:46:39 -04:00
commit d30e32c2d3
12 changed files with 73 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -567,23 +567,27 @@ li.ui-state-default {
padding: 4px;
}
#save_button, #webstream_save {
background: #ff5d1a;
color: #fff;
border-radius: 4px;
font-size: 16px;
height: 38px;
width: 120px;
}
/*#save_button, #webstream_save {*/
/*background: #ff5d1a;*/
/*color: #fff;*/
/*border-radius: 4px;*/
/*font-size: 16px;*/
/*height: 38px;*/
/*width: 120px;*/
/*}*/
#save_button:active, #webstream_save {
color: #fff !important;
}
/*#save_button:active, #webstream_save {*/
/*color: #fff !important;*/
/*}*/
#save_button:focus, #webstream_save {
outline-width: 0;
}
#edit-md-dialog .zend_form dd:last-child {
width: 160px;
}
/* Smart Block Editor */
.btn-toolbar {

4
airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css vendored
View file

@ -111,13 +111,13 @@
border: 1px solid #202020;
border-top: 1px solid #353535;
border-left: 1px solid #2a2a2a;
background-color: #242424;
color: #e2e2e2;
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.65);
-moz-box-shadow: inset 0 0 6px rgba(0,0,0,.65);
box-shadow: inset 0 0 6px rgba(0,0,0,.65);
background-color: #242424;
color: #e2e2e2;
}
.ui-widget-content a {

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

@ -47,8 +47,6 @@ h3 {
color: #efefef;
padding: 10px;
margin:0;
background-color: #5E5E5E;
border-top:1px solid #9d9d9d;
}
a, a:focus {
outline:none;
@ -62,6 +60,8 @@ select {
border:1px solid #9d9d9d;
}
/* Fix for Firefox */
fieldset {
clear: both;
@ -70,8 +70,6 @@ fieldset {
.logo {
position: absolute;
float: left;
background: transparent url(images/airtime_logo_med.png) no-repeat 0 0;
height: 46px;
width: 120px;
left: 5px;
@ -1078,7 +1076,6 @@ fieldset {
border: 1px solid #222;
margin: 0;
padding: 0;
background-color: #333;
}
fieldset.plain {
@ -1719,6 +1716,11 @@ h2#scheduled_playlist_name span {
width: 100%;
}
#stream_form h3 {
background-color: #5E5E5E;
border-top:1px solid #9d9d9d;
}
.stream-setting-content dd.block-display {
/*width: 60%;*/
}
@ -3533,7 +3535,6 @@ button.btn-icon-text > i.icon-white {
.wrapper {
position: absolute;
/*background: #242424;*/
top: 102px;
left: 130px;
right: 0;
@ -3541,8 +3542,6 @@ button.btn-icon-text > i.icon-white {
padding: 5px 10px 40px;
border: none;
background: #111;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
@ -3621,6 +3620,16 @@ button.btn-icon-text > i.icon-white {
width: 100%;
}
#listenerstat_content .legendLabel
{
color: #d6d6d6;
}
.dashboard-btn {
width: 50%;
}
#his_submit {
height: 19px;
margin-top: -2px;
}