From bfc7d975b3671ced17434dc6ba0d27718c7a8147 Mon Sep 17 00:00:00 2001 From: Marc Cataford Date: Tue, 22 Dec 2015 18:43:51 -0500 Subject: [PATCH] Added font definitions and size changes. --- css/style.css | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/css/style.css b/css/style.css index 582941c..fd7a74b 100644 --- a/css/style.css +++ b/css/style.css @@ -29,10 +29,6 @@ body { display: inline; } -.social ul li a { - color: #000; -} - p { line-height: 1.2; margin: 0 0; @@ -86,15 +82,17 @@ p { margin: 0 1em; } -#main-menu ul li a { - color: #000; - text-decoration: none; +a { + color :#727272; } -#main-menu ul li a:hover { +a:hover { color: #03A9F4; } +a i { + color: inherit; +} /* * RESUME PANEL @@ -146,8 +144,9 @@ p { * MODIFIERS */ -.fs-5 { font-size: 2.5em; } -.fs-1-3 { font-size: 1.3em; } +.large { font-size: 3.0em; } +.accentsize { font-size: 1.4em; } +.basesize { font-size: 1.2em; } .bold { font-weight: bold; } @@ -163,11 +162,24 @@ p { transform: translateY(-50%); } -.red { color: #ff0000; } -.white { color: #fff; } - .primarytext {color :#727272;} .accent {color:#03A9F4;} -.accentsize { font-size: 1.3em; } -.regularsize { font-size: 1.0em; } \ No newline at end of file + + +/* +* FONT DATA +*/ + +.opensans { font-family: OpenSans; } +.oswald { font-family: Oswald; } + +@font-face { + font-family: OpenSans; + src: url("../fonts/OpenSans-CondLight.ttf") format("truetype"); +} + +@font-face { + font-family: Oswald; + src: url("../fonts/Oswald-Light.ttf") format("truetype"); +} \ No newline at end of file