Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
MetaGer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
56
Issues
56
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
open-source
MetaGer
Commits
9638cc60
Commit
9638cc60
authored
Nov 05, 2018
by
Karl Hasselbring
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CSS Bibliotheken werden jetzt einzeln ausgeliefert
parent
b9df942f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
8 deletions
+30
-8
resources/assets/less/default.less
resources/assets/less/default.less
+0
-3
resources/assets/less/metager/variables.less
resources/assets/less/metager/variables.less
+8
-2
resources/views/layouts/resultPage.blade.php
resources/views/layouts/resultPage.blade.php
+3
-0
resources/views/layouts/staticPages.blade.php
resources/views/layouts/staticPages.blade.php
+3
-0
webpack.mix.js
webpack.mix.js
+16
-3
No files found.
resources/assets/less/default.less
View file @
9638cc60
@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
View file @
9638cc60
...
...
@@ -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
View file @
9638cc60
...
...
@@ -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
View file @
9638cc60
...
...
@@ -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
View file @
9638cc60
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment