diff --git a/app/Http/Controllers/tmp/test.png b/app/Http/Controllers/tmp/test.png index 6bf34b4..6645ccf 100644 Binary files a/app/Http/Controllers/tmp/test.png and b/app/Http/Controllers/tmp/test.png differ diff --git a/public/css/glitch.css b/public/css/glitch.css index bb6cfec..25d024c 100644 --- a/public/css/glitch.css +++ b/public/css/glitch.css @@ -866,4 +866,8 @@ a.rainbow:hover { background: none; border: none; margin: 0; +} + +.bootstrap-tagsinput input { + vertical-align: bottom; } \ No newline at end of file diff --git a/public/css/w0bmcustom.css b/public/css/w0bmcustom.css index 9b7aa2b..a2178da 100644 --- a/public/css/w0bmcustom.css +++ b/public/css/w0bmcustom.css @@ -3829,9 +3829,29 @@ button#layout4:before { margin: 5px; border-radius: 5px; display: flex; - justify-content: center; + justify-content: start; +} + +.media-koerper { + width: 100%; } .sees.panel.panel-default { padding-bottom: 5px; +} + +video#placeholder { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + height: 100%; + opacity: 0.2; + object-fit: cover; +} + +.modal-content { + padding-top: 10px; } \ No newline at end of file diff --git a/public/njum/css/cstms.css b/public/njum/css/cstms.css index 79b627b..741b88a 100644 --- a/public/njum/css/cstms.css +++ b/public/njum/css/cstms.css @@ -1103,4 +1103,26 @@ div#list { div#message { padding-right: 0px; +} + +/* Cat */ +div#categories { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); + grid-gap: 20px; + align-items: stretch; + margin-bottom: 5px; +} + +.thumbnail img { + max-width: 100%; +} + +.category-box { + background: #282828; + border: 2px solid black; +} + +.caption { + padding: 5px; } \ No newline at end of file diff --git a/public/placeholder.webm b/public/placeholder.webm new file mode 100644 index 0000000..2cefba2 Binary files /dev/null and b/public/placeholder.webm differ diff --git a/resources/views/layout1/layout.blade.php b/resources/views/layout1/layout.blade.php index 16dd0e7..a1602a5 100644 --- a/resources/views/layout1/layout.blade.php +++ b/resources/views/layout1/layout.blade.php @@ -44,14 +44,18 @@ @include('partials.frontendedit') @endif @endif +@if(auth()->check()) +@else + +@endif @include('partials.navigation')
@yield('aside')
- +
@yield('content')
@@ -67,7 +71,6 @@ - + @else + @endif +@if(auth()->check()) @include('partials.handlebars') +@else +@endif @if(auth()->check()) @include('partials.filterselect') @if(isset($user) && auth()->user()->can('edit_user')) @include('partials.banmenu') @endif @endif +@if(auth()->check()) - +@else +@endif @include('partials.navigation')
@yield('aside')
- + @yield('content')
+@if(auth()->check()) @@ -58,12 +67,8 @@ - -@if(env('SENTRY_PUBLIC')) - -@endif +@else +@endif diff --git a/resources/views/layout1/video.blade.php b/resources/views/layout1/video.blade.php index 7f59782..ef2ab87 100644 --- a/resources/views/layout1/video.blade.php +++ b/resources/views/layout1/video.blade.php @@ -139,10 +139,13 @@ {{$video->tesThumb()}}
- +
@endif diff --git a/resources/views/layout2/categories.blade.php b/resources/views/layout2/categories.blade.php index 892e2fd..32a2317 100644 --- a/resources/views/layout2/categories.blade.php +++ b/resources/views/layout2/categories.blade.php @@ -1,17 +1,18 @@ @extends('profilelayout') @section('novidcontent')
@foreach($categories as $category) -
+
{{$category->name}}
-

{{$category->name}} {{$category->videos()->count()}}

-

{{$category->description}}

-

View

+
{{$category->name}} {{$category->videos()->count()}}
+ {{$category->description}} +
+ View
diff --git a/resources/views/layout2/partials/filterselect.blade.php b/resources/views/layout2/partials/filterselect.blade.php index b1e6780..8759e59 100644 --- a/resources/views/layout2/partials/filterselect.blade.php +++ b/resources/views/layout2/partials/filterselect.blade.php @@ -1,18 +1,17 @@