litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-556: Changed wrong end tag for h1 on branding section.

Browse source
This commit is contained in:
mb863 2010-11-05 17:42:46 +00:00
parent 16bd448853
commit 0083cd84a7
4 changed files with 77 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
themes/wilma/css/wilma.css
View file

@ -201,23 +201,20 @@ h2{
#log-in { #log-in {
float:right; float:right;
width:314px; width:314px;
height: 348px; height:390px;
border:1px solid #e8ece9; border:1px solid #e8ece9;
margin-right:25px; margin-right:25px;
margin-top:20px; margin-top:20px;
padding-bottom:30px; padding-bottom:30px;
margin-bottom:30px; margin-bottom:30px;
} }
#log-in h3 { #log-in h2 {
font-size: 22px; font-size: 22px;
color: #2485ae; color: #2485ae;
padding-left:15px; padding-left:15px;
padding-top:18px; padding-top:18px;
border-bottom:none; border-bottom:none;
} }
form#log-in-form {
padding-bottom: 0
}
#log-in label { #log-in label {
display:block; display:block;
font-size: 14px; font-size: 14px;
@ -226,9 +223,12 @@ form#log-in-form {
padding-left:38px; padding-left:38px;
font-size:14px; font-size:14px;
} }
div.input-field { #log-in input.text-field {
width: 229px; border:0;
height: 34px; font-size:14px;
padding:5px;
width:219px;
height:24px;
margin-left:38px; margin-left:38px;
margin-top:7px; margin-top:7px;
background: #fff; background: #fff;
@ -237,62 +237,58 @@ div.input-field {
-moz-border-radius: 5px; -moz-border-radius: 5px;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
} }
#log-in input { #log-in input.text-field:focus {
margin-left: 7px; border:1px solid rgba(57, 138, 172, 0.5);
margin-top: 7px; background-color: rgba(57, 138, 172, 0.1);
border: 0;
font-size: 14px;
} }
#log-in input.login { #log-in p.submit {
margin: 7px 4px 10px 0; width:100px;
} height:40px;
#wrapper-submit-remember-me {
width: 270px;
margin-left: 38px;
margin-top:20px; margin-top:20px;
margin-left:38px;
float:left;
} }
#remember-me { #log-in input.checkbox-remember-me {
float: right;
width: 170px;
height: 20px;
margin: 0;
padding: 0;
padding-top: 5px;
}
#remember-me input.checkbox-remember-me {
float:left; float:left;
height:14px; height:14px;
width:14px; width:14px;
color: #5e6363; color: #5e6363;
font-size: 12px;
padding:0; padding:0;
margin: 0; margin-top:33px;
margin-left:20px;
} }
#remember-me .label-remember-me { #log-in .label-remember-me {
display:block; display:block;
float:right; float:right;
color: #5e6363; color: #5e6363;
font-size:12px; font-size:12px;
width:100px; width:100px;
padding: 0px; margin:0;
padding-right: 50px; padding:0;
padding-top: 1px; margin-top:30px;
margin-right:25px;
padding-right:10px;
} }
p.forgot-password { p.forgot-password {
clear:both;
margin-left:38px; margin-left:38px;
font-size:12px; font-size:12px;
} }
p.forgot-password a { p.forgot-password a {
color: #2485ae color: #2485ae;
} }
#request-account { p.request-account {
width:219px;
clear:both; clear:both;
float:left; float:left;
margin-left:38px; margin-left:38px;
margin-top: 0; margin-top:10px;
padding-top: 15px; padding-top:20px;
border-top:1px solid #e8ece9; border-top:1px solid #e8ece9;
} }
p.request-account a{
color:#fff;
}
/* HOME SEARCH ------> */ /* HOME SEARCH ------> */
#search-home { #search-home {
float: left; float: left;
@ -664,13 +660,14 @@ p{
border-bottom: 1px solid rgba(0, 0, 0, 0.25);*/ border-bottom: 1px solid rgba(0, 0, 0, 0.25);*/
position: relative; position: relative;
cursor: pointer; cursor: pointer;
border:0;
} }
.button:hover { .button:hover {
background-color: #111; background-color: #111;
color: #fff; color: #fff;
} }
.button:active { .button:active {
top: 1px top: 1px;
} }
.small.button, .small.button,
.small.button:visited { .small.button:visited {
@ -684,17 +681,17 @@ p{
} }
.green.button, .green.button,
.green.button:visited { .green.button:visited {
background-color: #749a02 background-color: #749a02;
} }
.green.button:hover { .green.button:hover {
background-color: #b2d15a background-color: #b2d15a;
} }
.blue.button, .blue.button,
.blue.button:visited { .blue.button:visited {
background-color: #398aac background-color: #398aac;
} }
.blue.button:hover { .blue.button:hover {
background-color: #58a2c1 background-color: #58a2c1;
} }
/* MISCELLANEOUS------> */ /* MISCELLANEOUS------> */

2
themes/wilma/templates/menu.ftl
View file

@ -2,7 +2,7 @@
<#-- This is a temporary file and will be removed once we have completed the transition to freemarker --> <#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
<header id="branding"> <header id="branding">
<h1 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2> <h1 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
<!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline} <!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
<#if siteTagline?has_content> <#if siteTagline?has_content>

2
themes/wilma/templates/page-home.ftl
View file

@ -33,7 +33,7 @@
<body> <body>
<header id="branding"> <header id="branding">
<h1 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2> <h1 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
<!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline} <!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
<#if siteTagline?has_content> <#if siteTagline?has_content>
<em>${siteTagline}</em> <em>${siteTagline}</em>

2
themes/wilma/templates/page.ftl
View file

@ -28,7 +28,7 @@
<body> <body>
<header id="branding"> <header id="branding">
<h1 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h2> <h1 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
<!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline} <!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
<#if siteTagline?has_content> <#if siteTagline?has_content>
<em>${siteTagline}</em> <em>${siteTagline}</em>