Merge branch 'master' into dev

This commit is contained in:
hacksalot 2018-02-02 15:39:29 -05:00
commit 514e44339b
2 changed files with 62 additions and 10 deletions

View File

@ -1,6 +1,7 @@
html, body, main, section, header, ul, p, h1, h2, h3 { html, body, main, section, header, ul, p, h1, h2, h3 {
font-family: {{{fontList 'default'}}}; font-family: {{{fontList 'default'}}};
font-size: 14px; font-size: 14px;
line-height: 1.4;
margin: 0; padding: 0; margin: 0; padding: 0;
display: block; display: block;
} }
@ -38,7 +39,8 @@ h3, .tenure {
h3 { h3 {
margin-top: 0; margin-top: 0;
width: 66%; margin-bottom: 5px;
width: 85%;
float: left; float: left;
} }
@ -50,8 +52,8 @@ table {
td:first-child { td:first-child {
text-align: right; text-align: right;
color: #A9A9A9; color: #c00000;
letter-spacing: 5px; letter-spacing: 2px;
font-weight: bold; font-weight: bold;
} }
@ -70,7 +72,7 @@ main {
} }
section { section {
margin-top: 1em; margin-top: 2em;
} }
section > div { section > div {
@ -86,6 +88,10 @@ section > header {
position: relative; position: relative;
} }
p + ul {
margin: 1em;
}
ul { ul {
clear: both; clear: both;
} }
@ -113,7 +119,7 @@ p, li {
} }
span.keywords { span.keywords {
font-size: 10px; font-size: 12px;
color: #B16666; color: #B16666;
} }
@ -141,6 +147,11 @@ h1, h2, .label {
#contact { #contact {
clear: both; clear: both;
float: right; float: right;
margin-top: 2px;
}
#contact span + span {
margin-left: 10px;
} }
header > span.fa { header > span.fa {
@ -163,4 +174,10 @@ header > span.fa {
#summary { #summary {
color: #717171; color: #717171;
font-size: 1.25em; font-size: 1.25em;
margin-top: 6em;
}
#skills td {
padding-top: 7px;
padding-bottom: 7px;
} }

View File

@ -1,6 +1,7 @@
html, body, main, section, header, ul, p, h1, h2, h3 { html, body, main, section, header, ul, p, h1, h2, h3 {
font-family: Calibri, 'Open Sans', sans-serif; font-family: Calibri, 'Open Sans', sans-serif;
font-size: 14px; font-size: 14px;
line-height: 1.4;
margin: 0; padding: 0; margin: 0; padding: 0;
display: block; display: block;
} }
@ -31,10 +32,15 @@ h2 {
font-weight: 400; font-weight: 400;
} }
h3, .tenure {
font-size: 1.5em;
font-weight: 300;
}
h3 { h3 {
font-size: 1em;
margin-top: 0; margin-top: 0;
width: 66%; margin-bottom: 5px;
width: 85%;
float: left; float: left;
} }
@ -46,8 +52,8 @@ table {
td:first-child { td:first-child {
text-align: right; text-align: right;
color: #A9A9A9; color: #c00000;
/*letter-spacing: 5px;*/ /* letter-spacing: 2px; PDF hates letter spacing */
font-weight: bold; font-weight: bold;
} }
@ -66,7 +72,7 @@ main {
} }
section { section {
margin-top: 1em; margin-top: 2em;
} }
section > div { section > div {
@ -82,6 +88,14 @@ section > header {
position: relative; position: relative;
} }
p + ul {
margin: 1em;
}
ul {
clear: both;
}
li { li {
margin-left: 2em; margin-left: 2em;
} }
@ -92,6 +106,16 @@ p, li {
.tenure { .tenure {
float: right; float: right;
color: #6F6F6F;
background-color: #F5F5F5;
border-radius: 6px;
padding: 4px 6px;
font-size: 85%;
}
span.keywords {
font-size: 12px;
color: #B16666;
} }
thead { thead {
@ -118,6 +142,11 @@ h1, h2, .label {
#contact { #contact {
clear: both; clear: both;
float: right; float: right;
margin-top: 2px;
}
#contact span + span {
margin-left: 10px;
} }
header > span.fa { header > span.fa {
@ -140,4 +169,10 @@ header > span.fa {
#summary { #summary {
color: #717171; color: #717171;
font-size: 1.25em; font-size: 1.25em;
margin-top: 6em;
}
#skills td {
padding-top: 7px;
padding-bottom: 7px;
} }