Merge branch 'develop'

This commit is contained in:
2012-01-09 02:36:55 +00:00
4 changed files with 82 additions and 58 deletions

Binary file not shown.

View File

@@ -5,52 +5,74 @@
@import url('http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css');
@CHARSET "UTF-8";
body {
margin: 0em;
margin-top: 60px;
padding-top: 40px;
padding: 0em;
font-family: verdana, helvetica, sans-serif;
background: #F7F7F7;
@media all {
body {
margin: 0em;
margin-top: 60px;
padding-top: 40px;
padding: 0em;
font-family: verdana, helvetica, sans-serif;
background: #F7F7F7;
}
a {
color: gray;
}
label {
margin-left: 1em;
margin-right: 1em;
}
footer {
padding: 2em;
font-size: smaller;
font-style: italic;
color: #333333;
text-align: center;
}
/*
Images
*/
img.avatar {
float: right;
vertical-align: top;
border: 1px solid grey;
padding: 0.2em;
margin: 0.75em;
}
img.at {
height: 1em;
width: 1em;
}
/*
Homepage
*/
ol.employment,ol.education {
list-style: none;
margin-left: 0px;
}
}
a {
color: gray;
}
label {
margin-left: 1em;
margin-right: 1em;
}
footer {
padding: 2em;
font-size: smaller;
font-style: italic;
color: #333333;
text-align: center;
}
/*
Images
*/
img.avatar {
float: right;
vertical-align: top;
border: 1px solid grey;
padding: 0.2em;
margin: 0.75em;
}
img.at {
height: 1em;
width: 1em;
}
/*
Homepage
*/
ol.employment,ol.education {
list-style: none;
margin-left: 0px;
@media print {
.no-print {
display: none;
}
body {
margin: 0;
}
#page_content {
margin-left: 1.5em;
}
#skills {
page-break-before: always;
}
}

View File

@@ -1,8 +1,8 @@
<h2>Curriculum Vitae</h2>
<h2 class="no-print">Curriculum Vitae</h2>
<div class="container">
<div class="row">
<div class="row no-print">
<div class="span4 column">
<h3>Download</h3>
</div>
@@ -17,7 +17,7 @@
</div>
</div>
<div class="row">
<div class="row" id="personal-info">
<div class="span4 column">
<h3>Personal Information</h3>
</div>
@@ -38,7 +38,7 @@
</div>
</div>
<div class="row">
<div class="row" id="employment">
<div class="span4 column">
<h3>Employment</h3>
</div>
@@ -97,7 +97,7 @@
</p>
</li>
<li>
<li class="no-print">
<h4>
Electronics and Computer Science Faculty, University of Southampton
<small>September 2006 - June 2010</small>
@@ -113,7 +113,7 @@
</div>
</div>
<div class="row">
<div class="row" id="certification">
<div class="span4 column">
<h3>Certification</h3>
</div>
@@ -135,7 +135,7 @@
</div>
</div>
<div class="row">
<div class="row" id="education">
<div class="span4 column">
<h3>Education</h3>
</div>
@@ -210,7 +210,7 @@
</div>
</div>
<div class="row">
<div class="row" id="skills">
<div class="span4 column">
<h3>Skills</h3>
</div>
@@ -296,7 +296,7 @@
</div>
</div>
<div class="row">
<div class="row" id="interests">
<div class="span4 column">
<h3>Interests</h3>
</div>

View File

@@ -29,7 +29,7 @@
</head>
<body>
<div class="topbar">
<div class="topbar no-print">
<div class="topbar-inner">
<div class="container-fluid">
{$page->include_template('navigation')}
@@ -70,10 +70,12 @@
</div><!-- /messages -->
{/if}
{$page_content}
<div id="page_content">
{$page_content}
</div>
</div>
<footer>
<footer class="no-print">
<p>
Powered by
<a href="https://github.com/optiz0r/homepage/" title="Homepage">Homepage</a>