From 76d007b6c4255d1b4d576f655da7a9d8da9978cd Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 13 Dec 2014 13:30:44 +0000 Subject: [PATCH] Don't use tabs for now --- app/assets/sass/main.scss | 2 +- app/assets/sass/partials/_content.scss | 10 +- .../partials/{_header.scss => _navbar.scss} | 0 app/assets/sass/partials/_variables.scss | 2 +- app/views/dashboard/components.blade.php | 102 +++++++----------- app/views/dashboard/incidents.blade.php | 33 ++---- app/views/dashboard/index.blade.php | 99 +++++++---------- app/views/dashboard/metrics.blade.php | 11 +- app/views/dashboard/notifications.blade.php | 15 +-- .../{all-145c0b5a.css => all-ebdfae2e.css} | 10 +- public/build/css/all.css | 10 +- public/build/rev-manifest.json | 2 +- 12 files changed, 111 insertions(+), 185 deletions(-) rename app/assets/sass/partials/{_header.scss => _navbar.scss} (100%) rename public/build/css/{all-145c0b5a.css => all-ebdfae2e.css} (99%) diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index bef92ab8..fa606dd8 100644 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -10,7 +10,7 @@ html, body { @import "partials/base"; @import "partials/wrapper"; -@import "partials/header"; +@import "partials/navbar"; @import "partials/sidebar"; @import "partials/content"; @import "status-page"; diff --git a/app/assets/sass/partials/_content.scss b/app/assets/sass/partials/_content.scss index deb0677f..37ddecd5 100644 --- a/app/assets/sass/partials/_content.scss +++ b/app/assets/sass/partials/_content.scss @@ -9,13 +9,13 @@ body.dashboard { margin: 10px 0; } .header { - background: #ffffff; + background: darken(#ffffff, 8%); padding: 14px; width: 100%; height: 50px; - font-size: 18px; + font-size: 1.2em; i { - padding-right: 10px; + // padding-right: 10px; } input, button, .btn { position: relative; @@ -25,5 +25,9 @@ body.dashboard { width: 20%; } } + + h3 { + margin-top: 0; + } } } diff --git a/app/assets/sass/partials/_header.scss b/app/assets/sass/partials/_navbar.scss similarity index 100% rename from app/assets/sass/partials/_header.scss rename to app/assets/sass/partials/_navbar.scss diff --git a/app/assets/sass/partials/_variables.scss b/app/assets/sass/partials/_variables.scss index 534751fd..640c52cf 100644 --- a/app/assets/sass/partials/_variables.scss +++ b/app/assets/sass/partials/_variables.scss @@ -1,4 +1,4 @@ -$base-background-color: #f5f5f5; +$base-background-color: #ffffff; $base-font-family: "Avenir Next W01", "Helvetica Neue", "Helvetica", "Arial", sans-serif; $base-font-weight: 300; diff --git a/app/views/dashboard/components.blade.php b/app/views/dashboard/components.blade.php index bc9d4a05..878bdad9 100644 --- a/app/views/dashboard/components.blade.php +++ b/app/views/dashboard/components.blade.php @@ -6,73 +6,51 @@
-
- -
-
-
-
-

Components

-
+

Components

+
    + @foreach($components as $component) +
  • +
    +
    + {{ $component->name }}
    -
    -
      - @foreach($components as $component) -
    • -
      -
      - {{ $component->name }} -
      -
      - -
      -
      -
      • - @endforeach +
      +
      - -
      -
      -

      Create a component

      -
      -
      -
      -
      - @if($component = Session::get('component')) -
      - @if($component->isValid()) - Awesome. Component added. - @else - Whoops. Something went wrong with the component. {{ $component->getErrors() }} - @endif -
      - @endif - -
      -
      -
      - - -
      -
      - - -
      -
      - - - -
      -
      -
    +
    • + @endforeach +
+ +

Create a component

+ @if($component = Session::get('component')) +
+ @if($component->isValid()) + Awesome. Component added. + @else + Whoops. Something went wrong with the component. {{ $component->getErrors() }} + @endif
+ @endif + +
+
+
+ + +
+
+ + +
+
+ + + +
diff --git a/app/views/dashboard/incidents.blade.php b/app/views/dashboard/incidents.blade.php index 24f80a19..4502ac64 100644 --- a/app/views/dashboard/incidents.blade.php +++ b/app/views/dashboard/incidents.blade.php @@ -6,32 +6,15 @@
-
- -
-
-
-
-

Incidents

+

Incidents

- @if ($incidents->count() === 0) - Woah! No incidents, your doing well! - @endif -
-
-
-
-
-
-

Incident Templates

-
-
-
-
-
+ @if ($incidents->count() === 0) +

Woah! No incidents, your doing well!

+ @else +

