Permalink
Browse files

updated: style, added: syntax plugin on blog units

  • Loading branch information...
bow committed Apr 14, 2012
1 parent 6d3b045 commit c6e06b5c270458b42ff5c463b0cba38f1bd42621
Showing with 16 additions and 12 deletions.
  1. +6 −11 assets/css/main.css
  2. +4 −0 templates/base.html
  3. +6 −1 voltconf.py
View
@@ -41,7 +41,7 @@
text-align: left;
clear: both;
margin: auto;
- width: 640px;
+ width: 670px;
}
/* Headings */
@@ -120,14 +120,14 @@
background: #eee;
margin-bottom: 1.6em;
padding: .5em 1em;
- border-top: 1px solid #888;
- border-bottom: 1px solid #888;
+ border-top: 1px solid #aaa;
+ border-bottom: 1px solid #aaa;
font-family: 'Inconsolata', 'Courier New', 'Courier', monospace;
line-height: 1.3em;
font-size: 1.04em;
white-space: pre;
+ overflow: auto;
}
- pre:hover {border-top: 1px solid #DB1212; border-bottom: 1px solid #DB1212;}
/* Iframe, Object */
iframe, object {
@@ -176,11 +176,6 @@
border: 1px solid #ccc;
}
- /* Figure Caption */
- figure:hover figcaption {background: #266AC9; color: #fdfdfd; }
- figure:hover figcaption a {color: #111;}
- figure:hover figcaption a:hover, figure:hover figcaption a:active {color: #fdfdfd;}
-
/* Article */
article {
font-size: 1.3em;
@@ -224,7 +219,7 @@
top: 0;
position: fixed;
background: #fdfdfd;
- width: 640px;
+ width: 670px;
}
#top hr, #paginate hr {
@@ -407,7 +402,7 @@
/* Pagination */
#paginate {
- width: 640px;
+ width: 670px;
margin: 1em 0 -1em;
font-family: 'Maven Pro', 'Trebuchet Ms', Verdana, sans-serif;
font-size: 1.2em;
View
@@ -16,6 +16,10 @@
<script type="text/javascript" src="/js/custom.js"></script>
<link rel="shortcut icon" href="/favicon.ico" />
<link rel="stylesheet" type="text/css" href="/css/main.css" />
+ {% if "blog" in page.permalink %}
+ <link rel="stylesheet" type="text/css" href="/css/syntax_highlight.css" />
+ {% endif %}
+ <link rel="stylesheet" type="text/css" href="/css/main.css" />
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Maven+Pro" />
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Inconsolata" />
<!--[if IE]>
View
@@ -35,10 +35,15 @@
PAGINATIONS = ('', 'tag/{tags}', '{time:%Y/%m}', '{time:%Y}',),
UNITS_PER_PAGINATION = 5,
EXCERPT_LENGTH = 400,
- PLUGINS = ('markdown_parser', 'atomic',),
+ PLUGINS = ('syntax', 'markdown_parser', 'atomic',),
)
# Plugins configurations
PLUGIN_ATOMIC = Config(
OUTPUT_FILE = os.path.join(os.getcwd(), 'site', 'atom.xml'),
)
+
+PLUGIN_SYNTAX = Config(
+ CSS_FILE = os.path.join(os.getcwd(), 'site', 'css', 'syntax_highlight.css'),
+ LINENO = False,
+)

0 comments on commit c6e06b5

Please sign in to comment.