From 2b59a0f8355ae8b4bf71cf5c2a365de91f5ebe1b Mon Sep 17 00:00:00 2001 From: Ben Burwell Date: Mon, 30 Mar 2015 02:46:14 -0400 Subject: redesign --- assets/fonts/FontAwesome.otf | Bin 0 -> 93888 bytes assets/fonts/fontawesome-webfont.eot | Bin 0 -> 60767 bytes assets/fonts/fontawesome-webfont.svg | 565 ++++++++++++++++++++++++++++++ assets/fonts/fontawesome-webfont.ttf | Bin 0 -> 122092 bytes assets/fonts/fontawesome-webfont.woff | Bin 0 -> 71508 bytes assets/fonts/fontawesome-webfont.woff2 | Bin 0 -> 56780 bytes assets/fonts/icomoon.eot | Bin 2832 -> 0 bytes assets/fonts/icomoon.svg | 16 - assets/fonts/icomoon.ttf | Bin 2668 -> 0 bytes assets/fonts/icomoon.woff | Bin 2088 -> 0 bytes assets/scripts/d3/gender_terms_v1.js | 2 +- assets/scripts/d3/party_affiliation_v0.js | 2 +- assets/scripts/d3/religion_v0.js | 2 +- assets/scripts/d3/religion_v1.js | 2 +- assets/stylesheets/site.scss | 256 +------------- assets/stylesheets/viewtime.css | 107 ------ 16 files changed, 578 insertions(+), 374 deletions(-) create mode 100644 assets/fonts/FontAwesome.otf create mode 100644 assets/fonts/fontawesome-webfont.eot create mode 100644 assets/fonts/fontawesome-webfont.svg create mode 100644 assets/fonts/fontawesome-webfont.ttf create mode 100644 assets/fonts/fontawesome-webfont.woff create mode 100644 assets/fonts/fontawesome-webfont.woff2 delete mode 100755 assets/fonts/icomoon.eot delete mode 100755 assets/fonts/icomoon.svg delete mode 100755 assets/fonts/icomoon.ttf delete mode 100755 assets/fonts/icomoon.woff delete mode 100644 assets/stylesheets/viewtime.css (limited to 'assets') diff --git a/assets/fonts/FontAwesome.otf b/assets/fonts/FontAwesome.otf new file mode 100644 index 0000000..f7936cc Binary files /dev/null and b/assets/fonts/FontAwesome.otf differ diff --git a/assets/fonts/fontawesome-webfont.eot b/assets/fonts/fontawesome-webfont.eot new file mode 100644 index 0000000..33b2bb8 Binary files /dev/null and b/assets/fonts/fontawesome-webfont.eot differ diff --git a/assets/fonts/fontawesome-webfont.svg b/assets/fonts/fontawesome-webfont.svg new file mode 100644 index 0000000..1ee89d4 --- /dev/null +++ b/assets/fonts/fontawesome-webfont.svg @@ -0,0 +1,565 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/fonts/fontawesome-webfont.ttf b/assets/fonts/fontawesome-webfont.ttf new file mode 100644 index 0000000..ed9372f Binary files /dev/null and b/assets/fonts/fontawesome-webfont.ttf differ diff --git a/assets/fonts/fontawesome-webfont.woff b/assets/fonts/fontawesome-webfont.woff new file mode 100644 index 0000000..8b280b9 Binary files /dev/null and b/assets/fonts/fontawesome-webfont.woff differ diff --git a/assets/fonts/fontawesome-webfont.woff2 b/assets/fonts/fontawesome-webfont.woff2 new file mode 100644 index 0000000..3311d58 Binary files /dev/null and b/assets/fonts/fontawesome-webfont.woff2 differ diff --git a/assets/fonts/icomoon.eot b/assets/fonts/icomoon.eot deleted file mode 100755 index 4d2f63b..0000000 Binary files a/assets/fonts/icomoon.eot and /dev/null differ diff --git a/assets/fonts/icomoon.svg b/assets/fonts/icomoon.svg deleted file mode 100755 index 85bbf46..0000000 --- a/assets/fonts/icomoon.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - \ No newline at end of file diff --git a/assets/fonts/icomoon.ttf b/assets/fonts/icomoon.ttf deleted file mode 100755 index 91d0c07..0000000 Binary files a/assets/fonts/icomoon.ttf and /dev/null differ diff --git a/assets/fonts/icomoon.woff b/assets/fonts/icomoon.woff deleted file mode 100755 index 9cfef60..0000000 Binary files a/assets/fonts/icomoon.woff and /dev/null differ diff --git a/assets/scripts/d3/gender_terms_v1.js b/assets/scripts/d3/gender_terms_v1.js index ba510e0..2446ee1 100644 --- a/assets/scripts/d3/gender_terms_v1.js +++ b/assets/scripts/d3/gender_terms_v1.js @@ -1,5 +1,5 @@ (function() { - var width = 960; + var width = 900; var height = 500; var color = d3.scale.category10(); diff --git a/assets/scripts/d3/party_affiliation_v0.js b/assets/scripts/d3/party_affiliation_v0.js index ed7b576..853fed5 100644 --- a/assets/scripts/d3/party_affiliation_v0.js +++ b/assets/scripts/d3/party_affiliation_v0.js @@ -1,6 +1,6 @@ (function() { - var width = 960; + var width = 900; var height = 700; var radius = Math.min(width, height) / 2; diff --git a/assets/scripts/d3/religion_v0.js b/assets/scripts/d3/religion_v0.js index 6391195..d7d2232 100644 --- a/assets/scripts/d3/religion_v0.js +++ b/assets/scripts/d3/religion_v0.js @@ -40,7 +40,7 @@ return religion_array; }; - var width = 960; + var width = 900; var barHeight = 25; var margin = 215; diff --git a/assets/scripts/d3/religion_v1.js b/assets/scripts/d3/religion_v1.js index 4b8f733..425b71f 100644 --- a/assets/scripts/d3/religion_v1.js +++ b/assets/scripts/d3/religion_v1.js @@ -27,7 +27,7 @@ return religion_array; }; - var width = 960; + var width = 900; var height = 400; var radius = Math.min(width, height) / 2; diff --git a/assets/stylesheets/site.scss b/assets/stylesheets/site.scss index ce30820..e36909d 100644 --- a/assets/stylesheets/site.scss +++ b/assets/stylesheets/site.scss @@ -1,250 +1,12 @@ --- --- -@import "normalize"; -@import "global"; -@import "960-responsive"; -// @import "syntax"; - -body { - font-family: $serif; - font-size: 20px; - color: $black; -} - -h1, h2, h3, h4, h5, h6 { - font-family: $sans; - font-weight: 200; - margin-top: 1em; - margin-bottom: 0.5em; - text-align: center; - padding-left: 10%; - padding-right: 10%; -} - -a { - color: $red; - text-decoration: none; - @include transition(color, $link-fade-time, ease); - - &:hover { - color: darken($red, $link-darken-amount); - } - - &.project { - color: $blue; - &:hover { - color: darken($blue, $link-darken-amount); - } - } - - &.post { - color: $magenta; - &:hover { - color: darken($magenta, $link-darken-amount); - } - } -} - -p { - line-height: 2em; - margin-bottom: 2em; - margin-top: 2em; -} - -pre { - margin-bottom: 2em; - margin-top: 2em; -} - -blockquote { - width: 80%; - margin-right: auto; - margin-left: auto; - margin-top: 0; - margin-bottom: 0; - position: relative; - - quotes: "\201C""\201D""\2018""\2019"; - - &:before { - content: open-quote; - color: $base1; - font-size: 4em; - margin: 0; - padding: 0; - line-height: 0; - position: absolute; - left: -0.7em; - top: 0.5em; - font-family: $monospace; - } -} - -table { - margin-top: 1em; - margin-bottom: 1em; -} - -table.data-table td { - font-size: 0.8em; - padding: 0.5em; - vertical-align: top; -} - -ul { - list-style-type: square; -} - -ul, ol { - margin-left: 2em; - margin-bottom: 1em; -} - -li { - margin-bottom: 1em; -} - -code { - font-family: $monospace; - font-size: 0.8em; - // color: $base1; -} - -kbd { - font-size: 0.7em; - border: 1px solid $base1; - border-radius: 3px; - padding: 1px 5px; - border-bottom-width: 2px; - color: $base01; - font-family: $monospace; -} - -footer { - font-family: $monospace; - text-align: center; - border-top: 2px solid $base1; - padding-top: 1em; - padding-bottom: 1em; - font-size: 0.8em; - @include transition(color, $link-fade-time, ease); - color: $base1; - - a { - color: $base1; - } - - &:hover { - color: $black; - - a { - color: $red; - &:hover { - color: darken($red, $link-darken-amount); - } - } - } -} - -hr { - width: 20%; - border-width: 2px; - border-style: solid none none none; - border-color: $base1; -} - -aside { - // font-style: italic; - width: 80%; - margin-left: auto; - margin-right: auto; - text-align: center; - color: $base01; -} - -header { - a { - font-family: $sans; - font-weight: 200; - color: $white; - display: block; - border: none; - text-align: center; - padding: 0.5em; - @include transition(all, $link-fade-time, ease); - - &:hover { - color: $white; - } - } - - .projects { - @include nav_button($blue); - } - - .posts { - @include nav_button($magenta); - } - - .github { - @include nav_button($green); - } - - .resume { - @include nav_button($orange); - } -} - -.about { - width: 80%; - margin-left: auto; - margin-right: auto; -} - -.portrait { - width: 200px; - height: 200px; - margin-top: 2em; - margin-left: auto; - margin-right: auto; - background-image: url('/assets/images/ben_circle.png'); - background-repeat: no-repeat; -} - -.center { - text-align: center; -} - -.right { - text-align: right; -} - -.date { - // margin-bottom: 1em; - font-family: $monospace; - // font-weight: 200; - color: $base1; - text-align: center; -} - -article { - img { - max-width: 100%; - } -} - -@media print { - body { - color: #000; - } - - a { - color: #000; - } - - header, footer { - display: none; - visibility: hidden; - } -} +@import "mixins"; +@import "variables"; +@import "utility"; +@import "respond"; +@import "base"; +@import "typography"; +@import "brand"; +@import "font-awesome/font-awesome"; +@import "print" diff --git a/assets/stylesheets/viewtime.css b/assets/stylesheets/viewtime.css deleted file mode 100644 index b37bebc..0000000 --- a/assets/stylesheets/viewtime.css +++ /dev/null @@ -1,107 +0,0 @@ -* { - padding: 0; - margin: 0; -} - -html { - font-family: 'Helvetica', sans-serif; - font-size: 24px; - text-align: center; - background-color: #2A2A2A; - color: #2A2A2A; -} - -.container { - background-color: #FFFFFF; - -webkit-box-shadow: 0px 0px 30px 10px rgba(0,0,0,0.75); - -moz-box-shadow: 0px 0px 30px 10px rgba(0,0,0,0.75); - box-shadow: 0px 0px 30px 10px rgba(0,0,0,0.75); - width: 960px; - max-width: 100%; - min-width: 240px; - margin-left: auto; - margin-right: auto; - padding-bottom: 1em; -} - -a { - text-decoration: none; -} - -p { - padding-top: 40px; - width: 90%; - margin-left: auto; - margin-right: auto; -} - -h1 { - width: 960px; - max-width: 100%; - min-width: 240px; - height: 250px; - background-image: -o-linear-gradient(-89deg, #C02126 0%, #4A1112 100%); - background-image: -moz-linear-gradient(-89deg, #C02126 0%, #4A1112 100%); - background-image: -ms-linear-gradient(-89deg, #C02126 0%, #4A1112 100%); - background-image: linear-gradient(-179deg, #C02126 0%, #4A1112 100%); - font-size: 72px; - line-height: 250px; - color: #FFFFFF; - text-shadow: 0px 2px 4px rgba(0,0,0,0.50); -} - -a#install_button { - border-radius: 10px; - font-size: 48px; - padding: 10px 120px; -} - -.inactive { - background-color: #AAAAAA; - color: #cccccc; -} - -.active { - color: #FFFFFF; - text-shadow: 0px -2px 0px rgba(0,0,0,0.50); - background-image: -o-linear-gradient(-89deg, #86C01E 0%, #2F6F15 100%); - background-image: -moz-linear-gradient(-89deg, #86C01E 0%, #2F6F15 100%); - background-image: -ms-linear-gradient(-89deg, #86C01E 0%, #2F6F15 100%); - background-image: linear-gradient(-179deg, #86C01E 0%, #2F6F15 100%); -} - -.active:hover { - background-image: -o-linear-gradient(-89deg, #6DA705 0%, #165600 100%); - background-image: -moz-linear-gradient(-89deg, #6DA705 0%, #165600 100%); - background-image: -ms-linear-gradient(-89deg, #6DA705 0%, #165600 100%); - background-image: linear-gradient(-179deg, #6DA705 0%, #165600 100%); - text-shadow: 0px -2px 0px rgba(0,0,0,0.50); -} - -.active:active { - background-image: -o-linear-gradient(-89deg, #165600 0%, #6DA705 100%); - background-image: -moz-linear-gradient(-89deg, #165600 0%, #6DA705 100%); - background-image: -ms-linear-gradient(-89deg, #165600 0%, #6DA705 100%); - background-image: linear-gradient(-179deg, #165600 0%, #6DA705 100%); - text-shadow: 0px 2px 0px rgba(0,0,0,0.50); -} - -p img { - padding: 10px; -} - -.install_tagline { - font-size: 14px; - padding-top: 10px; -} - -#safari_text, #chrome_text { - display: none; -} - -.home_link { - font-size: 18px; - color: #dc322f; - letter-spacing: 1px; - text-transform: uppercase; -} -- cgit v1.2.3