Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

skolehjem/public/images/icons/image.svg

@@ -0,0 +1 @@
+<svg height="512pt" viewBox="0 -36 512 511" width="512pt" id="Image_1" xmlns="http://www.w3.org/2000/svg"><style>#Image_1{fill:#FFF;}</style><path d="m231.898438 198.617188c28.203124 0 51.152343-22.945313 51.152343-51.148438 0-28.207031-22.949219-51.152344-51.152343-51.152344-28.203126 0-51.148438 22.945313-51.148438 51.152344 0 28.203125 22.945312 51.148438 51.148438 51.148438zm0-72.300782c11.664062 0 21.152343 9.488282 21.152343 21.152344 0 11.660156-9.488281 21.148438-21.152343 21.148438-11.660157 0-21.148438-9.488282-21.148438-21.148438 0-11.664062 9.488281-21.152344 21.148438-21.152344zm0 0"/><path d="m493.304688.5h-474.609376c-10.308593 0-18.695312 8.386719-18.695312 18.695312v401.726563c0 10.308594 8.386719 18.695313 18.695312 18.695313h474.609376c10.308593 0 18.695312-8.386719 18.695312-18.695313v-401.726563c0-10.308593-8.386719-18.695312-18.695312-18.695312zm-11.304688 30v237.40625l-94.351562-94.355469c-6.152344-6.140625-16.15625-6.136719-22.304688.011719l-133.441406 133.441406-85.238282-85.234375c-2.980468-2.984375-6.945312-4.628906-11.164062-4.628906-4.214844 0-8.175781 1.640625-11.15625 4.621094l-94.34375 94.34375v-285.605469zm-452 379.117188v-51.085938l105.5-105.5 85.234375 85.234375c2.984375 2.984375 6.949219 4.632813 11.167969 4.632813 4.210937 0 8.175781-1.644532 11.152344-4.625l133.445312-133.445313 105.503906 105.503906v99.285157zm0 0"/></svg>

skolehjem/resources/views/app/guides/index.blade.php

@@ -12,6 +12,9 @@
             width: auto;
             heigt: auto;
             box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+            display: flex;
+            flex-direction: row;
+            border-radius: 10px;
         }
 
         div.header {
@@ -20,6 +23,11 @@
             padding: 8px;
             font-size: 10px;
             text-align: center;
+            -webkit-box-flex: 0;
+            -ms-flex: 0 0 40%;
+            flex: 0 0 40%;
+            max-width: 40%;
+            border-radius: 10px 0px 0px 10px;
         }
 
         div.container {
@@ -43,6 +51,10 @@
         .select2-results__option, .select2-search__field {
             color: black;
         }
+
+        .justify-content-center {
+            justify-content: center;
+        }
     </style>
     <script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-beta.1/dist/css/select2.min.css" rel="stylesheet" />
@@ -71,16 +83,17 @@
                     <div class="card">
                         @if($guide->resource_id !== null)
                             <div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $guide->resource_id)->first()->filename) }}');">
-                            <h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $guide->name}}</h3>
+
                             </div>
                         @else
-                            <div class="header">
+                            <div class="header d-flex justify-content-center">
-                                <h3>{{ $guide->name}}</h3>
+                                <img src="{{ asset('/images/icons/image.svg')  }}" style="width: calc(100% - 20px)">
                             </div>
                         @endif
                         <div class="container">
-                            @php $tags = [ '<p>', '<b>', '<em>', '<a>', '<u>', '<s>', '<sub>', '<ul>', '<li>', '<sup>', '<div>', '<blockquote>', '<ol>', '<strong>', '<br>', '<h1>', '<h2>', '<h3>', '<h4>', '<h5>', '<h6>', '<h7>', '<span>'] @endphp
+                            <div class="row" style="justify-content: center;">
-                            {!! \App\Helpers::closetags(substr(strip_tags($guide->guide_articles, $tags), 0, 300)) !!}
+                                <h4>{{ $guide->name}}</h4>
+                            </div>
                             <div class="row" style="justify-content: center;">
                                 <a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="{{route("guides.show", ["guide" => $guide->id ])}}">{{__('msg.læsmere')}}</a>
                             </div>