Skip to content
Open

Dev #3648

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions resources/views/layout/anti-fouc.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{{--
Hide dropdown panels only. Superfish adds .sub-menu to the top-level <li>s,
so a bare .sub-menu { display:none } hides the whole header nav.
--}}
<style>
.hide { display: none !important; }
ul.sub-menu,
.menu-dropdown { display: none; }
[x-cloak] { display: none !important; }
@@media (min-width: 1280px) {
.xl\:hidden { display: none !important; }
}
</style>
10 changes: 3 additions & 7 deletions resources/views/layout/base.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<!DOCTYPE html>
<html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
<head>
@include('layout.analytics')
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
Expand All @@ -12,18 +11,16 @@
<link rel="shortcut icon" href="/images/favicon.png" type="image/x-icon">
<link rel="icon" href="/images/favicon.png" type="image/x-icon">

@include('layout.anti-fouc')
@vite(['resources/assets/sass/app.scss', 'resources/js/app.js'])

<link href="{{asset('css/cookiecuttr.css')}}" media="screen" rel="stylesheet"/>
<link href="{{asset('css/fonts.css')}}" media="screen" rel="stylesheet"/>

@stack('extra-css')

@yield('extra-css')


{{-- @vite('resources/css/app.css')--}}
@vite(['resources/assets/sass/app.scss', 'resources/js/app.js'])
{{-- @vite(['resources/css/app.css', 'resources/js/app.js'])--}}
@include('layout.analytics')



Expand Down Expand Up @@ -117,7 +114,6 @@
}(document, 'script', 'facebook-jssdk'));
</script>

@vite('resources/js/app.js')
<script type="text/javascript" src="{{ asset('lib/jquery/jquery.js') }}"></script>
{{--<script src=//cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.3/Chart.min.js charset=utf-8></script>--}}
<script type="text/javascript" src="{{ asset('js/ext/plugins.js') }}"></script>
Expand Down
9 changes: 3 additions & 6 deletions resources/views/layout/guest.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<!DOCTYPE html>
<html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
<head>
@include('layout.analytics')
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
Expand All @@ -12,18 +11,16 @@
<link rel="shortcut icon" href="/images/favicon.png" type="image/x-icon">
<link rel="icon" href="/images/favicon.png" type="image/x-icon">

@include('layout.anti-fouc')
@vite(['resources/assets/sass/app.scss', 'resources/js/app.js'])

<link href="{{asset('css/cookiecuttr.css')}}" media="screen" rel="stylesheet"/>
<link href="{{asset('css/fonts.css')}}" media="screen" rel="stylesheet"/>

@stack('extra-css')

@yield('extra-css')


{{-- @vite('resources/css/app.css')--}}
@vite(['resources/assets/sass/app.scss', 'resources/js/app.js'])
{{-- @vite(['resources/css/app.css', 'resources/js/app.js'])--}}
@include('layout.analytics')



Expand Down
8 changes: 3 additions & 5 deletions resources/views/layout/new_base.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<!DOCTYPE html>
<html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
<head>
@include('layout.analytics')
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
Expand All @@ -12,6 +11,8 @@
<link rel="shortcut icon" href="/images/favicon.png" type="image/x-icon">
<link rel="icon" href="/images/favicon.png" type="image/x-icon">

@include('layout.anti-fouc')
@vite(['resources/assets/sass/app.scss', 'resources/js/app.js'])

<link href="{{asset('css/cookiecuttr.css')}}" media="screen" rel="stylesheet" />
<link href="{{asset('css/fonts.css')}}" media="screen" rel="stylesheet" />
Expand All @@ -20,10 +21,7 @@
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick-theme.min.css" />

@stack('extra-css')

{{-- @vite('resources/css/app.css')--}}
@vite(['resources/assets/sass/app.scss', 'resources/js/app.js'])
{{-- @vite(['resources/css/app.css', 'resources/js/app.js'])--}}
@include('layout.analytics')

<script>
window.App = {!! json_encode([
Expand Down
8 changes: 4 additions & 4 deletions resources/views/layout/tall.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<!DOCTYPE html>
<html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
<head>
@include('layout.analytics')
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
Expand All @@ -12,15 +11,16 @@
<link rel="shortcut icon" href="/images/favicon.png" type="image/x-icon">
<link rel="icon" href="/images/favicon.png" type="image/x-icon">

@include('layout.anti-fouc')
@vite(['resources/assets/sass/app.scss'])

<link href="{{asset('css/fonts.css')}}" media="screen" rel="stylesheet"/>
<link href="{{asset('css/cookiecuttr.css')}}" media="screen" rel="stylesheet"/>

@stack('extra-css')

@yield('extra-css')

@vite(['resources/assets/sass/app.scss'])
{{-- @vite(['resources/assets/sass/app.scss', 'resources/js/app.js'])--}}
@include('layout.analytics')


<script>
Expand Down
Loading