Permalink
Browse files

Started from scratch.

  • Loading branch information...
1 parent 3991b84 commit 80c4d2ad38a8e85ba3d45a319f1a8b0c9ce56095 @kuyan committed Dec 25, 2012
Showing with 10 additions and 320 deletions.
  1. +1 −1 less/main.less
  2. +0 −281 sass/_grid.sass
  3. +0 −6 sass/_mixins.sass
  4. +0 −23 sass/styles.sass
  5. 0 static/css/{main.css → styles.css}
  6. +9 −9 templates/base.html
View
2 less/main.less
@@ -529,4 +529,4 @@ blockquote, code, .codehilite, .post ul, .post ol, p, .archive{
@import "print.less";
}
-@import "codehilite.less";
+//@import "codehilite.less";
View
281 sass/_grid.sass
@@ -1,281 +0,0 @@
-/*
-*
-* Golden Grid System (1.0) <http://goldengridsystem.com/>
-* by Joni Korpi <http://jonikorpi.com/>
-* licensed under MIT <http://opensource.org/licenses/mit-license.php>
-*
-*/
-
-
-// Important numbers
-
-$line: 24
-$column: 100% / 18
-$font-size: 16
-$em: $font-size * 1
-
-// Consistency fixes
-
-html
- height: 100%
-
-body
- min-height: 100%
- font-size: 100%
-
-input, textarea, button, select
- line-height: normal
-
-
-// Simple fluid media
-
-figure
- position: relative
-
-figure img, figure object, figure embed, figure video
- max-width: 100%
- display: block
-
-img
- border: 0
- -ms-interpolation-mode: bicubic
-
-
-// Zoomable baseline grid
-// type size presets
-
-body {
- /* 16px / 24px */
- font-size: $font-size / 16 * 1em;
- line-height: #{$line / $em}em;
-}
-
-@mixin small {
- /* 13px / 18px */
- font-size: #{($font-size*0.8125) / $em}em;
- line-height: ($line*0.75) / ($font-size*0.8125) * 1em;
-}
-@mixin normal {
- /* 16px / 24px */
- font-size: #{$font-size / $em}em;
- line-height: #{$line / $em}em; /* 24 */
-}
-
-h3 {
- @include normal;
-}
-
-@mixin large {
- /* 26 / 36px */
- font-size: #{26 / $em}em;
- line-height: ($line*1.5) / 26 * 1em;
-}
-
-h2, h1 {
- @include large;
-}
-
-@mixin huge {
- /* 42px / 48px */
- font-size: #{42 / $em}em;
- line-height: ($line*2) / 42 * 1em;
-}
-
-@mixin massive {
- /* 68px / 72px */
- font-size: #{68 / $em}em;
- line-height: ($line*3) / 68 * 1em;
-}
-
-@mixin gigantic {
- /* 110px / 120px */
- font-size: #{110 / $em}em;
- line-height: ($line*5) / 110 * 1em;
-}
-
-
-/*
-*
-* Four-column grid active
-* ----------------------------------------
-* Margin | # 1 2 3 4 | Margin
-* 5.55555% | % 25 50 75 100 | 5.55555%
-*
-*/
-
-header, #twoway {
- margin: 0 $column;
-}
-
-h1, h2 {
- margin: (24/26*1em) 0 (36/26*1em);
-}
-
-h2 {
- font-weight: normal;
-}
-
-h3 {
- margin: #{24/$em}em 0 #{24/$em}em;
-}
-
-/*
-* Simple elastic gutters
-* Note: box-sizing will not work in IE6-7
-*/
-
-.wrapper {
- padding: 0 #{($line/2)/$em}em;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- -ms-box-sizing: border-box;
- box-sizing: border-box;
-}
-
-/* @media screen and (min-width: 640px) */
-@media screen and (min-width: 40em) {
-
- body {
- /* Zoom baseline grid to 17/16 = 1.0625 */
- font-size: #{($font-size + 1) / $em}em;
- }
-
- h1 {
- @include huge;
- margin: (48/42*1em) 0 (24/42*1em);
- }
-
-}
-
-
-/*
-*
-* Eight-column grid active
-* ----------------------------------------------------------------------
-* Margin | # 1 2 3 4 5 6 7 8 | Margin
-* 5.55555% | % 12.5 25.0 37.5 50.0 62.5 75.0 87.5 100 | 5.55555%
-*
-*
-*/
-
-/* @media screen and (min-width: 720px) */
-@media screen and (min-width: 45em) {
-
- body {
- /* Reset baseline grid to 16/16 = 1 */
- font-size: #{($font-size) / $em}em;
- }
-
- #twoway .wrapper {
- float: left;
- width: 50%;
- }
-
-}
-
-
-/* @media screen and (min-width: 888px) */
-@media screen and (min-width: 55.5em) {
-
- body {
- /* Zoom baseline grid to 17/16 = 1.0625 */
- font-size: #{($font-size + 1) / $em}em;
- }
-}
-
-
-/* @media screen and (min-width: 984px) */
-@media screen and (min-width: 61.5em) {
-
- body {
- /* Reset baseline grid to 16/16 = 1.0 */
- font-size: #{($font-size) / $em}em;
- }
-
- header, #twoway {
- margin: 0 $column*3;
- }
-
-}
-
-
-/* @media screen and (min-width: 1200px) */
-@media screen and (min-width: 75em) {
-
- body {
- /* Zoom baseline grid to 17/16 = 1.0625 */
- font-size: #{($font-size + 1) / $em}em;
- }
-
-}
-
-
-/* @media screen and (min-width: 1392px) */
-@media screen and (min-width: 87em) {
-
- body {
- /* Reset baseline grid to 16/16 = 1.0 */
- font-size: #{($font-size) / $em}em;
- }
-
- header, #twoway {
- margin: 0 $column*5;
- }
-
-}
-
-
-/* @media screen and (min-width: 1680px) */
-@media screen and (min-width: 105em) {
-
- body {
- /* Zoom baseline grid to 17/16 = 1.0625 */
- font-size: #{($font-size + 1) / $em}em;
- }
-
-}
-
-
-/*
-*
-* Sixteen-column grid active
-* ----------------------------------------------------------------------------------------------------------------------
-* Margin | # 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | Margin
-* 5.55555% | % 6.25 12.5 18.75 25.0 31.25 37.5 43.75 50.0 56.25 62.5 68.75 75.0 81.25 87.5 93.75 100 | 5.55555%
-*
-*
-*/
-
-/* @media screen and (min-width: 1872px) */
-@media screen and (min-width: 117em) {
-
- header, #twoway {
- margin: 0 $column*1;
- }
-
- header .wrapper {
- width: 37.5%;
- margin-left: 25%;
- }
-
- #twoway .wrapper {
- width: 25%;
- }
-
- #twoway .wrapper:first-child {
- margin-left: 25%;
- }
-
-}
-
-
-/* @media screen and (min-width: 2080px) */
-@media screen and (min-width: 130em) {
-
- body {
- /* Zoom baseline grid to 18/16 = 1.125 */
- font-size: #{($font-size + 2) / $em}em;
- max-width: (2560/$em)em;
- }
-
-}
View
6 sass/_mixins.sass
@@ -1,6 +0,0 @@
-@mixin border-image($width, $slice, $url, $repeat)
- border-width: $width
- -moz-border-image: url($url) $slice $repeat
- -webkit-border-image: url($url) $slice $repeat
- -o-border-image: url($url) $slice $repeat
- border-image: url($url) $slice $repeat
View
23 sass/styles.sass
@@ -1,23 +0,0 @@
-@import mixins
-
-// Header
-// header
-// @include border-image(0 0 2px, 0 0 2, '../images/2px.png', repeat); // It's a very small detail, delete this line if you want different colors and don't want to edit the image file
-// .gradient(@color, darken(@color, 6%));
-// margin-bottom: (@line * 2px);
-// padding: (@line * 1px) @column;
-
-// h1{
-// margin: 0;
-// }
-
-// a{
-// color: fade(@white, 80%);
-// text-decoration: none;
-
-// &:hover{
-// color: @white;
-// text-decoration:none;
-// }
-// }
-// }
View
0 static/css/main.css → static/css/styles.css
File renamed without changes.
View
18 templates/base.html
@@ -9,20 +9,19 @@
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, target-densitydpi=160dpi, initial-scale=1.0">
- <link href='http://fonts.googleapis.com/css?family=Droid+Sans:700,400|Droid+Sans+Mono' rel='stylesheet' type='text/css'>
- <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
+ <!-- !fix Serve normalize.css from Github while I'm developing the theme. -->
+ <link rel="stylesheet" type="text/css" href="//raw.github.com/jonathantneal/normalize.css/master/normalize.min.css">
+ <link href="//fonts.googleapis.com/css?family=Droid+Sans:700,400|Droid+Sans+Mono" rel="stylesheet" type="text/css">
+ <link rel="stylesheet" href="{{ SITEURL }}/theme/css/styles.css" type="text/css">
<!--[if lt IE 9]>
<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
- {% block scripts %}
- {% endblock %}
-
<link href="{{ SITEURL }}/{{ FEED }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
- {% if FEED_RSS %}
+ {% if FEED_RSS -%}
<link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
- {% endif %}
+ {%- endif %}
</head>
<body>
@@ -39,8 +38,8 @@ <h1 class="huge"><a href="{{ SITEURL }}">{{ SITENAME }}</a></h1>
<footer class="clearfix">
<div class="wrapper pages">
<ul class="nav">
- {% for p in PAGES %}
- <li><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
+ {% for page in PAGES %}
+ <li><a href="{{ SITEURL }}/{{ p.url }}">{{ page.title }}</a></li>
{% endfor %}
<li><a href="{{ SITEURL }}/archives.html">Archive</a></li>
</ul>
@@ -57,6 +56,7 @@ <h1 class="huge"><a href="{{ SITEURL }}">{{ SITENAME }}</a></h1>
Proudly powered by <a href="http://docs.getpelican.com/en/3.1.1/">Pelican</a>.</p>
</div>
</footer>
+{% block scripts -%}{%- endblock %}
{% include '_google-analytics.html' %}
</body>
</html>

0 comments on commit 80c4d2a

Please sign in to comment.