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

NIHVIVO-556: CSS clean up

Browse source
This commit is contained in:
mb863 2010-11-09 21:56:02 +00:00
parent e18c18d2a7
commit 37d89bba4f
3 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
themes/wilma/css/screen.css
View file

@ -29,4 +29,5 @@ VIVO wilma theme: screen styles
@import url("forms.css"); @import url("forms.css");
@import url("formedit.css"); @import url("formedit.css");
@import url("../../../css/menupage/menupage.css"); /* we need to call it from the theme until freemarker controller and menupage.ftl are created */ @import url("../../../css/menupage/menupage.css"); /* we need to call it from the theme until freemarker controller and menupage.ftl are created */
@import url("../../../css/individual/individual.css"); /* we need to call it from the theme until freemarker controller and individual.ftl are created */

43
themes/wilma/css/wilma.css
View file

@ -29,6 +29,31 @@ body {
body{ body{
background: #f3f3f0 url(../images/header-background.png) center 0 no-repeat; background: #f3f3f0 url(../images/header-background.png) center 0 no-repeat;
} }
/* h1,h2,h3,h4,h5,h6 ------> */
h2{
padding: 10px 0 12px 0;
margin:0;
font-size: 22px;
color: #2485ae;
}
h3{
padding: 10px 0 12px 0;
margin:0;
font-size: 18px;
color: #2485ae;
}
h4{
padding: 10px 0 12px 0;
margin:0;
font-size: 16px;
color: #2485ae;
}
h5{
padding: 10px 0 12px 0;
margin:0;
font-size: 14px;
color: #2485ae;
}
/* HEADER ------> */ /* HEADER ------> */
#branding { #branding {
position: relative; position: relative;
@ -167,12 +192,6 @@ ul#main-nav {
padding: 20px; padding: 20px;
} }
/* INTRO ------> */ /* INTRO ------> */
h2{
padding: 10px 0 12px 0;
margin:0;
font-size: 22px;
color: #2485ae;
}
#intro { #intro {
float: left; float: left;
width: 570px; width: 570px;
@ -294,12 +313,6 @@ p.request-account a{
color:#fff; color:#fff;
} }
/* HOME SEARCH ------> */ /* HOME SEARCH ------> */
h3{
padding: 10px 0 12px 0;
margin:0;
font-size: 18px;
color: #2485ae;
}
#search-home { #search-home {
float: left; float: left;
width: 533px; width: 533px;
@ -335,12 +348,6 @@ input.search-home-vivo {
padding-left: 30px; padding-left: 30px;
} }
/* BROWSE ------> */ /* BROWSE ------> */
h4{
padding: 10px 0 12px 0;
margin:0;
font-size: 16px;
color: #2485ae;
}
#browse { #browse {
clear: both; clear: both;
width: 920px; width: 920px;

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

@ -89,10 +89,13 @@
</nav> </nav>
<div id="wrapper-content"> <div id="wrapper-content">
<#-- mb863: using for now until we have controllers page.ftl to render the two templates commented below--> <#-- mb863: using for now until we have controllers page.ftl to render the templates commented below-->
<#--<#include "menupage/menupage.ftl">--> <#--<#include "menupage/menupage.ftl">-->
<#--<#include "menupage/menupage--classgroup-people.ftl">--> <#--<#include "menupage/menupage--classgroup-people.ftl">-->
${body} <#--<#include "individual/individual--generic-class.ftl">-->
<#--<#include "individual/individual--foaf-person.ftl">-->
${body}
</div> <!-- #wrapper-content --> </div> <!-- #wrapper-content -->
<footer> <footer>