lib.typ

@@ -3,20 +3,19 @@
 #let DEFAULT_STRONG = 300;
 #let SMALL_STRONG = 200;
 
-#let TITLE_FONT = "New Computer Modern"
+#let TITLE_FONT = "Bitter"
 #let HEADING_FONT = TITLE_FONT
-#let BODY_FONT = "New Computer Modern"
+#let BODY_FONT = "Open Sans"
 
-#let BODY_FONT_SIZE = 11pt
+#let BODY_FONT_SIZE = 10pt
 #let HEADING_FONT_SIZE = 0.95em
 #let TITLE_FONT_SIZE = 2em
 
 #let HEADING_LINE_GAP = 3mm
-#let BODY_LINE_HEIGHT = 0.65em
+#let BODY_LINE_HEIGHT = 0.8em
-#let BODY_LINE_SPACING = 0.75em
 
 // rest = not top
-#let PAGE_MARGINS = (right: 0.4in, rest: 0.3in)
+#let PAGE_MARGINS = (rest: 0.5in, top: 0.4in, left: 0.4in, bottom: 0.4in)
 
 // Format locations.
 #let format_location(location) = {
@@ -24,15 +23,15 @@
 }
 
 #let indent(content) = {
-  block(inset: (left: 0em, right: 0em), content)
+  block(inset: (left: 0.75em, right: 0.5em), content)
 }
 
 // General entry that is split into a left and right half (for experience and education).
 #let cv_entry(left_content: none, right_content: none, details: none) = {
   stack(
     dir: ttb,
-    spacing: 0.75em,
+    spacing: 0.9em,
-    grid(columns: (9fr, 5fr), column-gutter: 1cm, {
+    grid(columns: (11fr, 3fr), column-gutter: 1cm, {
       set strong(delta: DEFAULT_STRONG)
       set align(left)
       left_content
@@ -69,13 +68,22 @@
     none
   }
   cv_entry(left_content: {
-    set par(justify: true)
+    set par(leading: 0.75em)
-    text[*#company* | _#role _]
+    text(1.1em)[*#role*]
+
+    if tools != none {
+      text[ | _ #tools _ ]
+    }
+
+    "\n"
+    set strong(delta: SMALL_STRONG)
+    text[*#company*]
   }, right_content: {
-    [#start_date -- #end_date]
+    [*#start_date -- #end_date*]
-    // if location != none {
+
-    // format_location(location)
+    if location != none {
-    // }
+      "\n" + format_location(location)
+    }
   }, details: task_list)
 }
 
@@ -83,17 +91,17 @@
   set strong(delta: DEFAULT_STRONG)
   let text_link = if demo_link != none { demo_link } else { repo_link }
   if text_link != none {
-    link(text_link)[#text[*#title*]]
+    link(text_link)[#text(1.1em)[*#title*]]
   } else {
-    text[*#title*]
+    text(1.1em)[*#title*]
   }
 
   if demo_link != none {
-    link(demo_link)[ #fa(link-icon) ]
+    link(demo_link)[#text(1.1em)[ #fa(link-icon) ]]
   }
 
   if repo_link != none {
-    link(repo_link)[ #fa(github) ]
+    link(repo_link)[#text(1.1em)[ #fa(github) ]]
   }
   [ | _ #tools _ ]
 }
@@ -110,15 +118,11 @@
 // Set name and contact data and format headings
 #let template(name, color, doc) = {
   set page(margin: PAGE_MARGINS, paper: "us-letter")
-  set list(indent: 0.75em, marker: [•])
+  set list(indent: 1em, marker: [•])
   set text(font: (BODY_FONT), BODY_FONT_SIZE)
-  set par(leading: BODY_LINE_HEIGHT)
+  set par(justify: true, leading: BODY_LINE_HEIGHT)
   align(center)[
-    #text(
+    #text(size: TITLE_FONT_SIZE, font: TITLE_FONT, fill: color)[*#name*]
-      size: TITLE_FONT_SIZE,
-      font: TITLE_FONT,
-      fill: color,
-    )[#smallcaps[*#name*]]
     #block(above: 0em, below: 1em)
   ]