admin styling updates/fixes

nabeelio · Aug 24, 2017 · c233bc4 · c233bc4
1 parent 4c61e6e
commit c233bc4
Show file tree

Hide file tree

Showing 16 changed files with 273 additions and 56 deletions.
diff --git a/app/Http/Controllers/Admin/PirepController.php b/app/Http/Controllers/Admin/PirepController.php
@@ -41,8 +41,12 @@ public function aircraftList()
      */
     public function index(Request $request)
     {
-        $this->pirepRepo->pushCriteria(new RequestCriteria($request));
-        $pireps = $this->pirepRepo->all();
+        $criterea = new RequestCriteria($request);
+        $this->pirepRepo->pushCriteria($criterea);
+
+        $pireps = $this->pirepRepo
+                       ->orderBy('created_at', 'desc')
+                       ->all();
 
         return view('admin.pireps.index', [
             'pireps' => $pireps
@@ -84,7 +88,7 @@ public function store(CreatePirepRequest $request)
      */
     public function show($id)
     {
-        $pirep = $this->pirepRepo->findWithoutFail($id);
+        $pirep = $this->pirepRepo->find($id);
 
         if (empty($pirep)) {
             Flash::error('Pirep not found');

diff --git a/public/assets/admin/css/paper-dashboard.css b/public/assets/admin/css/paper-dashboard.css
diff --git a/public/assets/admin/css/paper-dashboard.css.map b/public/assets/admin/css/paper-dashboard.css.map
diff --git a/public/assets/admin/sass/paper-dashboard.scss b/public/assets/admin/sass/paper-dashboard.scss
@@ -1,17 +1,17 @@
 /*!
-    
+
  =========================================================
  * Paper Dashboard - v1.1.2
  =========================================================
- 
+
  * Product Page: http://www.creative-tim.com/product/paper-dashboard
  * Copyright 2017 Creative Tim (http://www.creative-tim.com)
  * Licensed under MIT (https://github.com/creativetimofficial/paper-dashboard/blob/master/LICENSE.md)
- 
+
  =========================================================
- 
+
  * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- 
+
  */
 
 
@@ -23,6 +23,7 @@
 // Core CSS
 @import "paper/misc";
 @import "paper/sidebar-and-main-panel";
+@import "paper/badges";
 @import "paper/buttons";
 @import "paper/inputs";
 

diff --git a/public/assets/admin/sass/paper/_badges.scss b/public/assets/admin/sass/paper/_badges.scss
@@ -0,0 +1,47 @@
+/*           badges             */
+.badge {
+  border-radius: 8px;
+  padding: 4px 8px;
+  text-transform: uppercase;
+  font-size: $font-size-mini;
+  line-height: 12px;
+  background-color: $transparent-bg;
+  border: $border;
+  margin-bottom: 5px;
+  border-radius: $border-radius-extreme;
+}
+
+.badge-icon {
+  padding: 0.4em 0.55em;
+  i {
+    font-size: 0.8em;
+  }
+}
+
+.badge-default {
+  @include badge-color($default-color);
+}
+
+.badge-primary {
+  @include badge-color($primary-color);
+}
+
+.badge-info {
+  @include badge-color($info-color);
+}
+
+.badge-success {
+  @include badge-color($success-color);
+}
+
+.badge-warning {
+  @include badge-color($warning-color);
+}
+
+.badge-danger {
+  @include badge-color($danger-color);
+}
+
+.badge-neutral {
+  @include badge-color($white-color);
+}
diff --git a/public/assets/admin/sass/paper/_cards.scss b/public/assets/admin/sass/paper/_cards.scss
@@ -1,4 +1,5 @@
 .card{
+    border: 0;
     border-radius: $border-radius-extreme;
     box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5);
     background-color: #FFFFFF;
@@ -7,6 +8,20 @@
     position: relative;
     z-index: 1;
 
+    -webkit-box-orient: vertical;
+    -webkit-box-direction: normal;
+    flex-direction: column;
+    background-color: #fff;
+
+    .card-block {
+        flex: 1 1 auto;
+        padding: 1.25rem;
+    }
+
+    a {
+        color: #f96332;
+    }
+
     .image{
         width: 100%;
         overflow: hidden;
@@ -32,6 +47,12 @@
         color: $font-color;
     }
 
+    h5 {
+        font-size: 1.57em;
+        line-height: 1.4em;
+        margin-bottom: 15px;
+    }
+
     h6{
         font-size: $font-size-small;
         margin: 0;

diff --git a/public/assets/admin/sass/paper/_mixins.scss b/public/assets/admin/sass/paper/_mixins.scss
@@ -1,11 +1,12 @@
-//Utilities 
+//Utilities
 
 @import "mixins/transparency";
 @import "mixins/vendor-prefixes";
 
 
 //Components
 
+@import "mixins/badges";
 @import "mixins/buttons";
 @import "mixins/inputs";
 @import "mixins/labels";
@@ -14,4 +15,4 @@
 @import "mixins/icons";
 @import "mixins/cards";
 @import "mixins/chartist";
-@import "mixins/sidebar";
+@import "mixins/sidebar";
diff --git a/public/assets/admin/sass/paper/_navbars.scss b/public/assets/admin/sass/paper/_navbars.scss
@@ -32,6 +32,7 @@
             }
             i{
                 position: relative;
+                margin-right: 5px;
                 top: 1px;
             }
          }

diff --git a/public/assets/admin/sass/paper/_typography.scss b/public/assets/admin/sass/paper/_typography.scss
@@ -117,3 +117,10 @@ strong{
         color: $danger-color;
     }
 }
+
+.description,
+.card-description,
+.footer-big p {
+    color: $dark-gray;
+    font-weight: $font-weight-light;
+}
diff --git a/public/assets/admin/sass/paper/_variables.scss b/public/assets/admin/sass/paper/_variables.scss
@@ -114,6 +114,9 @@ $border-radius-btn-large:      50px !default;
 
 // Cristina: am schimbat aici si s-au modificat inputurile
 $margin-bottom:                0 0 10px 0 !default;
+$border: 1px solid !default;
+$border-radius-extra-small: 0.125rem !default;
+$border-radius-tiny:           0.1875rem !default;
 $border-radius-small:           3px !default;
 $border-radius-base:            4px !default;
 $border-radius-large:           6px !default;
@@ -126,6 +129,11 @@ $btn-round-radius:             30px !default;
 
 $height-base:                  40px !default;
 
+$btn-icon-font-size: 24px !default;
+$btn-icon-size: 56px !default;
+$btn-icon-size-mini: 36px !default;
+$btn-icon-font-size-mini: 14px !default;
+
 $font-size-base:               14px !default;
 $font-size-xs:                 12px !default;
 $font-size-small:              12px !default;
@@ -142,6 +150,7 @@ $font-size-h6:                 0.9em   !default;
 $font-paragraph:               16px    !default;
 $font-size-navbar:             16px    !default;
 $font-size-small:              12px    !default;
+$font-size-mini: 0.7142em !default;
 
 $font-weight-light:          300 !default;
 $font-weight-normal:         400 !default;

diff --git a/public/assets/admin/sass/paper/mixins/_badges.scss b/public/assets/admin/sass/paper/mixins/_badges.scss
@@ -0,0 +1,4 @@
+@mixin badge-color($color) {
+    border-color: $color;
+    color: $color;
+}
diff --git a/resources/views/admin/app.blade.php b/resources/views/admin/app.blade.php
@@ -25,6 +25,18 @@
     <link href="/assets/admin/css/themify-icons.css" rel="stylesheet">
 
     <style type="text/css">
+        /*.card {
+            display: inline-block;
+            position: relative;
+            overflow: hidden;
+            width: 100%;
+            margin-bottom: 20px;
+            !*box-shadow: 0px 5px 25px 0px rgba(0, 0, 0, 0.2);*!
+        }*/
+
+        .border-blue-bottom {
+            border-bottom: 3px solid #067ec1;
+        }
     @yield('css')
     </style>
 

diff --git a/resources/views/admin/pireps/index.blade.php b/resources/views/admin/pireps/index.blade.php
@@ -1,23 +1,8 @@
 @extends('admin.app')
 
-@section('content')
-    <section class="content-header">
-        <h1 class="pull-left">PIREPs</h1>
-        <h1 class="pull-right">
-           <a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px" href="{!! route('admin.pireps.create') !!}">Add New</a>
-        </h1>
-    </section>
-    <div class="content">
-        <div class="clearfix"></div>
-
-        @include('flash::message')
+@section('title', 'Pilot Reports')
 
-        <div class="clearfix"></div>
-        <div class="box box-primary">
-            <div class="box-body">
-                    @include('admin.pireps.table')
-            </div>
-        </div>
-    </div>
+@section('content')
+@include('admin.pireps.table')
 @endsection