diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 34ae5960c..0d1cecf6b 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -5,7 +5,7 @@ class GroupsController < ApplicationController respond_to :json, :only => :show def index - @posts = current_user.visible_posts(:by_members_of => :all).paginate :page => params[:page], :order => 'created_at DESC' + @posts = current_user.visible_posts(:by_members_of => :all).paginate :page => params[:page], :per_page => 15, :order => 'created_at DESC' @group = :all end @@ -27,7 +27,7 @@ class GroupsController < ApplicationController def show @group = Group.find_by_id params[:id] @friends = @group.people - @posts = current_user.visible_posts( :by_members_of => @group ).paginate :order => 'created_at DESC' + @posts = current_user.visible_posts( :by_members_of => @group ).paginate :per_page => 15, :order => 'created_at DESC' respond_with @group end diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index f516bbaab..18efef3c5 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -24,7 +24,7 @@ a { #flash_notice, #flash_error, #flash_alert { - z-index: 3; + z-index: 100; top: 32px; position: absolute; color: black; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 278745ed4..e99358393 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -25,7 +25,7 @@ a #flash_notice, #flash_error, #flash_alert - :z-index 3 + :z-index 100 :top 32px :position absolute :color #000