Merge branch '838-styles-auf-seiten-aufteilen' into...

Merge branch '838-styles-auf-seiten-aufteilen' into 841-css-dateien-aufraumen-zusammenfassen-verallgemeinern

resources/assets/less/default.less

-@import "./font-awesome/fontawesome.less";
-@import "./font-awesome/solid.less";
-@import "./bootstrap/bootstrap.less";
 @import "./metager/metager.less";
\ No newline at end of file

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

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">

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>

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