diff --git a/app/CMS/Widgets/Menu/Presenters/Menu.php b/app/CMS/Widgets/Menu/Presenters/Menu.php index 040dda3e..b65702f9 100644 --- a/app/CMS/Widgets/Menu/Presenters/Menu.php +++ b/app/CMS/Widgets/Menu/Presenters/Menu.php @@ -6,9 +6,7 @@ use App\CMS\Contracts\Widgets\WidgetRenderer; use App\CMS\Widgets\Menu\Menu as WidgetMenu; use App\Models\Widgets\Widget; use App\Models\Widgets\WidgetType; -use Illuminate\Support\Collection; use Illuminate\Support\Facades\App; -use Illuminate\Support\Facades\Request; use Illuminate\Support\Facades\Route; class Menu implements WidgetRenderer @@ -36,8 +34,8 @@ class Menu implements WidgetRenderer return $a->order - $b->order; }); - $route = Request::route() - ->getName(); + $routeName = Route::current() + ->getName(); $parameters = Route::current() ->parameters(); @@ -55,7 +53,7 @@ class Menu implements WidgetRenderer } $page = $pages[$pageId]; - $active = ($page->isHomepage && $route == 'page.index') || ($route == 'page.content' && isset($parameters['url']) && $parameters['url'] == $page->url); + $active = ($page->isHomepage && $routeName == 'page.index') || ($routeName == 'page.content' && isset($parameters['url']) && $parameters['url'] == $page->url); $route = $page->isHomepage ? route('page.index') : route('page.content', ['url' => $page->url]); $code .= 'settings = new \stdClass(); $widget->settings->links = []; - return view('admin.widgets.menu.new', [ 'type' => $type, 'widget' => $widget, diff --git a/templates/PragueTennisCamp/Resources/assets/css/app.css b/templates/PragueTennisCamp/Resources/assets/css/app.css index 1509bb31..48b3e9f5 100644 --- a/templates/PragueTennisCamp/Resources/assets/css/app.css +++ b/templates/PragueTennisCamp/Resources/assets/css/app.css @@ -1,16 +1,18 @@ +/* https://coolors.co/3f3f37-eef4d4-983628-ff7f11-daefb3 */ + body { font-family: Ubuntu; text-align: justify; - background: url("./images/bg.png"); + background: #eef4d4 url("./images/bg.png"); } header.top-bar { - position: fixed; - top: 0; - left: 0; - right: 0; - z-index: 100; - background: rgba(0, 0, 0, 0.8); + background: #3f3f37; + padding: 0; +} + +header.top-bar h1 { + font-size: 100%; } header.top-bar ul { @@ -21,24 +23,20 @@ header.top-bar a { color: white; } +.menu .active > a { + background: #ff7f11; +} + .logo { max-height: 35px; } h1, h2, h3, h4 { font-family: Comfortaa; - color: rgb(81, 81, 81); + color: #ff7f11; } -.over-slider-stripe { - position: absolute; - top: 25%; - font-size: 230%; - font-family: Comfortaa; - background: rgba(0, 0, 0, 0.8); - color: white; -} .stripe { padding: 50px; @@ -59,9 +57,42 @@ h1, h2, h3, h4 { padding-left: 150px; } -.content-container { - margin-top: 70px; +.content-container.row { line-height: 170%; + padding: 1em; + background: #FFFEF0; +} + +.orbit { + position: relative; + overflow: hidden; +} + +.orbit-bullets { + margin-top: -54px; + padding-bottom: 11px; +} + +.orbit .stripe { + height: 20px; + background: rgba(255,255,255, 0.2); + position: absolute; + left: 0; + right: 0; + padding: 0; + margin: 0; +} + +.orbit-top { + top: 0; +} + +.orbit-bottom { + bottom: 0; +} + +.slow { + transition-duration: 4500ms !important; } .trainee-team .thumbnail { diff --git a/templates/PragueTennisCamp/Resources/assets/css/images/bg.jpg b/templates/PragueTennisCamp/Resources/assets/css/images/bg.jpg new file mode 100644 index 00000000..5e40aabe Binary files /dev/null and b/templates/PragueTennisCamp/Resources/assets/css/images/bg.jpg differ diff --git a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepage.blade.php b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepage.blade.php index ee4741fe..f3ea1333 100644 --- a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepage.blade.php +++ b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepage.blade.php @@ -1,50 +1,50 @@ @extendVisitor('defaultLayout') @section('content') - @if(count($page->files) > 0) + @php $images = $page->files()->where('mime_type', 'like', 'image%')->get(); @endphp + @if(count($images) > 0)
+ data-options="animationDuration:3000; animInFromLeft:fade-in; animInFromRight:fade-in; animOutToLeft:fade-out; animOutToRight:fade-out;"> + + + +
+
@endif -
-

{{$page->title}}

-

{{$page->metaDescription}}

-
- -
{!! $page->pageContent !!} + +
+ +

{{$page->traineeTeamCategory->name}}

+ + @foreach($page->traineeTeamCategory->content as $i => $subpage) + + @endforeach +
+
- - -
- -

{{$page->traineeTeamCategory->name}}

- - @foreach($page->traineeTeamCategory->content as $i => $subpage) - - @endforeach -
-
- - @widgetArea('belowHomepage') - @endsection \ No newline at end of file diff --git a/templates/PragueTennisCamp/Resources/views/visitor/defaultLayout.blade.php b/templates/PragueTennisCamp/Resources/views/visitor/defaultLayout.blade.php index 8b222cb6..b8e7cc64 100644 --- a/templates/PragueTennisCamp/Resources/views/visitor/defaultLayout.blade.php +++ b/templates/PragueTennisCamp/Resources/views/visitor/defaultLayout.blade.php @@ -35,10 +35,12 @@ @endif
-
- - - +
@widgetArea('mainMenu')