mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-29 11:08:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.0'

Browse Source
This commit is contained in:
Graham Campbell 2015-12-16 18:11:12 +00:00
commit 57491b8062
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Composers/AppComposer.php
View File

@ -39,7 +39,7 @@ class AppComposer
$view->withAppGraphs(Setting::get('display_graphs'));
$view->withAppLocale(Setting::get('app_locale'));
$view->withAppName(Setting::get('app_name'));
$view->withAppStylesheet(Setting::get('app_stylesheet'));
$view->withAppStylesheet(Setting::get('stylesheet'));
$view->withAppUrl(Config::get('app.url'));
$view->withShowSupport(Setting::get('show_support'));
}

2
resources/views/dashboard/partials/head.blade.php
View File

@ -18,7 +18,7 @@
<link rel="apple-touch-icon" sizes="144x144" href="/img/apple-touch-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="/img/apple-touch-icon-152x152.png">
<title>@yield('pageTitle', $app_name.' | Cachet')</title>
<title>{{ $page_title or $app_name.' | Cachet' }}</title>
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">

4
resources/views/layout/master.blade.php
View File

@ -44,9 +44,9 @@
@include('partials.crowdin')
@if($stylesheet = $app_stylesheet)
@if($app_stylesheet)
<style type="text/css">
{!! $stylesheet !!}
{!! $app_stylesheet !!}
</style>
@endif