From 2a15f3eab510270acbcf19bc905b089502ddc635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Thu, 2 Mar 2017 23:47:27 +0100 Subject: [PATCH] FEATURE #2351 @30m: modify responsive version --- .../Resources/assets/css/app.css | 29 ++++++++++++++++--- .../contactform/visitor/default.blade.php | 5 ++-- .../staticpages/visitor/default.blade.php | 13 +-------- .../staticpages/visitor/homepage.blade.php | 29 ++++++++++++------- .../views/visitor/commonHeader.blade.php | 19 ++++++++++++ .../views/visitor/defaultLayout.blade.php | 8 ++--- 6 files changed, 69 insertions(+), 34 deletions(-) create mode 100644 templates/PragueTennisCamp/Resources/views/visitor/commonHeader.blade.php diff --git a/templates/PragueTennisCamp/Resources/assets/css/app.css b/templates/PragueTennisCamp/Resources/assets/css/app.css index 1fd34add..170d684a 100644 --- a/templates/PragueTennisCamp/Resources/assets/css/app.css +++ b/templates/PragueTennisCamp/Resources/assets/css/app.css @@ -17,6 +17,10 @@ a { color: #FF7F11; } +a:hover { + color: #983628; +} + /** HEADER **/ header.top-bar { background: #3F3F37; @@ -52,6 +56,11 @@ header.top-bar h1 a { background: #FF7F11; } +.menu a:hover { + background: #983628; + transition: background 400ms linear; +} + .logo { max-height: 25px; margin: 0 15px; @@ -59,7 +68,6 @@ header.top-bar h1 a { /** END HEADER **/ - .stripe { width: 100%; } @@ -90,7 +98,7 @@ header.top-bar h1 a { .orbit .stripe { height: 20px; - background: rgba(255,127,17, 0.3); + background: rgba(255, 127, 17, 0.3); position: absolute; left: 0; right: 0; @@ -114,6 +122,7 @@ header.top-bar h1 a { .trainee-team { margin-top: 2em; } + .trainee-team .thumbnail { max-height: 150px; } @@ -132,12 +141,24 @@ header.top-bar h1 a { border: solid 1px #CCC; } - #footer { + margin-bottom: 150px; +} + +#footer-widgets { border-top: solid 2px #FF7F11; background: #3F3F37; - margin-bottom: 150px; padding: 1em; border-radius: 0 0 5px 5px; color: #EEF4D4; } + +#binarity { + margin-top: 2em; +} + +@media screen and (max-width: 639px) { + .menu > li { + display: block !important; + } +} \ No newline at end of file diff --git a/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/default.blade.php b/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/default.blade.php index 71cd99c6..a7e2e69b 100644 --- a/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/default.blade.php +++ b/templates/PragueTennisCamp/Resources/views/modules/contactform/visitor/default.blade.php @@ -1,11 +1,10 @@ @extendVisitor('defaultLayout') @section('topMenu') -
- @widgetArea('mainMenu') -
+ @include(\App\CMS\Helpers\Template::name('commonHeader')) @endsection + @section('content')
diff --git a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/default.blade.php b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/default.blade.php index 3e45a3ef..91bd3d2e 100644 --- a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/default.blade.php +++ b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/default.blade.php @@ -1,18 +1,7 @@ @extendVisitor('defaultLayout') @section('topMenu') - - -
- @widgetArea('mainMenu') -
+ @include(\App\CMS\Helpers\Template::name('commonHeader')) @endsection @section('content') 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 e9ea5e00..517c361a 100644 --- a/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepage.blade.php +++ b/templates/PragueTennisCamp/Resources/views/modules/staticpages/visitor/homepage.blade.php @@ -1,14 +1,23 @@ @extendVisitor('defaultLayout', ['test' => 1]) @section('topMenu') -
-

- - - {{setting('pageName')}} - -

+

+ + + {{setting('pageName')}} + +

+ +
+
+ +
+ +
+ @endsection @section('content') @@ -29,11 +38,9 @@ @endforeach - - {{--
--}} - {{--
--}}
-
+ +
@widgetArea('mainMenu')
@endif diff --git a/templates/PragueTennisCamp/Resources/views/visitor/commonHeader.blade.php b/templates/PragueTennisCamp/Resources/views/visitor/commonHeader.blade.php new file mode 100644 index 00000000..d43328c2 --- /dev/null +++ b/templates/PragueTennisCamp/Resources/views/visitor/commonHeader.blade.php @@ -0,0 +1,19 @@ +
+ +
+ + + diff --git a/templates/PragueTennisCamp/Resources/views/visitor/defaultLayout.blade.php b/templates/PragueTennisCamp/Resources/views/visitor/defaultLayout.blade.php index edcefc34..caf1486d 100644 --- a/templates/PragueTennisCamp/Resources/views/visitor/defaultLayout.blade.php +++ b/templates/PragueTennisCamp/Resources/views/visitor/defaultLayout.blade.php @@ -45,10 +45,10 @@
-