Permalink
Browse files

Merge branch 'dev'

  • Loading branch information...
2 parents 7c49c8b + 5432346 commit 89d986c832caa156fa394a04634bcb9a1b017623 @skarcha skarcha committed Feb 22, 2012
Showing with 5 additions and 2 deletions.
  1. +0 −1 Ohloh.py
  2. +1 −1 PageForum.py
  3. +4 −0 static/css/cherokee.css
View
@@ -40,7 +40,6 @@ class Languages (CTK.Box):
def __init__ (self):
CTK.Box.__init__ (self, {'class': 'ohloh-languages-box'})
self += CTK.RawHTML (LANGUAGES_HTML)
- self += CTK.RawHTML (js = COCOMO_FIX_JS)
class Cocomo (CTK.Box):
def __init__ (self):
View
@@ -40,7 +40,7 @@ class PageForum:
def __call__ (self):
title = "Forums"
- page = Page.Page_Menu_Side (title=title)
+ page = Page.Page_Menu (title=title)
page += CTK.RawHTML ("<h1>%s</h1>"%(title))
page += CTK.RawHTML (FORUM_EMBEDDABLE_HTML)
View
@@ -411,6 +411,10 @@ ul.list li {
margin-bottom: 30px;
}
+#cocomo_salary {
+ width: auto;
+}
+
.license-img {
float: right;
margin-left: 30px;

0 comments on commit 89d986c

Please sign in to comment.