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

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

Browse source
This commit is contained in:
drigato 2015-10-21 11:01:20 -04:00
commit b98f573531
14 changed files with 111 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/public/css/billing.css
View file

@ -225,6 +225,14 @@
color: #ff0000;
}
.invoice-status-good {
background: #e3ffc9 url(images/stream_status.png) no-repeat 10px 10px;
border-color: #54b300;
padding: 2px 12px 4px 32px;
margin: 2px 1px 10px 0px;
color: #330;
}
/** This form is the separate one on the Billing Account Details page (BillingClient.php) */
#clientdetails_form {
width: 500px;

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

@ -288,15 +288,13 @@ select {
color:#ff5d1a;
}
.now-playing-block {
/*width:35%;*/
flex: 1 auto;
flex: 1 0;
background: url(images/masterpanel_spacer.png) no-repeat 0 0;
margin-left: 152px;
padding-left: 14px;
}
.show-block {
/*width:30%;*/
flex: 1 auto;
flex: 1 0;
}
.text-row {
height:30px;
@ -3817,10 +3815,8 @@ hr {
}
.disk_usage_progress_bar {
position: absolute;
left: 4px;
right: 4px;
/* width: 118px; */
float: left;
width: 100%;
height: 13px;
background: #444444;
background: -moz-linear-gradient(top, #464646 0, #3e3e3e 100%);
@ -3846,7 +3842,7 @@ hr {
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #ff6f01), color-stop(100%, #bc5200));
height:13px;
z-index: 2;
position:absolute;
position: relative;
}
.dropdown-menu li > a:hover, .dropdown-menu li > a:focus, .dropdown-submenu:hover > a
@ -3962,4 +3958,4 @@ li .ui-state-hover {
}
/* jQuery dialog */
.no-close .ui-dialog-titlebar-close {display: none }
.no-close .ui-dialog-titlebar-close {display: none }