Skip to content
Snippets Groups Projects
Commit 769fbcbd authored by Phil Höfer's avatar Phil Höfer
Browse files

Laravel elixir integration nur mit bootstrap

parent 490d68ac
Branches
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
Hide whitespace changes
Inline Side-by-side
gulpfile.js
+ 3
− 7
View file @ 769fbcbd
const elixir = require('laravel-elixir');
require('laravel-elixir-vue-2');
/*
|--------------------------------------------------------------------------
| Elixir Asset Management
......@@ -12,8 +10,6 @@ require('laravel-elixir-vue-2');
| file for our application, as well as publishing vendor resources.
|
*/
elixir(mix => {
mix.sass('app.scss')
.webpack('app.js');
});
elixir(function(mix) {
mix.less('default.less', 'public/css/themes/default.css');
});
\ No newline at end of file
resources/views/layouts/resultPage.blade.php
+ 3
− 5
View file @ 769fbcbd
......@@ -2,12 +2,12 @@
<html>
<head>
<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" />
@if( isset($mobile) && $mobile )
<link href="/css/styleResultPageMobile.css" rel="stylesheet" />
@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="shortcut icon" type="image/x-icon" />
<meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" />
......@@ -15,9 +15,7 @@
<meta content="{{ $eingabe }}" name="q" />
<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()))])) }}">
@if( app('request')->input('theme', 'none') != "none" )
<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'none') }}.css" />
@endif
<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default') }}.css" />
<link type="text/css" rel="stylesheet" href="/css/lightslider.css" />
</head>
<body id="resultBody">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment