From 6c2a022ef2144be6a0d7c295ed567e0c9f94fcb8 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 19 Nov 2014 12:46:29 +0000 Subject: [PATCH] Compile some CSS to start working on the design --- app/views/incident.blade.php | 2 +- app/views/index.blade.php | 52 +++++++++++--------------- public/assets/sass/application.scss | 58 +++++++++++++++++++---------- public/build/css/application.css | 47 +++++++++++++---------- public/css/application.css | 47 +++++++++++++---------- 5 files changed, 115 insertions(+), 91 deletions(-) diff --git a/app/views/incident.blade.php b/app/views/incident.blade.php index b1b06864..457941cf 100644 --- a/app/views/incident.blade.php +++ b/app/views/incident.blade.php @@ -10,6 +10,6 @@ @foreach($incidents as $incident)

{{ $incident->humanStatus }} {{ $incident->name }}

{{ $incident->message }}

-

+

@endforeach @endif diff --git a/app/views/index.blade.php b/app/views/index.blade.php index ec950c9c..9138c47a 100644 --- a/app/views/index.blade.php +++ b/app/views/index.blade.php @@ -1,38 +1,30 @@ @extends('layout.master') @section('content') -
-
-
-
- {{ Setting::get('site_name') }} -
-
-
-
-
+
{{ $systemMessage }}
-
-
    - @foreach(Component::get() as $component) -
  • - {{ $component->name }} - @if($component->description) - {{ $component->description }} - @endif +
      + @foreach(Component::get() as $component) +
    • +
      +
      +

      {{ $component->name }}

      + @if($component->description) +

      {{ $component->description }}

      + @endif +
      +
      +

      {{ $component->humanStatus }}

      +
      +
      +
      • + @endforeach +
    - {{ $component->humanStatus }} -
    • - @endforeach -
-
- -
-

Past Incidents

- @for($i=0; $i <= 7; $i++) - @include('incident', array('i', $i)) - @endfor -
+

Past Incidents

+ @for($i=0; $i <= 7; $i++) + @include('incident', array('i', $i)) + @endfor @stop diff --git a/public/assets/sass/application.scss b/public/assets/sass/application.scss index 05c5f64c..37c7a8a4 100755 --- a/public/assets/sass/application.scss +++ b/public/assets/sass/application.scss @@ -2,29 +2,47 @@ body { color: #333333; } -h4 { - margin-top: 25px; +.alert { + &.alert-success { + background-color: #8DCD8D; + border-color: #4cae4c; + color: white; + } + + &.alert-info { + background: #8CD3E8; + border-color: #46b8da; + color: #FFF; + } } -.row { - margin-bottom: 20px; -} +.list-group { + margin-bottom: 20px; + padding-left: 0; -.row .row { - margin-top: 10px; - margin-bottom: 0; -} + a.list-group-item { + color: #030303; + } -[class*="col-"] { - padding-top: 15px; - padding-bottom: 15px; - background-color: #eee; - background-color: rgba(86,61,124,.15); - border: 1px solid #ddd; - border: 1px solid rgba(86,61,124,.2); -} + .list-group-item { + position: relative; + display: block; + padding: 10px 15px; + margin-bottom: -1px; + background-color: #ffffff; + border: 1px solid #95a5a6; -hr { - margin-top: 40px; - margin-bottom: 40px; + h4 { + &.list-group-item-heading { + color: inherit; + margin-top: 0px; + margin-bottom: 5px; + } + } + + p { + margin-bottom: 0; + line-height: 1.3; + } + } } diff --git a/public/build/css/application.css b/public/build/css/application.css index 55b59278..55cf30ed 100755 --- a/public/build/css/application.css +++ b/public/build/css/application.css @@ -1,24 +1,31 @@ body { color: #333333; } -h4 { - margin-top: 25px; } +.alert.alert-success { + background-color: #8DCD8D; + border-color: #4cae4c; + color: white; } +.alert.alert-info { + background: #8CD3E8; + border-color: #46b8da; + color: #FFF; } -.row { - margin-bottom: 20px; } - -.row .row { - margin-top: 10px; - margin-bottom: 0; } - -[class*="col-"] { - padding-top: 15px; - padding-bottom: 15px; - background-color: #eee; - background-color: rgba(86, 61, 124, 0.15); - border: 1px solid #ddd; - border: 1px solid rgba(86, 61, 124, 0.2); } - -hr { - margin-top: 40px; - margin-bottom: 40px; } +.list-group { + margin-bottom: 20px; + padding-left: 0; } + .list-group a.list-group-item { + color: #030303; } + .list-group .list-group-item { + position: relative; + display: block; + padding: 10px 15px; + margin-bottom: -1px; + background-color: #ffffff; + border: 1px solid #95a5a6; } + .list-group .list-group-item h4.list-group-item-heading { + color: inherit; + margin-top: 0px; + margin-bottom: 5px; } + .list-group .list-group-item p { + margin-bottom: 0; + line-height: 1.3; } diff --git a/public/css/application.css b/public/css/application.css index 55b59278..55cf30ed 100755 --- a/public/css/application.css +++ b/public/css/application.css @@ -1,24 +1,31 @@ body { color: #333333; } -h4 { - margin-top: 25px; } +.alert.alert-success { + background-color: #8DCD8D; + border-color: #4cae4c; + color: white; } +.alert.alert-info { + background: #8CD3E8; + border-color: #46b8da; + color: #FFF; } -.row { - margin-bottom: 20px; } - -.row .row { - margin-top: 10px; - margin-bottom: 0; } - -[class*="col-"] { - padding-top: 15px; - padding-bottom: 15px; - background-color: #eee; - background-color: rgba(86, 61, 124, 0.15); - border: 1px solid #ddd; - border: 1px solid rgba(86, 61, 124, 0.2); } - -hr { - margin-top: 40px; - margin-bottom: 40px; } +.list-group { + margin-bottom: 20px; + padding-left: 0; } + .list-group a.list-group-item { + color: #030303; } + .list-group .list-group-item { + position: relative; + display: block; + padding: 10px 15px; + margin-bottom: -1px; + background-color: #ffffff; + border: 1px solid #95a5a6; } + .list-group .list-group-item h4.list-group-item-heading { + color: inherit; + margin-top: 0px; + margin-bottom: 5px; } + .list-group .list-group-item p { + margin-bottom: 0; + line-height: 1.3; }