Merge remote-tracking branch 'upstream/master'

nathanvda · Aug 27, 2011 · e8035fd · e8035fd
2 parents ec548b1 + 5eb11e1
commit e8035fd
Show file tree

Hide file tree

Showing 30 changed files with 1,510 additions and 304 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.6.3
+0.7.0
diff --git a/index.html b/index.html
@@ -342,6 +342,7 @@ <h3>Simple Block</h3>
           <h3>Switch Theme</h3>
           <ul class="navigation">
             <li><a href="#" onclick="Theme.activate('default'); return false;">Default</a></li>
+            <li><a href="#" onclick="Theme.activate('activo'); return false;">Activo 2</a></li>
             <li><a href="#" onclick="Theme.activate('red'); return false;">Red</a></li>
             <li><a href="#" onclick="Theme.activate('amro'); return false;">Amro</a></li>
             <li><a href="#" onclick="Theme.activate('bec'); return false;">Bec</a></li>

diff --git a/stylesheets/themes/activo/images/arrow.png b/stylesheets/themes/activo/images/arrow.png
diff --git a/stylesheets/themes/activo/images/boxbar-background.png b/stylesheets/themes/activo/images/boxbar-background.png
diff --git a/stylesheets/themes/activo/images/button-background-active.png b/stylesheets/themes/activo/images/button-background-active.png
diff --git a/stylesheets/themes/activo/images/button-background.png b/stylesheets/themes/activo/images/button-background.png
diff --git a/...mes/default/images/menubar-background.png → ...emes/activo/images/menubar-background.png b/...mes/default/images/menubar-background.png → ...emes/activo/images/menubar-background.png