diff options
| author | Luc Donnet | 2012-08-17 10:51:08 +0200 |
|---|---|---|
| committer | Luc Donnet | 2012-08-17 10:51:08 +0200 |
| commit | 07b7442176518cc428e7876fb663de31187d3040 (patch) | |
| tree | 032a276a606ef740480864255cc8a74910e7a802 | |
| parent | 201cfa5ffe2c5f98880fa7f6f2eafe1c3f7d917f (diff) | |
| download | chouette-core-07b7442176518cc428e7876fb663de31187d3040.tar.bz2 | |
Fix css for vehicle journeys at stop
| -rw-r--r-- | app/assets/stylesheets/pagination.css.scss | 6 | ||||
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pagination.css.scss b/app/assets/stylesheets/pagination.css.scss index 7bb3e9cde..e9f6b7235 100644 --- a/app/assets/stylesheets/pagination.css.scss +++ b/app/assets/stylesheets/pagination.css.scss @@ -21,14 +21,12 @@ background: white; cursor: default; margin-top: 10px; - padding-left: 70px; + text-align: center; /* self-clearing method: */ a, span, em { padding: 0.2em 0.5em; - display: block; - float: left; - margin-right: 1px; } + } .disabled { color: #999999; border: 1px solid #dddddd; } diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index af475c3c2..adad7b107 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -43,7 +43,7 @@ class VehicleJourneysController < ChouetteController def collection @q = parent.sorted_vehicle_journeys.search(params[:q]) - @vehicle_journeys ||= @q.result(:distinct => true).order( "vehicle_journey_at_stops.departure_time").paginate(:page => params[:page], :per_page => 10) + @vehicle_journeys ||= @q.result(:distinct => true).order( "vehicle_journey_at_stops.departure_time").paginate(:page => params[:page], :per_page => 8) @matrix ||= matrix end |