Permalink
Browse files

Merge branch 'redesign' of github.com:immutant/immutant.org into rede…

…sign

Conflicts:
	index.html.haml
	stylesheets/styles.scss
  • Loading branch information...
2 parents 00cc642 + 6cef4b3 commit 917bd3b7b35177025577140b2b6c0531295f0cbe @tobias tobias committed Mar 13, 2012
Showing with 10 additions and 5 deletions.
  1. +6 −5 index.html.haml
  2. +4 −0 stylesheets/styles.scss
View
@@ -5,12 +5,13 @@ inhibit_title: true
---
#main-intro
:markdown
- <img src='/images/logos/immutant_icon_256px_flipped.png' id='gil-left' align='right'/>
+ <img src='/images/logos/immutant_icon_256px_flipped.png' id='gil-left' title='Gil' alt='Gil' align='right'/>
- Immutant is an application server for [Clojure](http://clojure.org) built on top of
- [JBoss AS7](http://www.jboss.org/as7). It's an integrated platform
- providing support for [Ring](https://github.com/mmcgrana/ring)
- handlers, asynchronous messaging, daemons, caching, scheduled jobs, and more!
+ Immutant is an application server for
+ [Clojure](http://clojure.org). It's an integrated platform built
+ on [JBoss AS7](http://www.jboss.org/as7) providing support for
+ [Ring](https://github.com/mmcgrana/ring) handlers, asynchronous
+ messaging, caching, scheduled jobs, clustering, daemons and more!
We provide a [Leiningen](http://leiningen.org/) [plugin](https://github.com/immutant/lein-immutant)
that makes [installing](/install/) and managing an Immutant simple.
View
@@ -75,6 +75,10 @@ body {
}
}
+#gil-left {
+ margin-left: 30px;
+}
+
.even-more {
text-align: center;
font-weight: bold;

0 comments on commit 917bd3b

Please sign in to comment.