beenull/Heimdall
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Squashed commit of the following:

Browse source 
commit e52bc9c6b2
Author: KodeStar <kodestar@gmail.com>
Date:   Thu Mar 17 10:23:15 2022 +0000

    Update supportedapps.json

commit a16233ee10
Author: KodeStar <kodestar@gmail.com>
Date:   Thu Mar 17 10:21:24 2022 +0000

    Fix for displaying svg icons correctly
This commit is contained in:
KodeStar 2022-03-17 10:24:31 +00:00
parent 5b177f1127
commit bd3b882b3a
6 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
public/css/app.css vendored
View file

@ -1,3 +1,4 @@
@charset "UTF-8";
/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
html { html {
font-family: sans-serif; font-family: sans-serif;
@ -848,9 +849,20 @@ div.create .input input, div.create .input select {
border-radius: 6px; border-radius: 6px;
} }
.app-icon-container {
width: 60px;
height: 60px;
display: flex;
justify-content: center;
align-items: center;
margin-right: 15px;
flex: 0 0 60px;
}
.app-icon { .app-icon {
max-width: 60px; max-width: 60px;
margin-right: 15px; display: block;
max-height: 60px;
} }
.sidenav { .sidenav {

4
public/js/app.js vendored
View file

@ -620,14 +620,14 @@ $.when($.ready).then(function () {
drop: function( event, ui ) { drop: function( event, ui ) {
var tag = $( this ).data('id'); var tag = $( this ).data('id');
var item = $( ui.draggable ).data('id'); var item = $( ui.draggable ).data('id');
$.get('tag/add/'+tag+'/'+item, function(data) { $.get('tag/add/'+tag+'/'+item, function(data) {
if(data == 1) { if(data == 1) {
$( ui.draggable ).remove(); $( ui.draggable ).remove();
} else { } else {
alert('not added'); alert('not added');
} }
}); });
} }
});*/ });*/
$('#sortable').sortable({ $('#sortable').sortable({

4
public/mix-manifest.json generated
View file

@ -1,4 +1,4 @@
{ {
"/css/app.css": "/css/app.css?id=953b8b27868431843dae", "/css/app.css": "/css/app.css?id=c5354f371a3887feab28",
"/js/app.js": "/js/app.js?id=ff749484877e4ce6c2f6" "/js/app.js": "/js/app.js?id=c95edea425171c6ce8f6"
} }

13
resources/assets/sass/_app.scss
View file

@ -647,10 +647,19 @@ div.create {
} }
} }
} }
.app-icon-container {
width: 60px;
height: 60px;
display: flex;
justify-content: center;
align-items: center;
margin-right: 15px;
flex: 0 0 60px;
}
.app-icon { .app-icon {
max-width: 60px; max-width: 60px;
margin-right: 15px; display: block;
max-height: 60px;
} }
.sidenav { .sidenav {

12
resources/views/item.blade.php
View file

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

2
storage/app/supportedapps.json
View file

File diff suppressed because one or more lines are too long