Skip to content

GitLab

Commit 769fbcbd authored by Phil Höfer's avatar Phil Höfer
Browse files

Laravel elixir integration nur mit bootstrap

parent 490d68ac
Hide whitespace changes
Inline Side-by-side
gulpfile.js
View file @ 769fbcbd
const elixir = require('laravel-elixir'); const elixir = require('laravel-elixir');
require('laravel-elixir-vue-2'); require('laravel-elixir-vue-2');
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Elixir Asset Management | Elixir Asset Management
...@@ -12,8 +10,6 @@ require('laravel-elixir-vue-2'); ...@@ -12,8 +10,6 @@ require('laravel-elixir-vue-2');
| file for our application, as well as publishing vendor resources. | file for our application, as well as publishing vendor resources.
| |
*/ */
elixir(function(mix) {
elixir(mix => { mix.less('default.less', 'public/css/themes/default.css');
mix.sass('app.scss') });
.webpack('app.js'); \ No newline at end of file
});
resources/views/layouts/resultPage.blade.php
View file @ 769fbcbd
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<html> <html>
<head> <head>
<title>{{ $metager->getQ() }} - MetaGer</title> <title>{{ $metager->getQ() }} - MetaGer</title>
<link href="/css/bootstrap.css" rel="stylesheet" /> <!--<link href="/css/bootstrap.css" rel="stylesheet" />
<link href="/css/styleResultPage.css" rel="stylesheet" /> <link href="/css/styleResultPage.css" rel="stylesheet" />
@if( isset($mobile) && $mobile ) @if( isset($mobile) && $mobile )
<link href="/css/styleResultPageMobile.css" rel="stylesheet" /> <link href="/css/styleResultPageMobile.css" rel="stylesheet" />
@endif @endif
<link id="theme" href="/css/theme.css.php" rel="stylesheet" /> <link id="theme" href="/css/theme.css.php" rel="stylesheet" />-->
<link href="/favicon.ico" rel="icon" type="image/x-icon" /> <link href="/favicon.ico" rel="icon" type="image/x-icon" />
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" /> <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" /> <meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" />
...@@ -15,9 +15,7 @@ ...@@ -15,9 +15,7 @@
<meta content="{{ $eingabe }}" name="q" /> <meta content="{{ $eingabe }}" name="q" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}"> <link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
@if( app('request')->input('theme', 'none') != "none" ) <link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default') }}.css" />
<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'none') }}.css" />
@endif
<link type="text/css" rel="stylesheet" href="/css/lightslider.css" /> <link type="text/css" rel="stylesheet" href="/css/lightslider.css" />
</head> </head>
<body id="resultBody"> <body id="resultBody">
......
Supports Markdown
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