Commit d7c1ab6c authored by Dominik Hebeler's avatar Dominik Hebeler

Inline CSS zu Performancezwecken hinzugefügt. Piwik von der Startseite entfernt.

parent 010704f4
...@@ -6,13 +6,14 @@ ...@@ -6,13 +6,14 @@
"type": "project", "type": "project",
"require": { "require": {
"php": ">=5.6.4", "php": ">=5.6.4",
"fideloper/proxy": "^3.3",
"guzzlehttp/guzzle": "6.*",
"jenssegers/agent": "2.6.*",
"laravel/framework": "5.4.*", "laravel/framework": "5.4.*",
"laravel/tinker": "~1.0", "laravel/tinker": "~1.0",
"predis/predis": "^1.1", "laravelcollective/html": "^5.4.0",
"mcamara/laravel-localization": "1.2.*", "mcamara/laravel-localization": "1.2.*",
"jenssegers/agent": "2.6.*", "predis/predis": "^1.1"
"fideloper/proxy": "^3.3",
"guzzlehttp/guzzle": "6.*"
}, },
"require-dev": { "require-dev": {
"fzaninotto/faker": "~1.4", "fzaninotto/faker": "~1.4",
...@@ -55,4 +56,4 @@ ...@@ -55,4 +56,4 @@
"sort-packages": true, "sort-packages": true,
"optimize-autoloader": true "optimize-autoloader": true
} }
} }
\ No newline at end of file
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "722b798dfc051b71db6a8d03273494cb", "content-hash": "987d8a3a450027401e164f760b2226d2",
"packages": [ "packages": [
{ {
"name": "dnoegel/php-xdg-base-dir", "name": "dnoegel/php-xdg-base-dir",
...@@ -783,6 +783,60 @@ ...@@ -783,6 +783,60 @@
], ],
"time": "2017-12-18T16:25:11+00:00" "time": "2017-12-18T16:25:11+00:00"
}, },
{
"name": "laravelcollective/html",
"version": "v5.4.9",
"source": {
"type": "git",
"url": "https://github.com/LaravelCollective/html.git",
"reference": "f04965dc688254f4c77f684ab0b42264f9eb9634"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/LaravelCollective/html/zipball/f04965dc688254f4c77f684ab0b42264f9eb9634",
"reference": "f04965dc688254f4c77f684ab0b42264f9eb9634",
"shasum": ""
},
"require": {
"illuminate/http": "5.4.*",
"illuminate/routing": "5.4.*",
"illuminate/session": "5.4.*",
"illuminate/support": "5.4.*",
"illuminate/view": "5.4.*",
"php": ">=5.6.4"
},
"require-dev": {
"illuminate/database": "5.4.*",
"mockery/mockery": "~0.9.4",
"phpunit/phpunit": "~5.4"
},
"type": "library",
"autoload": {
"psr-4": {
"Collective\\Html\\": "src/"
},
"files": [
"src/helpers.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Taylor Otwell",
"email": "taylorotwell@gmail.com"
},
{
"name": "Adam Engebretson",
"email": "adam@laravelcollective.com"
}
],
"description": "HTML and Form Builders for the Laravel Framework",
"homepage": "http://laravelcollective.com",
"time": "2017-08-12T15:52:38+00:00"
},
{ {
"name": "league/flysystem", "name": "league/flysystem",
"version": "1.0.43", "version": "1.0.43",
......
...@@ -181,7 +181,7 @@ return [ ...@@ -181,7 +181,7 @@ return [
App\Providers\MetaGerProvider::class, App\Providers\MetaGerProvider::class,
Jenssegers\Agent\AgentServiceProvider::class, Jenssegers\Agent\AgentServiceProvider::class,
Fideloper\Proxy\TrustedProxyServiceProvider::class, Fideloper\Proxy\TrustedProxyServiceProvider::class,
Collective\Html\HtmlServiceProvider::class,
], ],
/* /*
...@@ -231,7 +231,8 @@ return [ ...@@ -231,7 +231,8 @@ return [
'View' => Illuminate\Support\Facades\View::class, 'View' => Illuminate\Support\Facades\View::class,
'LaravelLocalization' => Mcamara\LaravelLocalization\Facades\LaravelLocalization::class, 'LaravelLocalization' => Mcamara\LaravelLocalization\Facades\LaravelLocalization::class,
'Agent' => Jenssegers\Agent\Facades\Agent::class, 'Agent' => Jenssegers\Agent\Facades\Agent::class,
'Form' => Collective\Html\FormFacade::class,
'HTML' => Collective\Html\HtmlFacade::class,
], ],
]; ];
@import "./font-awesome/css/font-awesome.css";
@import "./bootstrap/bootstrap.less"; @import "./bootstrap/bootstrap.less";
@import "./metager/metager.less"; @import "./metager/metager.less";
@import "./variables-default.less"; @import "./variables-default.less";
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
</li> </li>
@endif @endif
</ul> </ul>
<script src="{{ mix('/js/scriptStartPage.js') }}"></script> <script src="{{ mix('/js/scriptStartPage.js') }}" defer></script>
@endsection @endsection
@section('optionalContent') @section('optionalContent')
......
...@@ -14,11 +14,14 @@ ...@@ -14,11 +14,14 @@
<meta rel="icon" type="image/x-icon" href="/favicon.ico" /> <meta rel="icon" type="image/x-icon" href="/favicon.ico" />
<meta rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <meta rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<link rel="search" type="application/opensearchdescription+xml" title="{{ trans('staticPages.opensearch') }}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}"> <link rel="search" type="application/opensearchdescription+xml" title="{{ trans('staticPages.opensearch') }}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
<link type="text/css" rel="stylesheet" href="/font-awesome/css/font-awesome.min.css" /> <style>
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" /> @php
echo file_get_contents(public_path() . mix('css/themes/default.css'));
@endphp
</style>
<link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" /> <link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" />
<script src="{{ mix('js/scriptSubPages.js') }}"></script> <script src="{{ mix('js/scriptSubPages.js') }}" defer></script>
<script src="{{ mix('js/lib.js') }}"></script> <script src="{{ mix('js/lib.js') }}" defer></script>
@if (isset($css)) @if (isset($css))
@if(is_array($css)) @if(is_array($css))
@foreach($css as $el) @foreach($css as $el)
...@@ -200,7 +203,6 @@ ...@@ -200,7 +203,6 @@
<img src="/img/luh_metager.png" alt="LUH Logo"></a> <img src="/img/luh_metager.png" alt="LUH Logo"></a>
</li> </li>
</footer> </footer>
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
</div> </div>
</body> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment