diff --git a/Rakefile b/Rakefile index acbb085..c1abfdf 100644 --- a/Rakefile +++ b/Rakefile @@ -3,8 +3,8 @@ require "bundler/setup" ## -- Rsync Deploy config -- ## # Be sure your public key is listed in your server's ~/.ssh/authorized_keys file -ssh_user = "user@domain.com" -document_root = "~/website.com/" +ssh_user = "mathisweb@octopress.org" +document_root = "~/octopress.org/" deploy_default = "rsync" # This will be configured for you when you run config_deploy diff --git a/_config.yml b/_config.yml index 25783c8..b6b4c60 100644 --- a/_config.yml +++ b/_config.yml @@ -2,17 +2,17 @@ # Main Configs # # ----------------------- # -url: http://yoursite.com -title: My Octopress Blog +url: http://octopress.org +title: Octopress subtitle: A blogging framework for hackers. -author: Your Name +author: Brandon Mathis simple_search: http://google.com/search # RSS / Email (optional) subscription links (change if using something like Feedburner) subscribe_rss: /atom.xml subscribe_email: # RSS feeds can list your email address if you like -email: +email: brandon@imathis.com # ----------------------- # # Jekyll & Plugins # @@ -38,7 +38,7 @@ recent_posts: 5 # Posts in the sidebar Recent Posts section # ----------------------- # # Twitter -twitter_user: +twitter_user: octopress twitter_tweet_count: 4 twitter_show_replies: false twitter_follow_button: true @@ -51,14 +51,14 @@ google_plus_one_size: medium # Pinboard pinboard_user: -pinboard_count: 3 +pinboard_count: 4 # Delicious delicious_user: delicious_count: 3 # Disqus Comments -disqus_short_name: +disqus_short_name: octopress # Google Analytics google_analytics_tracking_id: diff --git a/sass/custom/_colors.scss b/sass/custom/_colors.scss index 0771a86..9830ab0 100644 --- a/sass/custom/_colors.scss +++ b/sass/custom/_colors.scss @@ -1,13 +1,10 @@ -// Here you can easily change your sites's color scheme. -// To give it a try, uncomment some of the lines below rebuild your blog, and see how it works. - -//$header-bg: #263347; -//$subtitle-color: lighten($header-bg, 58); -//$nav-bg: desaturate(lighten(#8fc17a, 18), 5); -//$sidebar-bg: desaturate(#eceff5, 8); -//$sidebar-link-color: saturate(#526f9a, 10); -//$sidebar-link-color-hover: darken(#7ab662, 9); - +$header-bg: #263347; +$subtitle-color: lighten($header-bg, 58); +$nav-bg: desaturate(lighten(#8fc17a, 18), 5); +$sidebar-bg: desaturate(#eceff5, 8); +$sidebar-link-color: saturate(#526f9a, 10); +$sidebar-link-color-hover: darken(#7ab662, 9); +$pre-bg: darken($header-bg, 2); //To use the light Solarized highlighting theme uncomment this block //$base03: $base3; diff --git a/sass/custom/_layout.scss b/sass/custom/_layout.scss index 5317311..a083b62 100644 --- a/sass/custom/_layout.scss +++ b/sass/custom/_layout.scss @@ -1,7 +1,7 @@ // Here you can easily change your sites's layout. // To give it a try, uncomment some of the lines below, make changes, rebuild your blog, and see how it works. -//$max-width: 1350px; +$max-width: 1000px; //$indented-lists: true; // Padding used for layout margins diff --git a/sass/custom/_styles.scss b/sass/custom/_styles.scss index 91ffccc..bf1ce48 100644 --- a/sass/custom/_styles.scss +++ b/sass/custom/_styles.scss @@ -1,2 +1,76 @@ -// This File is imported last, and will override other styles in the cascade -// Add styles here to make changes without digging in too much +@include font-face("Bebas-Neue", font-files("bebasneue-web.woff", woff, "bebasneue-web.ttf", truetype, "bebasneue-web.svg#BebasNeueRegular", svg), $eot: "bebasneue-web.eot" ); + +body > header h1 { + font-family: "Bebas-Neue", serif; + text-transform: uppercase; + font-weight: normal; +} + +body > header { + font-size: .7em; + hgroup { + text-align: center; + position: relative; + padding: .5em 0; + margin: 0 auto; + } + h1 { + text-shadow: rgba(#000, .8) 0 0 8px; + font-size: 7em; + line-height: .8em; + position: relative; + padding-bottom: 1.75em; + margin: 0; + a:hover { color: #fff; } + &:after { + content: ""; + position: absolute; left: 0; right: 0; top: .1em; + height: image-height('logo.png'); + @include replace-text('logo.png'); + } + } + h2 { + font-size: 1.6em; + position: relative; top: .4em; + } + @media only screen and (min-width: 400px) { + font-size: .82em; + hgroup { + left: -3.7em; + width: 22em; + } + h1 { padding-bottom: 0; + &:after { + position: absolute; top: -.15em; right: -.8em; left: auto; + width: 1.6em; + height: 1.6em; + @include background-size(100%); + } + } + h2 { + margin: 0 0 .3em; + @extend .sans; + font-size: 1.2em; + color: $subtitle-color; + position: relative; left: -1.6em; top: 0; + text-shadow: $header-bg 0 1px 1px; + } + } + @media only screen and (min-width: 480px) { + font-size: .98em; + h2 { top: .4em; } + } + @media only screen and (min-width: 768px) { + padding: 2em 0 1.5; + font-size: 1.2em; + hgroup { padding: 0 0 1em; } + } + @media only screen and (min-width: 990px) { + font-size: 1.1em; + h1:after { + width: image-width('logo.png'); + height: image-height('logo.png'); + } + } +} + diff --git a/source/_includes/head.html b/source/_includes/head.html index 2654ec4..ea0cad7 100644 --- a/source/_includes/head.html +++ b/source/_includes/head.html @@ -19,7 +19,7 @@ {% endif %} - + diff --git a/source/_includes/navigation.html b/source/_includes/navigation.html index 4518fcd..be85e23 100644 --- a/source/_includes/navigation.html +++ b/source/_includes/navigation.html @@ -12,5 +12,6 @@ diff --git a/source/images/favicon.png b/source/favicon.png similarity index 100% rename from source/images/favicon.png rename to source/favicon.png diff --git a/source/fonts/bebasneue-web.eot b/source/fonts/bebasneue-web.eot new file mode 100755 index 0000000..79a8ac9 Binary files /dev/null and b/source/fonts/bebasneue-web.eot differ diff --git a/source/fonts/bebasneue-web.svg b/source/fonts/bebasneue-web.svg new file mode 100755 index 0000000..19e4c06 --- /dev/null +++ b/source/fonts/bebasneue-web.svg @@ -0,0 +1,23 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : Copyright c 2010 by Ryoichi Tsunekawa All rights reserved +Designer : Ryoichi Tsunekawa +Foundry : Ryoichi Tsunekawa + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/fonts/bebasneue-web.ttf b/source/fonts/bebasneue-web.ttf new file mode 100755 index 0000000..9717c76 Binary files /dev/null and b/source/fonts/bebasneue-web.ttf differ diff --git a/source/fonts/bebasneue-web.woff b/source/fonts/bebasneue-web.woff new file mode 100755 index 0000000..667214d Binary files /dev/null and b/source/fonts/bebasneue-web.woff differ diff --git a/source/images/logo.png b/source/images/logo.png new file mode 100644 index 0000000..b95bee6 Binary files /dev/null and b/source/images/logo.png differ