Permalink
Browse files

upgraded octopress

  • Loading branch information...
1 parent 91741b4 commit 8bd53936baac4c00bb97f901c4cb4ce5a821a547 @dharmastyle dharmastyle committed Feb 19, 2013
View
@@ -0,0 +1,38 @@
+## What is Octopress?
+
+Octopress is [Jekyll](https://github.com/mojombo/jekyll) blogging at its finest.
+
+1. **Octopress sports a clean responsive theme** written in semantic HTML5, focused on readability and friendliness toward mobile devices.
+2. **Code blogging is easy and beautiful.** Embed code (with [Solarized](http://ethanschoonover.com/solarized) styling) in your posts from gists, jsFiddle or from your filesystem.
+3. **Third party integration is simple** with built-in support for Twitter, Pinboard, Delicious, GitHub Repositories, Disqus Comments and Google Analytics.
+4. **It's easy to use.** A collection of rake tasks simplifies development and makes deploying a cinch.
+5. **Ships with great plug-ins** some original and others from the Jekyll community — tested and improved.
+
+
+## Documentation
+
+Check out [Octopress.org](http://octopress.org/docs) for guides and documentation.
+
+
+## Contributing
+
+[![Build Status](https://travis-ci.org/imathis/octopress.png?branch=master)](https://travis-ci.org/imathis/octopress)
+
+We love to see people contributing to Octopress, whether it's a bug report, feature suggestion or a pull request. At the moment, we try to keep the core slick and lean, focusing on basic blogging needs, so some of your suggestions might not find their way into Octopress. For those ideas, we started a [list of 3rd party plug-ins](https://github.com/imathis/octopress/wiki/3rd-party-plugins), where you can link your own Octopress plug-in repositories. For the future, we're thinking about ways to easier add them them into our main releases.
+
+
+## License
+(The MIT License)
+
+Copyright © 2009-2011 Brandon Mathis
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ‘Software’), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+#### If you want to be awesome.
+- Proudly display the 'Powered by Octopress' credit in the footer.
+- Add your site to the Wiki so we can watch the community grow.
View
@@ -1,226 +1,86 @@
-.container {
- background-color: none;
-}
-#hero {
- position: fixed;
- top: 0;
- width: 100%;
- background-attachment: scroll;
- background-clip: border-box;
- background-color: #323232;
- background-image: url("/images/heroBack.jpg");
- background-origin: padding-box;
- background-position: 0 0;
- background-repeat: repeat;
- background-size: auto auto;
- margin: 0px;
- padding: 75px;
- z-index: -1;
- height: 550px;
-}
-#hero-inner {
- font-family: 'Cantarell', sans-serif;
- margin-top: 50px;
-}
-#hero-inner h1 {
- font-size: 60px;
-}
-#hero-inner em {
- font-style: normal;
- color: #99CDE3;
- text-shadow: -1px -1px 2px #FAFAFA, 1px 1px 2px #070707;
-}
-body {
- background-attachment: scroll;
- background-clip: border-box;
- background-color: #323232;
- background-image: none;
- background-origin: padding-box;
- background-position: 0 0;
- background-repeat: repeat;
- background-size: auto auto;
-}
-article {
- background-attachment: scroll;
- background-clip: padding-box;
- background-color: #FFFFFF;
- background-image: none;
- background-origin: padding-box;
- background-position: 0 0;
- background-repeat: repeat;
- background-size: auto auto;
- border-bottom-left-radius: 6px;
- border-bottom-right-radius: 6px;
- border-top-left-radius: 6px;
- border-top-right-radius: 6px;
- box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.2);
- margin-bottom: 30px;
-}
-article h1 {
- margin-top: 0px;
-}
-#front-wrapper {
- background-color: #F1F1F1;
- margin-top: 500px;
- border-top-color: white;
- border-top-style: solid;
- border-top-width: 1px;
- border-bottom-color: white;
- border-bottom-style: solid;
- border-bottom-width: 1px;
-}
-#archive-wrapper {
- background-color: #F1F1F1;
- border-top-color: white;
- border-top-style: solid;
- border-top-width: 1px;
- border-bottom-color: white;
- border-bottom-style: solid;
- border-bottom-width: 1px;
-}
-.wrapper_single {
- background-color: #F1F1F1;
- background-image: url("/images/heroBack.jpg");
- background-attachment: fixed;
- padding-top: 75px;
- padding-bottom: 75px;
- border-bottom-color: white;
- border-bottom-style: solid;
- border-bottom-width: 1px;
- min-height: 500px;
-}
-.single_article {
- margin: 25px;
-}
-.footer {
- background-attachment: scroll;
- background-clip: border-box;
- background-color: #323232;
- background-image: none;
- background-origin: padding-box;
- background-position: 0 0;
- background-repeat: repeat;
- background-size: auto auto;
- color: #E4E4E4;
- font-size: 1em;
- padding-bottom: 1.618em;
- padding-left: 25px;
- padding-right: 25px;
- padding-top: 1.618em;
- margin: 0px;
-}
-.footer p {
- color: #E4E4E4;
- font-size: 12px;
-}
-.navbar {
- margin-bottom: 0px;
-}
-.meta {
- color: gray;
- font-size: 10px;
-}
-#sub-hero {
- background-attachment: scroll;
- background-clip: border-box;
- background-color: #FFFFFF;
- background-image: none;
- background-origin: padding-box;
- background-position: 0 0;
- background-repeat: repeat;
- background-size: auto auto;
- border-bottom-color: #F1F1F1;
- border-bottom-style: solid;
- border-bottom-width: 1px;
- box-shadow: 0 1px 0 0 #FFFFFF;
- padding: 20px;
- margin-bottom: 30px;
-}
-.social_icon {
- display: inline;
- opacity: .7;
- margin: 0px 0px 0px 1px;
-}
-dt .social_icon {
- margin-left: 5px;
-}
-.dl-horizontal dd {
- margin-bottom: 5px;
-}
-.dl-horizontal dt {
- margin-bottom: 5px;
-}
-.article-format {
- padding: 2em;
-}
-.archive-article-format {
- padding: 1em;
-}
-#footer-widgets {
- background-attachment: scroll;
- background-clip: border-box;
- background-color: #FFFFFF;
- background-image: none;
- background-origin: padding-box;
- background-position: 0 0;
- background-repeat: repeat;
- background-size: auto auto;
- border-top-color: #F1F1F1;
- border-top-style: solid;
- border-top-width: 1px;
- padding: 20px;
-}
-.tweet_avatar {
- display: none;
-}
-.tweet_time {
- display: none;
-}
-.tweet_list {
- margin: 0px;
- padding: 0px;
-}
-.tweet_list li {
- margin: 10px 0px;
- border-radius: 10px;
- background-color: #ECECEC;
- padding: 5px;
-}
-#instabutton {
- width: 230px;
-}
-.instagram-placeholder {
- width: 100px;
- height: 100px;
- margin: 5px;
- display: inline;
- float: left;
-}
-.table td .code {
- padding: 0px;
- margin: 0px;
- vertical-align: middle;
- border: none;
-}
+$noise-bg: image-url('noise.png') top left !default;
+$img-border: inline-image('dotted-border.png');
+
+// Main Link Colors
+$link-color: lighten(#165b94, 3) !default;
+$link-color-hover: adjust-color($link-color, $lightness: 10, $saturation: 25) !default;
+$link-color-visited: adjust-color($link-color, $hue: 80, $lightness: -4) !default;
+$link-color-active: adjust-color($link-color-hover, $lightness: -15) !default;
-.table td .gutter {
- padding: 0px;
- margin: 0px;
- vertical-align: middle;
- border: none;
+// Main Section Colors
+$main-bg: #f8f8f8 !default;
+$page-bg: #252525 !default;
+$article-border: #eeeeee !default;
+
+$header-bg: #333 !default;
+$header-border: lighten($header-bg, 15) !default;
+$title-color: #f2f2f2 !default;
+$subtitle-color: #aaa !default;
+
+$text-color: #222 !default;
+$text-color-light: #aaa !default;
+$type-border: #ddd !default;
+
+/* Navigation */
+$nav-bg: #ccc !default;
+$nav-bg-front: image-url('noise.png') !default;
+$nav-bg-back: linear-gradient(lighten($nav-bg, 8), $nav-bg, darken($nav-bg, 11)) !default;
+$nav-color: darken($nav-bg, 38) !default;
+$nav-color-hover: darken($nav-color, 25) !default;
+$nav-placeholder: desaturate(darken($nav-bg, 10), 15) !default;
+$nav-border: darken($nav-bg, 10) !default;
+$nav-border-top: lighten($nav-bg, 15) !default;
+$nav-border-bottom: darken($nav-bg, 25) !default;
+$nav-border-left: darken($nav-bg, 11) !default;
+$nav-border-right: lighten($nav-bg, 7) !default;
+
+/* Sidebar colors */
+$sidebar-bg: #f2f2f2 !default;
+$sidebar-link-color: $link-color !default;
+$sidebar-link-color-hover: $link-color-hover !default;
+$sidebar-link-color-active: $link-color-active !default;
+$sidebar-color: change-color(mix($text-color, $sidebar-bg, 80), $hue: hue($sidebar-bg), $saturation: saturation($sidebar-bg)/2) !default;
+$sidebar-border: desaturate(darken($sidebar-bg, 7), 10) !default;
+$sidebar-border-hover: darken($sidebar-bg, 7) !default;
+$sidebar-link-color-subdued: lighten($sidebar-color, 20) !default;
+$sidebar-link-color-subdued-hover: $sidebar-link-color-hover !default;
+$twitter-status-link: lighten($sidebar-link-color-subdued, 15) !default;
+
+$footer-color: #888 !default;
+$footer-bg: #ccc !default;
+$footer-bg-front: image-url('noise.png') !default;
+$footer-bg-back: linear-gradient(lighten($footer-bg, 8), $footer-bg, darken($footer-bg, 11)) !default;
+$footer-color: darken($footer-bg, 38) !default;
+$footer-color-hover: darken($footer-color, 10) !default;
+$footer-border-top: lighten($footer-bg, 15) !default;
+$footer-border-bottom: darken($footer-bg, 15) !default;
+$footer-link-color: darken($footer-bg, 38) !default;
+$footer-link-color-hover: darken($footer-color, 25) !default;
+$page-border-bottom: darken($footer-bg, 5) !default;
+
+
+/* Core theme application */
+
+a {
+ @include link-colors($link-color, $hover: $link-color-hover, $focus: $link-color-hover, $visited: $link-color-visited, $active: $link-color-active);
}
-table code {
- white-space: inherit;
- word-wrap: initial;
- word-break: initial;
+aside.sidebar a {
+ @include link-colors($sidebar-link-color, $hover: $sidebar-link-color-hover, $focus: $sidebar-link-color-hover, $active: $sidebar-link-color-active);
}
-.tooltip.top.home {
- margin-top: -503px;
+a {
+ @include transition(color .3s);
}
-p {
- line-height: 1.7;
- margin: 0 0 20px;
+
+html {
+ background: $page-bg image-url('line-tile.png') top left;
}
-.recent_posts {
- list-style-type: disc;
+body {
+ > div {
+ background: $sidebar-bg $noise-bg;
+ border-bottom: 1px solid $page-border-bottom;
+ > div {
+ background: $main-bg $noise-bg;
+ border-right: 1px solid $sidebar-border;
+ }
+ }
}
Oops, something went wrong.

0 comments on commit 8bd5393

Please sign in to comment.