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

Merge branch '2.5.x' into 2.5.x-installer

Browse source 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php
This commit is contained in:
Albert Santoni 2015-01-16 17:27:52 -05:00
commit c03dd38c00
74 changed files with 560 additions and 2142 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,10 +10,11 @@ body {
}
html, body {
height: 100%;
background: #7f7f7f;
}
#login-page {
background: #1f1f1f url(images/login_page_bg.png) no-repeat center 0;`
background: #1f1f1f url(images/login_page_bg.png) no-repeat center 0;
margin: 0;
padding: 0;
height:100%;
@ -1002,7 +1003,28 @@ input[type="checkbox"] {
display:block;
}
dt.block-display, dd.block-display {
#pref_form dt, #pref_form dd,
#pref_form textarea {
display:block;
float:none;
margin-left:0;
padding-left:0;
width: 100%;
}
#pref_form textarea {
width: 98.5%;
}
#pref_form select {
width: 100%;
}
#pref_form p.description {
color: #3b3b3b;
font-size: 12px;
float: left;
}
dt.block-display, dd.block-display {
display:block;
float:none;
margin-left:0;