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

Merge branch '2.1.x' into devel

Browse source 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
This commit is contained in:
denise 2012-06-29 10:57:14 -04:00
commit 335dd1516b
40 changed files with 1084 additions and 870 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -808,6 +808,12 @@ dt.block-display, dd.block-display {
font-size:14px;
padding: 6px 10px 6px;
}
.login-content dd button.ui-button, .login-content dd button.btn {
width:100%;
font-size:14px;
padding: 6px 10px 6px;
}
.login-content .hidden, .hidden {
display:none;
}