From: Gabriel Dunne Date: Sat, 29 May 2010 03:29:42 +0000 (-0700) Subject: quilime update X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=1ebfdbadb3cc9e359b21085326ac3ff19d7172de;p=plog_bk.git quilime update --- diff --git a/css/style.css b/css/style.css index 7240b20..677585e 100644 --- a/css/style.css +++ b/css/style.css @@ -1,41 +1,37 @@ +body { margin:80px 100px 50px 40px; } +html, body, table { font-family: times, helvetica, sans; font-size:15px; line-height:1.3em; color:#999; } -body { margin:10px 100px 50px 40px; } -html, body, table { font-family: helvetica; font-size:11px; line-height:1.5em; color:#222; } +.nav { position:absolute; z-index:1; top:20px; left:20px; } +.nav ul { margin-left:1em; } +.nav h1 { margin-bottom:50px;} + +#head { position:absolute; top: 20px; left: 160px;} /*selection*/ ::-moz-selection {background: #08f !important; color:#fff;} ::selection {background: #08f !important; color:#fff;} /*links*/ -a { color:#60d; border:0; text-decoration:none; } +a { color:#555; border:0; padding:0.2em 0.1em 0.1em 0em; font-weight:bold; text-decoration:none; } a img { border:0; } -a.mute { color:#555; } -a:hover, a.mute:hover { color:#fa4; background:#ffa; text-decoration:none; } -.caption a { color:#888;} -.caption a:hover { color:#905;} +a.mute { } +a:hover, a.mute:hover { color:#d15; border-bottom:2px solid #d15; text-decoration:none; } /*headings*/ -h1, h2, h3, h4, h5, h6 { color:#444; font-size:1em; } -h1 { margin:0 0 3em 0; } -h2 { margin:4em 0 0.5em 0; } -h3 { font-size:1em; margin:0; margin-bottom:0.5em; } - - - -/*code -pre, .code { font-family: Monaco, monospace; font-size:11px; line-height:1.4em; background:#212121; color:#0f4; padding:1em 2em; } -span.code { padding:0.5em 1em; } -*/ +h1, h2, h3, h4, h5, h6 { font-size:1.3em; } +h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { text-decoration:none; } +h1 { margin:0 0 3em 0; font-size:2em;} +h2 { margin:4em 0 0.5em 0; } +h3 { margin:0 0 0 0; } blockquote { font-family:times; background:#000; color:#aaa; margin:0; font-size:15px; line-height:1.4em; padding:2em 4em; font-style:italic; line-height:1.45em; max-width:600px;} p { max-width:720px; } -ul { margin:0; padding:0; list-style-type:none; } -li { margin-bottom:1px; padding:1px; } +ul, li { margin:0; padding:0; list-style-type:none; } table { margin:0; padding:0; border:0; } -table .column { padding-right:100px; min-width:120px; max-width:275px; } +table .column { padding-right:100px; min-width:120px; max-width:400px; } table .column h2 a { text-decoration:none; } table h2, table h3 { margin-bottom:2em;} table .video li, table .image li { margin-bottom:2em; } @@ -45,17 +41,19 @@ table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em; .bookmark_links li span { font-style: italic; color:#444; } .image li a { background:none;} -.c_pop { position:absolute; background:#fff; display:none; border:5px outset #000; padding:1em 2em; left:260px; z-index:5; } +.c_pop { position:absolute; background:#fff; display:none; border:5px outset #000; padding:1em 2em; z-index:5; } .func { font-weight:bold; color:#444; } #home_arrow { position: absolute; top:11px; left:23px; margin-left:250px; text-decoration:none; } -#content { margin-left:120px; min-width:500px; } +#content { margin-left:120px; min-width:500px; position:absolute; top:20px; padding-bottom:200px; z-index:10;} #content p { } - ul.inline_content { } - ul.inline_content li { margin:0 0 50px 0; padding-bottom:75px; } - ul.inline_content ol li { margin:0; padding:0; } + ul.inline_content {} + ul.inline_content li .content { } + ul.inline_content li { margin:0 0 150px 0; } + ul.inline_content li h3 { border-bottom:2px solid #ddd; } + ul.inline_content ol li { margin:0; padding:0; border:0;} ul.thumbnails { } ul.thumbnails li { display:inline-block; margin: 0px 60px 60px 0px; } ul.thumbnails .thumbnail { width:160px; height:120px; text-align:center; background:#888; } @@ -69,17 +67,15 @@ table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em; ul.thumbnails .title { } .date { color:#ccc;} -.func { font-weight:normal; color:#990; } + .func { margin-bottom:2em; } + .func a { background:#daa; padding:0.2em 1em 0.02em 1em; font-size:9px; text-transform:uppercase;} .text { font-family:serif; font-size:15px; line-height:2.2em; margin-top:80px;} .indent { text-indent:3em; } -.nav { position:fixed; top:1em; left:1em; line-height:1.1em;} -.nav ul { margin-left:1em; } -.nav li a { background:#ffe; font-weight:bold; } -.nav h3 { margin-bottom:0.4em; } + .caption { font-style:italic; margin-top:5px; color:#444; } @@ -88,3 +84,4 @@ table .reader li, table .bookmarks li { margin-bottom:1em; padding-bottom:1em; #footer { margin-top:120px; } #footer .copy a { text-decoration:none; } + diff --git a/js/prettify/prettify.css b/js/prettify/prettify.css index bb02856..87ec1af 100755 --- a/js/prettify/prettify.css +++ b/js/prettify/prettify.css @@ -1,7 +1,7 @@ /* Pretty printing styles. Used with prettify.js. */ .str { color: #f26; } -.kwd { color: #000; font-weight:bold; } +.kwd { color: #444; font-weight:bold; } .com { color: #888; font-style:italic; } .typ { color: #606; } .lit { color: #066; } @@ -11,7 +11,10 @@ .atn { color: #606; } .atv { color: #080; } .dec { color: #606; } -pre.prettyprint, code.prettyprint { font-family:monospace; font-size:12px; padding:2px 20px; background:#f0f0f0; } +pre.prettyprint, code.prettyprint { font-family:monaco, "Lucida Console", monospace; font-size:11px; line-height:1.6em; padding:0.3em 0.5em; background:#e9e9e9; +-moz-border-radius: 4px; +-webkit-border-radius: 4px; +} pre.prettyprint { padding:20px; } @media print { diff --git a/lib/config b/lib/config index ae63498..01cbcf4 100644 --- a/lib/config +++ b/lib/config @@ -1,4 +1,4 @@ LOCAL_ROOT = /home/quilime/quilime.com/ -CONTENT_DIR = c/ +CONTENT_DIR = content/ TEMPLATE_DIR = templates/ SITE_TITLE = quilime diff --git a/templates/about.html b/templates/about.html index 1ab3a63..e58377b 100644 --- a/templates/about.html +++ b/templates/about.html @@ -2,29 +2,37 @@ - + <?php echo SITE_TITLE ?> - about + + - +
-

about

-

- quilime is an ongoing collection of process, notes, observation, sketches, experiments by gabriel dunne. (www, -email) -

- - - © 1997— + + quilime is a continually growing codification of exploration, resource, and creativity. +
+
+ author: gabriel dunne (email, www) +
+ elsewhere: + flickr, + delicious, + vimeo, + github +


+ +
diff --git a/templates/agg.html b/templates/agg.html index 50a9580..a00a0c2 100644 --- a/templates/agg.html +++ b/templates/agg.html @@ -1,3 +1,7 @@ + + @@ -12,21 +16,19 @@ - +
- -

aggregate

-

video

diff --git a/templates/code.html b/templates/code.html index 36509a1..63aa896 100644 --- a/templates/code.html +++ b/templates/code.html @@ -13,6 +13,8 @@ } $inline = isset($_GET['inline']) ? true : false; + + $page = "code"; ?> @@ -29,33 +31,32 @@ + +
+ -

code / []

-
- -

code

+
list

  • - []

    • -
- - archive + + +
+ +
inline
-

code

-
-

image aggregate

+

image aggregate

    channel->item as $item) : if ($count-- == 0) break; ?> @@ -38,13 +40,13 @@

- more → + more →

@@ -102,11 +103,6 @@
-
-

- view inline -

-
diff --git a/templates/header-src.html b/templates/header-src.html index 3d232c2..8be2bce 100644 --- a/templates/header-src.html +++ b/templates/header-src.html @@ -8,11 +8,17 @@ - + \ No newline at end of file diff --git a/templates/img.html b/templates/img.html index 976baac..d0d637b 100644 --- a/templates/img.html +++ b/templates/img.html @@ -2,6 +2,8 @@ $img = get_rss_feed('http://api.flickr.com/services/feeds/photos_public.gne?id=28394478@N00&lang=en-us&format=rss_200'); +$page = "image"; + ?> @@ -22,11 +24,10 @@ $img = get_rss_feed('http://api.flickr.com/services/feeds/photos_public.gne?id=2 - +
-

img