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

Merge branch 'saas-dev' into saas-tunein

Browse source 
Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
This commit is contained in:
drigato 2015-05-19 15:50:16 -04:00
commit a2a9e54553
18 changed files with 238 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1788,7 +1788,7 @@ ul.errors {
width:278px;
}
ul.errors li {
ul.errors li, .warning {
color:#902d2d;
font-size:11px;
padding:2px 4px;
@ -1798,6 +1798,11 @@ ul.errors li {
list-style: none;
}
.warning-label {
font-size: medium;
text-align: center;
}
div.success{
color:#3B5323;
font-size:11px;
@ -2255,14 +2260,9 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
.radio-inline-list label {
margin-right:12px;
}
.preferences.simple-formblock dd.block-display {
width: 100%;
}
.preferences.simple-formblock dd.block-display select, .stream-config.simple-formblock dd.block-display select {
width: 100%;
}
.preferences dd.block-display .input_select, .stream-config dd.block-display .input_select {
.preferences.simple-formblock dd.block-display,
.preferences.simple-formblock dd.block-display select, .stream-config.simple-formblock dd.block-display select,
.preferences dd.block-display .input_select, .stream-config dd.block-display .input_select {
width: 100%;
}
.preferences dd.block-display .input_text_area, .preferences dd.block-display .input_text
@ -2284,6 +2284,15 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
margin-bottom: 4px;
}
.preferences #Logo-img-container {
margin-top: 30px;
}
.centered {
margin: 0 auto;
display: block;
}
#show_time_info {
font-size:12px;
height:30px;
@ -3251,4 +3260,4 @@ dd .stream-status {
.enable-tunein {
font-weight:bold;
}
}