lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to using Laravel Mix. Closes #2582

Browse Source
This commit is contained in:
James Brooks
2017-06-19 22:38:33 +01:00
parent 61c569505f
commit 41a8562d80
26 changed files with 5803 additions and 28394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@
@if($enable_external_dependencies)
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $font_subset }}" rel="stylesheet" type="text/css">
@endif
<link rel="stylesheet" href="{{ elixir('dist/css/dashboard.css') }}">
<link rel="stylesheet" href="{{ mix('dist/css/dashboard/dashboard.css') }}">
@yield('css')
@include('partials.crowdin')
@@ -34,7 +34,7 @@
var Global = {};
Global.locale = '{{ $app_locale }}';
</script>
<script src="{{ elixir('dist/js/all.js') }}"></script>
<script src="{{ mix('dist/js/all.js') }}"></script>
</head>
<body class="@yield('bodyClass')">

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

@@ -25,7 +25,7 @@
@if($enable_external_dependencies)
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $font_subset }}" rel="stylesheet" type="text/css">
@endif
<link rel="stylesheet" href="{{ elixir('dist/css/dashboard.css') }}">
<link rel="stylesheet" href="{{ mix('dist/css/dashboard/dashboard.css') }}">
@yield('css')
@include('partials.crowdin')
@@ -34,7 +34,7 @@
var Global = {};
Global.locale = '{{ $app_locale }}';
</script>
<script src="{{ elixir('dist/js/all.js') }}"></script>
<script src="{{ mix('dist/js/all.js') }}"></script>
</head>
<body class="dashboard">

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

@@ -49,7 +49,7 @@
@if($enable_external_dependencies)
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $font_subset }}" rel="stylesheet" type="text/css">
@endif
<link rel="stylesheet" href="{{ elixir('dist/css/app.css') }}">
<link rel="stylesheet" href="{{ mix('dist/css/app.css') }}">
@include('partials.stylesheet')
@@ -65,7 +65,7 @@
var Global = {};
Global.locale = '{{ $app_locale }}';
</script>
<script src="{{ elixir('dist/js/all.js') }}"></script>
<script src="{{ mix('dist/js/all.js') }}"></script>
</head>
<body class="status-page @yield('bodyClass')">
@yield('outer-content')