From 6a5ffa0c33075bdacd8219f5a8284b707dc24b4d Mon Sep 17 00:00:00 2001 From: James Brooks Date: Tue, 30 Dec 2014 11:23:03 +0000 Subject: [PATCH 1/2] Drop FontAwesome in favour of IonIcons --- .../dashboard/incident-template.blade.php | 2 +- app/views/dashboard/metrics.blade.php | 2 +- app/views/dashboard/notifications.blade.php | 2 +- app/views/dashboard/user.blade.php | 2 +- app/views/partials/dashboard/nav.blade.php | 22 - .../partials/dashboard/sidebar.blade.php | 4 +- app/views/partials/support-link.blade.php | 2 +- app/views/setup.blade.php | 2 +- gulpfile.js | 31 +- package.json | 1 + .../{all-04964d6c.css => all-a9ff4425.css} | 286 ++++++ public/build/css/all.css | 286 ++++++ public/build/fonts/FontAwesome.otf | Bin 85908 -> 0 bytes public/build/fonts/fontawesome-webfont.eot | Bin 56006 -> 0 bytes public/build/fonts/fontawesome-webfont.svg | 520 ----------- public/build/fonts/fontawesome-webfont.ttf | Bin 112160 -> 0 bytes public/build/fonts/fontawesome-webfont.woff | Bin 65452 -> 0 bytes .../js/{all-e632baa6.js => all-fe283b26.js} | 848 ++++++++++++++++++ public/build/js/all.js | 848 ++++++++++++++++++ public/build/rev-manifest.json | 4 +- 20 files changed, 2306 insertions(+), 556 deletions(-) delete mode 100644 app/views/partials/dashboard/nav.blade.php rename public/build/css/{all-04964d6c.css => all-a9ff4425.css} (50%) delete mode 100644 public/build/fonts/FontAwesome.otf delete mode 100644 public/build/fonts/fontawesome-webfont.eot delete mode 100644 public/build/fonts/fontawesome-webfont.svg delete mode 100644 public/build/fonts/fontawesome-webfont.ttf delete mode 100644 public/build/fonts/fontawesome-webfont.woff rename public/build/js/{all-e632baa6.js => all-fe283b26.js} (83%) diff --git a/app/views/dashboard/incident-template.blade.php b/app/views/dashboard/incident-template.blade.php index 98b4a529..f4bcb105 100644 --- a/app/views/dashboard/incident-template.blade.php +++ b/app/views/dashboard/incident-template.blade.php @@ -3,7 +3,7 @@ @section('content')
- {{ Lang::get('cachet.dashboard.incident-add') }} + {{ Lang::get('cachet.dashboard.incident-add') }} > Create an Incident Template
diff --git a/app/views/dashboard/metrics.blade.php b/app/views/dashboard/metrics.blade.php index 32a4fa8e..02d02f89 100644 --- a/app/views/dashboard/metrics.blade.php +++ b/app/views/dashboard/metrics.blade.php @@ -2,7 +2,7 @@ @section('content')
- {{ Lang::get('cachet.dashboard.metrics') }} + {{ Lang::get('cachet.dashboard.metrics') }}
diff --git a/app/views/dashboard/notifications.blade.php b/app/views/dashboard/notifications.blade.php index a7bd348a..a873b793 100644 --- a/app/views/dashboard/notifications.blade.php +++ b/app/views/dashboard/notifications.blade.php @@ -2,7 +2,7 @@ @section('content')
- {{ Lang::get('cachet.dashboard.notifications') }} + {{ Lang::get('cachet.dashboard.notifications') }}
diff --git a/app/views/dashboard/user.blade.php b/app/views/dashboard/user.blade.php index f230a505..b4e109f6 100644 --- a/app/views/dashboard/user.blade.php +++ b/app/views/dashboard/user.blade.php @@ -3,7 +3,7 @@ @section('content')
- {{ Lang::get('cachet.dashboard.user') }} + {{ Lang::get('cachet.dashboard.user') }}
diff --git a/app/views/partials/dashboard/nav.blade.php b/app/views/partials/dashboard/nav.blade.php deleted file mode 100644 index 824d8e73..00000000 --- a/app/views/partials/dashboard/nav.blade.php +++ /dev/null @@ -1,22 +0,0 @@ - diff --git a/app/views/partials/dashboard/sidebar.blade.php b/app/views/partials/dashboard/sidebar.blade.php index 7cebca73..492e9216 100644 --- a/app/views/partials/dashboard/sidebar.blade.php +++ b/app/views/partials/dashboard/sidebar.blade.php @@ -46,7 +46,7 @@ {{--
  • - {{ Lang::get('cachet.dashboard.metrics') }} + {{ Lang::get('cachet.dashboard.metrics') }}
  • --}} {{--
  • - {{ Lang::get('cachet.dashboard.notifications') }} + {{ Lang::get('cachet.dashboard.notifications') }}
  • --}}
  • diff --git a/app/views/partials/support-link.blade.php b/app/views/partials/support-link.blade.php index 207dfc01..dca1f182 100644 --- a/app/views/partials/support-link.blade.php +++ b/app/views/partials/support-link.blade.php @@ -1,7 +1,7 @@ @if(Setting::get('show_support'))