You have {{ $incidents->count() }} incidents.

+ @endif + +

Incident Templates

@stop diff --git a/app/views/dashboard/index.blade.php b/app/views/dashboard/index.blade.php index 3584b8cb..18f662fe 100644 --- a/app/views/dashboard/index.blade.php +++ b/app/views/dashboard/index.blade.php @@ -5,66 +5,49 @@ {{ Lang::get('cachet.dashboard.dashboard') }}
-
-
- -
-
-
-
-

Create an Incident

-
-
+
+

Create an Incident

-
-
- @if($incident = Session::get('incident')) -
- @if($incident->isValid()) - Awesome. Incident added. - @else - Whoops. Something went wrong with the incident. - @endif -
- @endif - - {{ Form::open(['name' => 'IncidentForm', 'class' => 'form-vertical', 'role' => 'form']) }} -
-
- - -
-
-
- - - - -
-
- - -
-
- - - - {{ Form::close() }} -
-
-
-
+ @if($incident = Session::get('incident')) +
+ @if($incident->isValid()) + Awesome. Incident added. + @else + Whoops. Something went wrong with the incident. + @endif
+ @endif + + {{ Form::open(['name' => 'IncidentForm', 'class' => 'form-vertical', 'role' => 'form']) }} +
+
+ + +
+
+
+ + + + +
+
+ + +
+
+ + + + {{ Form::close() }}
@stop diff --git a/app/views/dashboard/metrics.blade.php b/app/views/dashboard/metrics.blade.php index f714395c..d337493b 100644 --- a/app/views/dashboard/metrics.blade.php +++ b/app/views/dashboard/metrics.blade.php @@ -6,16 +6,7 @@
-
- -
-
Metrics
-
Add a data point here
-
-
+

Metrics

@stop diff --git a/app/views/dashboard/notifications.blade.php b/app/views/dashboard/notifications.blade.php index df0f9797..a7bd348a 100644 --- a/app/views/dashboard/notifications.blade.php +++ b/app/views/dashboard/notifications.blade.php @@ -6,20 +6,7 @@
-
- -
-
-
-
-

Subscribers

-
-
-
-
-
+

Notifications

@stop diff --git a/public/build/css/all-145c0b5a.css b/public/build/css/all-ebdfae2e.css similarity index 99% rename from public/build/css/all-145c0b5a.css rename to public/build/css/all-ebdfae2e.css index 159f2b50..0e304c78 100644 --- a/public/build/css/all-145c0b5a.css +++ b/public/build/css/all-ebdfae2e.css @@ -4259,7 +4259,7 @@ body.dashboard { font-weight: 300; font-size: 16px; letter-spacing: 0.08em; - background: #f5f5f5; + background: #ffffff; display: table; width: 100%; height: 100%; @@ -4360,18 +4360,18 @@ body.dashboard .content { body.dashboard .content .row { margin: 10px 0; } body.dashboard .content .header { - background: #ffffff; + background: #ebebeb; padding: 14px; width: 100%; height: 50px; - font-size: 18px; } - body.dashboard .content .header i { - padding-right: 10px; } + font-size: 1.2em; } body.dashboard .content .header input, body.dashboard .content .header button, body.dashboard .content .header .btn { position: relative; top: -4px; } body.dashboard .content .header input { width: 20%; } + body.dashboard .content h3 { + margin-top: 0; } body { color: #333333; diff --git a/public/build/css/all.css b/public/build/css/all.css index 159f2b50..0e304c78 100644 --- a/public/build/css/all.css +++ b/public/build/css/all.css @@ -4259,7 +4259,7 @@ body.dashboard { font-weight: 300; font-size: 16px; letter-spacing: 0.08em; - background: #f5f5f5; + background: #ffffff; display: table; width: 100%; height: 100%; @@ -4360,18 +4360,18 @@ body.dashboard .content { body.dashboard .content .row { margin: 10px 0; } body.dashboard .content .header { - background: #ffffff; + background: #ebebeb; padding: 14px; width: 100%; height: 50px; - font-size: 18px; } - body.dashboard .content .header i { - padding-right: 10px; } + font-size: 1.2em; } body.dashboard .content .header input, body.dashboard .content .header button, body.dashboard .content .header .btn { position: relative; top: -4px; } body.dashboard .content .header input { width: 20%; } + body.dashboard .content h3 { + margin-top: 0; } body { color: #333333; diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json index 4ea80726..36aeafbf 100644 --- a/public/build/rev-manifest.json +++ b/public/build/rev-manifest.json @@ -1,4 +1,4 @@ { - "css/all.css": "css/all-145c0b5a.css", + "css/all.css": "css/all-ebdfae2e.css", "js/all.js": "js/all-d8f5640f.js" } \ No newline at end of file