Permalink
Browse files

Redesign the site.

Sorry about the giant commit.

--HG--
rename : media/css/base.less => media/css/sjl.less
  • Loading branch information...
1 parent 57b2d8c commit 54b6eaacf320f0db99c064f8679397e275802ab5 @sjl committed Sep 9, 2010
Showing with 1,164 additions and 798 deletions.
  1. +1 −0 .hgignore
  2. +3 −2 DESIGN.mdown
  3. +53 −61 content/about.html
  4. +2 −2 content/blog/2008/02/microsoft-entourage-applescript-frustration.html
  5. +5 −4 content/blog/2008/04/shooting-girl-jam.html
  6. +5 −3 content/blog/2008/08/beauty-in-computer-science-recursion.html
  7. +2 −2 content/blog/2008/08/negative-space-dancing.html
  8. +2 −2 content/blog/2008/08/on-leading.html
  9. +5 −4 content/blog/2009/01/deploying-site-fabric-and-mercurial.html
  10. +2 −2 content/blog/2009/01/going-open-source.html
  11. +2 −2 content/blog/2009/01/site-redesign.html
  12. +4 −3 content/blog/2009/02/how-and-why-i-dj.html
  13. +2 −2 content/blog/2009/02/how-i-shoot-dances.html
  14. +5 −3 content/blog/2009/03/candy-colored-terminal.html
  15. +2 −2 content/blog/2009/03/mercurial-bash-prompts.html
  16. +2 −2 content/blog/2009/04/why-people-dont-like-metal.html
  17. +2 −2 content/blog/2009/05/what-i-hate-about-mercurial.html
  18. +2 −2 content/blog/2009/06/how-to-contribute-to-mercurial.html
  19. +1 −1 content/blog/2009/08/a-guide-to-branching-in-mercurial.html
  20. +9 −9 content/blog/2009/11/my-sitesprint-project-lindyhub.html
  21. +2 −2 content/blog/2010/01/moving-from-django-to-hyde.html
  22. +2 −2 content/blog/2010/01/the-real-difference-between-mercurial-and-git.html
  23. +1 −1 content/blog/2010/02/mercurial-workflows-branch-as-needed.html
  24. +11 −17 content/blog/2010/02/my-extravagant-zsh-prompt.html
  25. +253 −79 content/blog/2010/04/a-faster-feed-apart.html
  26. +1 −1 content/blog/2010/05/mercurial-workflows-stable-default.html
  27. +1 −1 content/blog/2010/06/mercurial-workflows-translation-branches.html
  28. +5 −3 content/blog/2010/08/a-git-users-guide-to-mercurial-queues.html
  29. +230 −0 content/blog/2010/09/making-my-site-sing.html
  30. +0 −7 content/blog/dancing.html
  31. +0 −7 content/blog/music.html
  32. +0 −7 content/blog/photography.html
  33. +0 −7 content/blog/programming.html
  34. +3 −3 content/projects/django-hoptoad.html
  35. +3 −2 content/projects/fuego.html
  36. +2 −2 content/projects/grabtweets.html
  37. +1 −2 content/projects/hg-paste.html
  38. +1 −2 content/projects/hg-prompt.html
  39. +1 −2 content/projects/hgtab.html
  40. +2 −2 content/projects/lindyjam-com.html
  41. +0 −7 content/projects/photography.html
  42. +0 −7 content/projects/programming.html
  43. +2 −2 content/projects/stevelosh-com.html
  44. +1 −2 content/projects/t.html
  45. +1 −2 content/projects/women-in-water.html
  46. +12 −21 layout/_post.html
  47. +16 −12 layout/_splash.html
  48. +73 −33 layout/skeleton/_base.html
  49. +0 −22 layout/skeleton/_categorylisting.html
  50. +3 −22 layout/skeleton/_listing.html
  51. +1 −1 layout/skeleton/_listingitem.html
  52. +34 −24 media/css/aal.css
  53. +0 −344 media/css/base.less
  54. +14 −20 media/css/print.less
  55. +312 −0 media/css/sjl.less
  56. BIN media/images/blog/2009/02/dj-playlist-sorting.png
  57. BIN media/images/blog/2009/02/dj-playlist-unrated.png
  58. BIN media/images/blog/2009/08/branch-anon.png
  59. BIN media/images/blog/2009/08/branch-base.png
  60. BIN media/images/blog/2009/08/branch-bookmark.png
  61. BIN media/images/blog/2009/08/branch-clone.png
  62. BIN media/images/blog/2009/08/branch-named.png
  63. BIN media/images/blog/2010/01/mercurial-vs-git.jpg
  64. BIN media/images/blog/2010/02/hg-branching-1-after-merge.png
  65. BIN media/images/blog/2010/02/hg-branching-1-needs-merge.png
  66. BIN media/images/blog/2010/02/hg-branching-1-start.png
  67. BIN media/images/blog/2010/02/zsh-prompt-comments.png
  68. BIN media/images/blog/2010/02/zsh-prompt.png
  69. BIN media/images/blog/2010/05/default-stable-example.png
  70. BIN media/images/blog/2010/06/translation-branches.png
  71. BIN media/images/blog/2010/08/git-basics.png
  72. BIN media/images/blog/2010/08/mercurial-basics.png
  73. BIN media/images/blog/2010/08/mq-multiple.png
  74. BIN media/images/blog/2010/08/mq-one.png
  75. BIN media/images/blog/2010/08/mq-two.png
  76. BIN media/images/blog/2010/08/mq-versioned.png
  77. BIN media/images/colorbox/border.png
  78. BIN media/images/colorbox/controls.png
  79. BIN media/images/hr.png
  80. BIN media/images/hrb.png
  81. BIN media/images/rhythm.png
  82. BIN media/images/self.jpg
  83. +55 −5 media/js/sjl.js
  84. +10 −15 settings.py
