From 189890154ee6a7a500957cf28a2cf79c750dbf04 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 19 Nov 2014 14:41:04 +0000 Subject: [PATCH] Break up incidents on the same day --- app/views/incident.blade.php | 5 ++++- public/assets/sass/application.scss | 5 +++++ .../{application-bb5fc830.css => application-c3c6ec34.css} | 4 ++++ public/build/css/application.css | 4 ++++ public/build/rev-manifest.json | 2 +- public/css/application.css | 4 ++++ 6 files changed, 22 insertions(+), 2 deletions(-) rename public/build/css/{application-bb5fc830.css => application-c3c6ec34.css} (95%) diff --git a/app/views/incident.blade.php b/app/views/incident.blade.php index 382b5dfd..fd29e222 100644 --- a/app/views/incident.blade.php +++ b/app/views/incident.blade.php @@ -10,10 +10,13 @@

No incidents reported.

@endunless - @foreach($incidents as $incident) + @foreach($incidents as $incidentID => $incident)

{{ $incident->name }}

{{ $incident->message }}

+ @if($incidentID < ($incident->count() - 1)) +
+ @endif @endforeach diff --git a/public/assets/sass/application.scss b/public/assets/sass/application.scss index f4f6d866..40182d54 100755 --- a/public/assets/sass/application.scss +++ b/public/assets/sass/application.scss @@ -3,6 +3,11 @@ body { font-size: 1.4em; } +hr { + margin-top: 10px; + margin-bottom: 10px; +} + .alert { &.alert-success { background-color: #8DCD8D; diff --git a/public/build/css/application-bb5fc830.css b/public/build/css/application-c3c6ec34.css similarity index 95% rename from public/build/css/application-bb5fc830.css rename to public/build/css/application-c3c6ec34.css index f8af9fc8..d02d3bf4 100755 --- a/public/build/css/application-bb5fc830.css +++ b/public/build/css/application-c3c6ec34.css @@ -2,6 +2,10 @@ body { color: #333333; font-size: 1.4em; } +hr { + margin-top: 10px; + margin-bottom: 10px; } + .alert.alert-success { background-color: #8DCD8D; border-color: #4cae4c; diff --git a/public/build/css/application.css b/public/build/css/application.css index f8af9fc8..d02d3bf4 100755 --- a/public/build/css/application.css +++ b/public/build/css/application.css @@ -2,6 +2,10 @@ body { color: #333333; font-size: 1.4em; } +hr { + margin-top: 10px; + margin-bottom: 10px; } + .alert.alert-success { background-color: #8DCD8D; border-color: #4cae4c; diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json index b33e0193..a39b0c44 100644 --- a/public/build/rev-manifest.json +++ b/public/build/rev-manifest.json @@ -1,3 +1,3 @@ { - "css/application.css": "css/application-bb5fc830.css" + "css/application.css": "css/application-c3c6ec34.css" } \ No newline at end of file diff --git a/public/css/application.css b/public/css/application.css index f8af9fc8..d02d3bf4 100755 --- a/public/css/application.css +++ b/public/css/application.css @@ -2,6 +2,10 @@ body { color: #333333; font-size: 1.4em; } +hr { + margin-top: 10px; + margin-bottom: 10px; } + .alert.alert-success { background-color: #8DCD8D; border-color: #4cae4c;