Merge branch 'master' into friendly_id_4

refinery · Feb 26, 2012 · c64f53b · c64f53b
2 parents bbf30b3 + 46b1263
commit c64f53b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -21,7 +21,7 @@ platforms :jruby do
   gem 'jruby-openssl'
 end
 
-unless defined?(JRUBY_VERSION)
+platforms :ruby do
   gem 'sqlite3'
   gem 'mysql2'
   gem 'pg'

diff --git a/core/app/views/refinery/_menu.html.erb b/core/app/views/refinery/_menu.html.erb
@@ -3,7 +3,7 @@
   # ::Refinery::Menu is smart enough to remember all of the items in the original collection.
   if (roots = local_assigns[:roots] || (collection ||= @menu_pages).roots).present?
     dom_id ||= 'menu'
-    css = [(css || 'menu'), 'clearfix'].flatten.join(' ')
+    css = [(css || 'menu clearfix')].flatten.join(' ')
     hide_children = Refinery::Core.menu_hide_children if hide_children.nil?
 -%>
 <nav id='<%= dom_id %>' class='<%= css %>'>