View
@@ -7,3 +7,4 @@ deploy/
deploy_tmp/
backups/
*.swp
+*.un~
View
@@ -3,10 +3,11 @@ Some notes on the design, mostly for myself.
Images
======
-Full images for posts should be 600 pixels wide (or less).
+Full images for posts should be 580 pixels wide (or less) and a multiple of 25
+pixels tall.
Headers
=======
Blog and project content block should use h2 and lower. h1 elements are
-reserved for the layout.
+reserved for the layout.
View
@@ -1,108 +1,100 @@
-{% extends "_flatpage.html" %}
-
+{% extends "skeleton/_base.html" %}
{% hyde
title: "About"
%}
+{% block content %}
+ <img src="/media/images/self.jpg" class="self right" />
-{% block article %}
-
-<a href="http://www.flickr.com/photos/sjl7678/2332680141/"
- title="074/365 by Steve Losh, on Flickr">
- <img src="http://farm3.static.flickr.com/2378/2332680141_533362e5db_m.jpg"
- width="173" height="240" alt="074/365"
- class="right"/>
-</a>
-
-I'm **Steve**.
-
-I'm from **[Rochester, NY][rochester]**.
-
+ <div id="leaf-title"><h1>{{ page.title|safe|typogrify }}</h1></div>
+
+ <div id="leaf-content">
+ {% filter typogrify %}
+ {% markdown %}
+I'm **Steve**. I'm from **[Rochester, NY][rochester]**.
I do a lot of different things.
-If you want to get in touch with me, email me at <steve@stevelosh.com> or find
-me on [Twitter][], [Flickr][], [BitBucket][], [GitHub][], [BrightKite][], or
-[DjangoPeople][].
+If you want to get in touch with me you can [email
+me](mailto:steve@stevelosh.com) or find me on [BitBucket][], [GitHub][],
+[Twitter][], [Forrst][], or [Flickr][].
[rochester]: http://rocwiki.org/
[Twitter]: http://twitter.com/stevelosh/
[Flickr]: http://www.flickr.com/photos/sjl7678/
[BitBucket]: http://bitbucket.org/sjl/
[GitHub]: http://github.com/sjl/
-[BrightKite]: http://brightkite.com/people/stevelosh/
-[DjangoPeople]: http://djangopeople.net/stevelosh/
+[Forrst]: http://forrst.com/people/stevelosh/
-Music
------
-I play electric and upright bass. I've played in a metal band in the past, but
-right now my focus is on jazz and blues. I'm taking lessons with a wonderful
-teacher and hope to be skilled enough to play at dances and such in the near
-future.
+Programming
+-----------
-I DJ at swing and blues dances fairly often. My taste is pretty broad, and
-I'll cater to whatever the floor wants, but I tend to personally enjoy
-slightly down-tempo, small-group music. Let me know if you need a DJ for a
-dance.
+I went to [Rochester Institute of Technology](http://rit.edu/) for a degree in
+Computer Science.
-Dancing
--------
+I've done a lot of different things in the field so far. Right now the things
+that are captivating me are artificial intelligence and clean, simple,
+*useful* web applications.
-I've been swing dancing for about seven years. My first love is Lindy Hop; I
-go to classes, workshops and exchanges as often as my schedule and budget will
-allow. I also give lessons; I'm not *the* most skilled dancer but I do have
-teaching experience and I'm relatively cheap.
+I find programming beautiful. That might sound strange, but there are aspects
+of programming and math that I can't describe any other way.
-I've also been blues dancing for a couple of years. I'm not great at it yet
-but I'm getting there. I enjoy it even more than Lindy. My favorite aspect of
-dancing in general is connection and blues seems to bring that out more than
-any other dance.
+You can take a look at my [projects][] to see some of the major stuff I've
+worked on, or cut to the chase and look at [my BitBucket account][BitBucket].
-Lately I've also started getting my feet wet in tango. Whether it'll ever
-become as important to me as blues or Lindy remains to be seen.
+[projects]: /projects/
Photography
----------
I like photographing people. Other things as well, but especially people.
-They're the most interesting subject to me. I tend to gravitate toward the
-"art" aspects of photography more than the "journalism" aspects, but I can
-appreciate both.
+I tend to gravitate toward the "art" aspects of photography more than the
+"journalism" aspects, but I can appreciate both.
I shoot digital and film (35mm and medium format) depending on my time limits
and mood. I develop film in my bathroom and print it in a rented darkroom.
When I print digital I use a lab nearby; I don't have the money for a
professional printer just yet.
-I don't make my living from photography but I do take small jobs.
-
I post most of what I take on [my Flickr account][Flickr].
-Programming
------------
+Dancing
+-------
-I graduated from [Rochester Institute of Technology](http://rit.edu/) with a
-degree in Computer Science.
+I teach blues dancing here in Rochester as part of [Lady Luck Blues][].
+I starting blues dancing a few years ago and haven't stopped since. My favorite
+aspect of dancing is connection and blues seems to bring that out more than any
+other dance.
-I've done a lot of different things in the field so far. Right now the things
-that are captivating me are artificial intelligence and clean, simple,
-*useful* web applications.
+I've also been swing dancing for about seven years. My first love is Lindy Hop; I
+go to classes, workshops and exchanges as often as my schedule and budget will
+allow.
-I find programming beautiful. That might sound strange, but there are aspects
-of programming and math that I can't describe any other way.
+Lately I've begun getting my feet wet in tango. Whether it'll ever become as
+important to me as blues or Lindy remains to be seen.
-You can take a look at my [projects][] to see the major stuff I've worked on,
-or cut to the chase and look at [my BitBucket account][BitBucket].
+[Lady Luck Blues]: http://ladyluckblues.com/
-[projects]: /projects/
+Music
+-----
+
+I play electric and upright bass. I've played in a metal band in the past, but
+right now my focus is on jazz and blues.
+
+I DJ at swing and blues dances fairly often. My taste is pretty broad, and
+I'll cater to whatever the floor wants, but I tend to personally enjoy
+slightly down-tempo, small-group music. Let me know if you need a DJ for a
+dance.
About the Site
-----------
-If you want to know more about the website itself, check out the [project
+If you want to know more about my site you should check out the [project
page](/projects/stevelosh-com/) about the original version and my [blog
post][hyderewrite] about how I rewrote it.
[hyderewrite]: /blog/2010/01/moving-from-django-to-hyde/
-
+ {% endmarkdown %}
+ {% endfilter %}
+ </div>
{% endblock %}
@@ -4,7 +4,7 @@
title: "Entourage + Applescript = Frustration"
snip: "This is ridiculous."
created: 2008-02-21 15:25:45
- categories: ["programming"]
+ flattr: true
%}
{% block article %}
@@ -42,4 +42,4 @@
It's painful, but it works. If anyone has a better solution please let me know
so I can rip this monstrosity out of my code and try to forget about it.
-{% endblock %}
+{% endblock %}
@@ -4,7 +4,7 @@
title: "Shooting Girl Jam"
snip: "I’m finally getting the kind of dancing photos I want."
created: 2008-04-29 18:31:16
- categories: ["photography", "dancing"]
+ flattr: true
%}
@@ -193,11 +193,12 @@
a weekend of solo jazz and Charleston workshops and awesome swing dances.
If you'd like to see the rest of the photos I took this weekend I posted them
-on [Flickr][]. Feel free to comment here or there; advice/questions/comments
-are always appreciated!
+on [Flickr][]. Feel free to comment there or find me on [Twitter][twsl];
+advice/questions/comments are always appreciated!
[Flickr]: http://flickr.com/photos/sjl7678/collections/72157604785390431/
[Stompology]: http://stompology.com/
[Northeast Girl Jam]: http://jojojackson.com/NEGJ/Home.html
+[twsl]: {{links.twsl}}
-{% endblock %}
+{% endblock %}
@@ -4,7 +4,7 @@
title: "Beauty in Computer Science"
snip: "Why I love what I do."
created: 2008-08-29 15:30:38
- categories: ["programming"]
+ flattr: true
%}
@@ -79,7 +79,9 @@
See how we did a few things, then referred to the other piece of paper instead
of repeating ourselves? This lets you make small tasks and put them together
to form bigger ones. That's enough of a primer for now; if something's not
-clear please comment and let me know.
+clear please find me on [Twitter][twsl] and let me know.
+
+[twsl]: {{links.twsl}}
What's Recursion?
---------------
@@ -179,4 +181,4 @@
[Pale Blue Dot]: http://en.wikipedia.org/wiki/Pale_Blue_Dot
-{% endblock %}
+{% endblock %}
@@ -4,7 +4,7 @@
title: "Negative Space in Dancing"
snip: "It’s not just for artsy kids."
created: 2008-08-31 15:33:57
- categories: ["dancing"]
+ flattr: true
%}
@@ -101,4 +101,4 @@
[2]: http://flickr.com/photos/jodiseva/2385347094/
[Seascape]: http://www.sugimotohiroshi.com/seascape.html
-{% endblock %}
+{% endblock %}
@@ -4,7 +4,7 @@
title: "On Leading"
snip: "Some of my thoughts on leading after five years of doing it."
created: 2008-08-01 15:28:33
- categories: ["dancing"]
+ flattr: true
%}
@@ -88,4 +88,4 @@
The point I'm trying to make is that "leading" a follower is not just leading.
It's paying attention to the follower and leading *her*.
-{% endblock %}
+{% endblock %}
@@ -4,7 +4,7 @@
title: "Deploying with Fabric &amp; Mercurial"
snip: "Trimming typing."
created: 2009-01-15 20:51:09
- categories: ["programming"]
+ flattr: true
%}
{% block article %}
@@ -212,9 +212,10 @@
My hope is that this will at least give you some ideas about saving yourself
some time. If that helps you create better websites, I'll be happy. Please
-feel free to comment with any questions or thoughts you have!
+feel free to find me on [Twitter][twsl] with any questions or thoughts you have!
[GitHub]: http://github.com/
+[twsl]: {{links.twsl}}
Update
------
@@ -238,7 +239,7 @@
Here's a sample fabfile from one of the projects I'm working on now. There are
no comments, but I think most things should be self-explanitory. If you have
-any questions just post a comment and I'll be glad to answer them.
+any questions just find me on [Twitter][twsl] and I'll be glad to answer them.
from fabric.api import *
@@ -316,4 +317,4 @@
run("cd %s; sed -i -e 's/DEBUG = .*/DEBUG = False/' local_settings.py" % env.remote_app_dir)
restart()
-{% endblock %}
+{% endblock %}
@@ -4,7 +4,7 @@
title: "Going Open Source"
snip: "Why I’m making the code to this website public."
created: 2009-01-13 20:08:56
- categories: ["programming"]
+ flattr: true
%}
{% block article %}
@@ -136,4 +136,4 @@
[BitBucket]: http://bitbucket.org/
[GitHub]: http://github.com/
-{% endblock %}
+{% endblock %}
@@ -4,7 +4,7 @@
title: "Site Redesign"
snip: "Yeah, I know. Again."
created: 2009-01-11 17:58:23
- categories: ["programming"]
+ flattr: true
%}
{% block article %}
@@ -45,4 +45,4 @@
[Squarespace]: http://www.squarespace.com/
[project page]: /projects/stevelosh-com
-{% endblock %}
+{% endblock %}
@@ -4,7 +4,7 @@
title: "How &amp; Why I DJ"
snip: "I like playing music for dancers."
created: 2009-02-06 17:53:44
- categories: ["music", "dancing"]
+ flattr: true
%}
{% block article %}
@@ -191,7 +191,7 @@
I wrote this because I wanted to share how and why I DJ for dancers. If you're
a DJ, I hope I've given you a couple of ideas for new tricks to make your job
-easier. **Let me know what you think in the comments!**
+easier. **Let me know what you think on [Twitter][twsl]!**
If you don't DJ but think you might want to, great! Please don't be scared off
by my absurdly organized workflow &mdash; just because it works for me doesn't
@@ -206,7 +206,8 @@
[eMusic]: http://emusic.com/
[Quicksilver]: http://www.blacktree.com/
[Tempo Widget]: http://mac.softpedia.com/get/Dashboard-Widgets/Music/Tempo-Widget.shtml
+[twsl]: {{links.twsl}}
-{% endblock %}
+{% endblock %}
@@ -4,7 +4,7 @@
title: "How I Shoot Dances"
snip: "Slow shutter and flash."
created: 2009-02-09 18:04:36
- categories: ["photography", "dancing"]
+ flattr: true
%}
{% block article %}
@@ -369,4 +369,4 @@
width="500" height="377" alt="GW-0438" />
</a>
-{% endblock %}
+{% endblock %}
Oops, something went wrong.

0 comments on commit 54b6eaa

Please sign in to comment.