merge -r 905:908 -r 922 -c 946 -r 984:986 -r 1014:1029 from 1048 http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint

This commit is contained in:
rjy7 2010-07-22 18:44:32 +00:00
parent b96d1008b0
commit 9eebeba4f9
6 changed files with 34 additions and 195 deletions

View file

@ -277,6 +277,8 @@ div.description { margin-bottom: 1.5em; }
/* margin-bottom: .75em;*/
padding: 4px 12px;
float: left;
/* Fixes in IE6 the cut off text for data and object property names for individual display property groups. */
*padding-left:24px !important;
}
.propsItem,
@ -745,29 +747,37 @@ display:none !important;
style for those with javascript disable
************************/
#javascriptDisableWrapper{
#javascriptDisableWrapper, ie67DisableWrapper{
margin-top:15px;
width:500px;
height:300px;
}
#javascriptDisableContent{
#javascriptDisableContent, #ie67DisableContent{
width:500px;
height:100px;
border:3px solid #bee6f8;
}
#javascriptDisableContent img{
#ie67DisableContent{
width:80%;
margin-bottom:200px;
}
#javascriptDisableContent img, #ie67DisableContent img{
float:left;
margin-top:36px;
margin-left:30px;
}
#javascriptDisableContent p{
#javascriptDisableContent p, #ie67DisableContent p{
font-size:1.1em;
color:#384c5d;
line-height:100px;
padding-left:65px;
}
#ie67DisableContent p{
line-height:normal;
padding-top:36px;
}
/* styles for error alerts */