From 9638cc608b1e40eaada3d4caa0a10f6830fd9f4c Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <karl@suma-ev.de>
Date: Mon, 5 Nov 2018 10:06:03 +0100
Subject: [PATCH] CSS Bibliotheken werden jetzt einzeln ausgeliefert
---
resources/assets/less/default.less | 3 ---
resources/assets/less/metager/variables.less | 10 ++++++++--
resources/views/layouts/resultPage.blade.php | 3 +++
resources/views/layouts/staticPages.blade.php | 3 +++
webpack.mix.js | 19 ++++++++++++++++---
5 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/resources/assets/less/default.less b/resources/assets/less/default.less
index 4d17a1361..faac8a6b8 100644
--- a/resources/assets/less/default.less
+++ b/resources/assets/less/default.less
@@ -1,4 +1 @@
-@import "./font-awesome/fontawesome.less";
-@import "./font-awesome/solid.less";
-@import "./bootstrap/bootstrap.less";
@import "./metager/metager.less";
\ No newline at end of file
diff --git a/resources/assets/less/metager/variables.less b/resources/assets/less/metager/variables.less
index 69fd93bd4..0648a9cbb 100644
--- a/resources/assets/less/metager/variables.less
+++ b/resources/assets/less/metager/variables.less
@@ -18,7 +18,8 @@
//
@body-bg: rgb(250, 250, 250);
@input-border-focus: @metager-orange;
-@font-family-sans-serif: Arimo, "Liberation Sans",
+@font-family-sans-serif: Arimo,
+"Liberation Sans",
"Helvetica Neue",
Helvetica,
Arial,
@@ -27,6 +28,11 @@ sans-serif;
@link-color: #0066CC;
//
@padding-small-default: 8px;
+// Screen sizes
+@screen-xs-max: 767px;
+@screen-sm-max: 991;
+@screen-md-max: 1199px;
+@screen-lg: 1200;
/* Unsorted */
@quicktip-background-color: @color-white;
@@ -55,4 +61,4 @@ sans-serif;
@product-price-color: @color-strong-grey;
@product-price-background-color: fade(@color-white, 90%);
@lsprev-or-lsnext-i-background-color: @color-black;
-@searchbar-background-color: white;
+@searchbar-background-color: white;
\ No newline at end of file
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index ad6d1af8f..cc54c119b 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -12,6 +12,9 @@
<meta name="mm" content="{{ $metager->getVerificationId() }}" />
<meta name="mn" content="{{ $metager->getVerificationCount() }}" />
<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 type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" />
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/bootstrap.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" />
<link type="text/css" rel="stylesheet" href="/fonts/arimo/stylesheet.css" />
<meta name="referrer" content="origin">
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index c55905c8b..084fa320e 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -14,6 +14,9 @@
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<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="/fonts/arimo/stylesheet.css" />
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" />
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/bootstrap.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/utility.css') }}" />
<script src="{{ mix('js/lib.js') }}"></script>
diff --git a/webpack.mix.js b/webpack.mix.js
index 5607e98dc..db676f19d 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -12,14 +12,27 @@ let mix = require("laravel-mix");
*/
mix
+ /*
+ @import "./font-awesome/fontawesome.less";
+ @import "./font-awesome/solid.less";
+ @import "./bootstrap/bootstrap.less";
+ */
// css
.less("resources/assets/less/default.less", "public/css/themes/default.css", {
strictMath: true
})
+ .less("resources/assets/less/font-awesome/fontawesome.less", "public/css/fontawesome.css", {
+ strictMath: true
+ })
+ .less("resources/assets/less/font-awesome/solid.less", "public/css/fontawesome-solid.css", {
+ strictMath: true
+ })
+ .less("resources/assets/less/bootstrap/bootstrap.less", "public/css/bootstrap.css", {
+ strictMath: true
+ })
.less(
"resources/assets/less/metager/beitritt.less",
- "public/css/beitritt.css",
- {
+ "public/css/beitritt.css", {
strictMath: true
}
)
@@ -66,4 +79,4 @@ mix
// source maps
.sourceMaps(false, "inline-source-map")
// versioning
- .version();
+ .version();
\ No newline at end of file
--
GitLab