From f3e4ef15c8e352039dfb30c6488b8838a6f0038c Mon Sep 17 00:00:00 2001
From: Chuck Dries <chuck@chuckdries.com>
Date: Tue, 14 Feb 2017 02:07:43 -0700
Subject: [PATCH] Rebase with code on desktop
---
index.html | 75 +++++++++++++++++++++++++++------------------------
style.css | 6 +++--
style.css.map | 2 +-
style.scss | 21 ++++++++-------
4 files changed, 57 insertions(+), 47 deletions(-)
diff --git a/index.html b/index.html
index 7e7fab3..eb91c68 100644
--- a/index.html
+++ b/index.html
@@ -53,7 +53,6 @@
<a href="CharlesDriesResumeCurrent.pdf">Resume [pdf]</a> /
<a href="https://medium.com/@chuckdries">Blog</a>
</p>
- <p></p>
</div>
</div>
</div>
@@ -62,10 +61,8 @@
</div>
<div class="slide">
<div class="copy">
- <h1>About Me</h1>
- <div class="header">
- <h2>Overview</h2>
- </div>
+ <h1>Tech</h1>
+ <h2>Overview</h2>
<div class="right">
<p>I'm currently studying Computer Science, and I have a wealth of experience through hackathons, odd jobs,
and working with multiple tech support clients. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
@@ -76,11 +73,9 @@
Curabitur accumsan ultrices est ut dapibus.
</p>
</div>
- <div class="header">
- <h2>Skills</h2>
- </div>
+ <h2>Skills</h2>
- <div class="right">
+ <div>
<table>
<tr>
<td class="ld">Web</td>
@@ -90,39 +85,49 @@
<td class="ld">Programming</td>
<td>Java, C, C# with Unity, C++, Python, Scheme, Bash</td>
</tr>
- <tr>
- <td class="ld">Design</td>
- <td>Photoshop, InDesign, After Effects, Premiere Pro</td>
- </tr>
+
<tr>
<td class="ld">Etcetera</td>
<td>Leadership experience, KVM/LibVirt/QEMU, ESXi</td>
</tr>
</table>
</div>
- <div class="header">
- <h2>Experience</h2>
+ <h2>Experience: Jobs</h2>
+ <!--we can do some product page like stuff with pictures and everything-->
+ <h2>Experience: Projects</h2>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ </div>
+ </div>
+ <div class="slide">
+ <div class="copy">
+ <h1>Design</h1>
+ <h2>Skills</h2>
+ <div>
+ <table>
+ <tr>
+ <td class="ld">Design</td>
+ <td>Photoshop, InDesign, After Effects, Premiere Pro</td>
+ </tr>
+ </table>
</div>
- <div class="right"></div>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
</div>
</div>
<!--
diff --git a/style.css b/style.css
index 0d9841f..b3ff0c5 100644
--- a/style.css
+++ b/style.css
@@ -6,7 +6,8 @@
body {
font-family: serif;
font-size: 1em;
- line-height: 1.6; }
+ line-height: 1.6;
+ transition-duration: .2s; }
#mast {
background: none;
@@ -25,7 +26,8 @@ body {
max-width: 400px; }
.copy h1 {
- text-decoration: underline; }
+ text-decoration: underline;
+ font-style: italic; }
.nojs body {
background: white; }
diff --git a/style.css.map b/style.css.map
index 76d0904..5bc3ced 100644
--- a/style.css.map
+++ b/style.css.map
@@ -1,6 +1,6 @@
{
"version": 3,
-"mappings": "AAIA,oBAAO;EACH,OAAO,EAAE,GAAG;EACZ,MAAM,EAAE,GAAG;EACX,KAAK,EAAE,IAAI;;AAIf,IAAK;EAED,WAAW,EAAE,KAAK;EAClB,SAAS,EAAE,GAAG;EACd,WAAW,EAAE,GAAG;;AAGpB,KAAM;EACF,UAAU,EAAC,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,KAAK,EAAC,KAAK;EACX,OAAE;IACE,KAAK,EAAE,KAAK;IACZ,UAAU,EAAE,MAAM;EAEtB,aAAO;IACH,KAAK,EAxBN,OAAO;EA0BV,UAAI;IACA,UAAU,EAAC,MAAM;IACjB,KAAK,EA7BN,IAAI;EA+BP,SAAG;IACC,KAAK,EAAE,IAAI;IACX,SAAS,EAAC,KAAK;;AAInB,QAAE;EACE,eAAe,EAAE,SAAS;;AAI9B,UAAK;EACD,UAAU,EAAE,KAAK;AAErB,WAAM;EACF,UAAU,EAAE,KAAK;;AASzB,MAAO;EAEH,OAAO,EAAE,GAAG;EACZ,UAAI;IACA,kBAAkB;IAClB,SAAS,EA7DT,KAAK;IA8DL,MAAM,EAAE,IAAI;;AAIpB,KAAM;EACF,MAAM,EAAE,KAAK;EACb,KAAK,EAAE,IAAI;;AAGf,UAAW;EACP,OAAO,EAAE,KAAK;;AAGlB,MAAO;EACH,qBAAqB,EAAE,GAAG;EAC1B,SAAS,EAAE,IAAI;;AAGnB,aAAc;EACV,OAAO,EAAE,SAAS;;AAGtB,EAAG;EACC,SAAS,EAAE,GAAG;;AAGlB,EAAG;EACC,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM",
+"mappings": "AAIA,oBAAO;EACH,OAAO,EAAE,GAAG;EACZ,MAAM,EAAE,GAAG;EACX,KAAK,EAAE,IAAI;;AAIf,IAAK;EAED,WAAW,EAAE,KAAK;EAClB,SAAS,EAAE,GAAG;EACd,WAAW,EAAE,GAAG;EAChB,mBAAmB,EAAE,GAAG;;AAG5B,KAAM;EACF,UAAU,EAAE,IAAI;EAChB,WAAW,EAAE,GAAG;EAChB,KAAK,EAAE,KAAK;EACZ,OAAE;IACE,KAAK,EAAE,KAAK;IACZ,UAAU,EAAE,MAAM;EAEtB,aAAO;IACH,KAAK,EAzBN,OAAO;EA2BV,UAAK;IACD,UAAU,EAAE,MAAM;IAClB,KAAK,EA9BN,IAAI;EAgCP,SAAI;IACA,KAAK,EAAE,IAAI;IACX,SAAS,EAAE,KAAK;;AAKpB,QAAG;EACC,eAAe,EAAE,SAAS;EAC1B,UAAU,EAAE,MAAM;;AAKtB,UAAK;EACD,UAAU,EAAE,KAAK;AAErB,WAAM;EACF,UAAU,EAAE,KAAK;;AASzB,MAAO;EAEH,OAAO,EAAE,GAAG;EACZ,UAAI;IACA,kBAAkB;IAClB,SAAS,EAjET,KAAK;IAkEL,MAAM,EAAE,IAAI;;AAIpB,KAAM;EACF,MAAM,EAAE,KAAK;EACb,KAAK,EAAE,IAAI;;AAGf,UAAW;EACP,OAAO,EAAE,KAAK;;AAGlB,MAAO;EACH,qBAAqB,EAAE,GAAG;EAC1B,SAAS,EAAE,IAAI;;AAGnB,aAAc;EACV,OAAO,EAAE,SAAS;;AAGtB,EAAG;EACC,SAAS,EAAE,GAAG;;AAGlB,EAAG;EACC,WAAW,EAAE,MAAM;EACnB,UAAU,EAAE,MAAM",
"sources": ["style.scss"],
"names": [],
"file": "style.css"
diff --git a/style.scss b/style.scss
index 531f5a8..b990cba 100644
--- a/style.scss
+++ b/style.scss
@@ -14,13 +14,13 @@ body {
font-family: serif;
font-size: 1em;
line-height: 1.6;
- transition-duration: .5s;
+ transition-duration: .2s;
}
#mast {
- background:none;
+ background: none;
line-height: 1.2;
- color:white;
+ color: white;
a {
color: white;
font-style: italic;
@@ -28,20 +28,23 @@ body {
a:hover{
color: $pink;
}
- .sub{
- font-style:italic;
+ .sub {
+ font-style: italic;
color: $grey;
}
- img{
+ img {
width: 100%;
- max-width:400px;
+ max-width: 400px;
}
}
-.copy{
- h1{
+
+.copy {
+ h1 {
text-decoration: underline;
+ font-style: italic;
}
}
+
.nojs {
body {
background: white;