Skip to content

Commit

Permalink
Changing font to Museo slab. Also uploading resume.
Browse files Browse the repository at this point in the history
  • Loading branch information
Laura authored and Laura committed Sep 18, 2012
1 parent 74ee491 commit c9a6e63
Show file tree
Hide file tree
Showing 11 changed files with 498 additions and 4 deletions.
18 changes: 15 additions & 3 deletions assets/css/bootstrap.css
Expand Up @@ -8,6 +8,18 @@
* Designed and built with all the love in the world @twitter by @mdo and @fat.
*/

@font-face {
font-family: 'MuseoSlab500Regular';
src: url('Museo_Slab_500-webfont.eot');
src: url('Museo_Slab_500-webfont.eot?#iefix') format('embedded-opentype'),
url('Museo_Slab_500-webfont.woff') format('woff'),
url('Museo_Slab_500-webfont.ttf') format('truetype'),
url('Museo_Slab_500-webfont.svg#MuseoSlab500Regular') format('svg');
font-weight: normal;
font-style: normal;

}

article,
aside,
details,
Expand Down Expand Up @@ -159,7 +171,7 @@ textarea {

body {
margin: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: "MuseoSlab500Regular";
font-size: 14px;
line-height: 20px;
color: #333333;
Expand Down Expand Up @@ -940,7 +952,7 @@ input,
button,
select,
textarea {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: "MuseoSlab500Regular";
}

label {
Expand Down Expand Up @@ -4294,7 +4306,7 @@ input[type="submit"].btn.btn-mini {
.navbar-search .search-query {
padding: 4px 14px;
margin-bottom: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: "MuseoSlab500Regular";
font-size: 13px;
font-weight: normal;
line-height: 1;
Expand Down
Binary file not shown.
241 changes: 241 additions & 0 deletions assets/fonts/museoslab_500_macroman/Museo_Slab_500-webfont.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion index.html
Expand Up @@ -43,7 +43,7 @@
<ul class="nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li>
<li><a href="#resume">Resume</a></li>
<li><a href="lauradhamilton_resume.pdf">Resume</a></li>
<li><a href="#contact">Contact</a></li>
</ul>
</div><!--/.nav-collapse -->
Expand Down
Binary file added lauradhamilton_resume.pdf
Binary file not shown.

0 comments on commit c9a6e63

Please sign in to comment.