Merge branch 'master' into Multi-user

This commit is contained in:
Kode
2018-10-13 15:52:42 +01:00
6 changed files with 24 additions and 54 deletions

View File

@@ -12,7 +12,7 @@ body {
display: flex;
min-height: 100vh;
flex-direction: column;
background-image: url('/img/bg1.jpg');
background-image: url('../img/bg1.jpg');
background-repeat: no-repeat;
background-size: cover;
background-position: bottom center;

View File

@@ -1,7 +1,7 @@
// Variables
// --------------------------
$fa-font-path: "/webfonts" !default;
$fa-font-path: "../webfonts" !default;
$fa-font-size-base: 16px !default;
$fa-css-prefix: fa !default;
$fa-version: "5.0.2" !default;

View File

@@ -1,9 +1,9 @@
<section class="item-container{{ $app->droppable }}" data-id="{{ $app->id }}">
<div class="item" style="background-color: {{ $app->colour }}">
@if($app->icon)
<img class="app-icon" src="/storage/{{ $app->icon }}" />
<img class="app-icon" src="{{ asset('/storage/'.$app->icon) }}" />
@else
<img class="app-icon" src="/img/heimdall-icon-small.png" />
<img class="app-icon" src="{{ asset('/img/heimdall-icon-small.png') }}" />
@endif
<div class="details">
<div class="title{{ title_color($app->colour) }}">{{ $app->title }}</div>