From 070e929bf71a61ecc1266a5f60d6ab36e4cf663a Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 18 Apr 2016 23:48:40 +0200 Subject: [PATCH 1/2] FEATURE: changes according to client mostly in texts and some graphical changes. HTML code validation changes --- resources/views/visitor/cwbs/assets/style.css | 11 ++++---- .../visitor/cwbs/defaultLayout.blade.php | 6 ++--- .../visitor/cwbs/homepageLayout.blade.php | 6 ++--- .../cwbs/modules/Gallery/default.blade.php | 4 ++- .../StaticPages/assortmentSubpage.blade.php | 6 ++--- .../modules/StaticPages/homepage.blade.php | 8 +++--- .../visitor/cwbs/quickFormWrapper.blade.php | 2 +- .../widgets/orbitSlider/element.blade.php | 26 ++++++++++++------- 8 files changed, 36 insertions(+), 33 deletions(-) diff --git a/resources/views/visitor/cwbs/assets/style.css b/resources/views/visitor/cwbs/assets/style.css index 74e68a67..050ea24a 100644 --- a/resources/views/visitor/cwbs/assets/style.css +++ b/resources/views/visitor/cwbs/assets/style.css @@ -2,9 +2,9 @@ body,h1,h2,h3,h4,h5,h6, * {font-family: 'Ubuntu', sans-serif; color: #414042;} a, a:link, a:hover {color: #46c1be; font-weight: 500;} a:hover {text-decoration: underline;} -#binarity {width: 100%; display: block; opacity: 0.65; text-align: center; margin-bottom: 15px; font-size: 0.8rem;} +#binarity {width: 100%; display: block; opacity: 0.65; color: #46c1be; text-align: center; margin-bottom: 15px; font-size: 0.8rem;} #binarity img {margin-left: 10px; margin-right: 5px; height: 18px; width: auto; position: relative; top: -2px;} -#binarity a, #binarity a:hover {color: #89a900;} +#binarity a, #binarity a:hover {color: #46c1be; font-weight: 700;} .m-t-25 {margin-top: 25px;} .m-t-50 {margin-top: 50px;} @@ -45,7 +45,7 @@ textarea, textarea:focus {height: 120px;} color: #414042; } -.subpages.column {float: none; display: inline-block;} +.subpages.column {float: none; display: inline-block; margin-top: 50px;} .subpages.column:last-child:not(:first-child), .subpages.columns:last-child:not(:first-child) { float: none;} .top-bar {position: relative; top: 0; width: 100%;} @@ -56,6 +56,7 @@ textarea, textarea:focus {height: 120px;} .menu > li:not(.menu-text) > a.active,.menu > li:not(.menu-text).active > a {color: #46c1be} .top-bar-right {margin-top: 75px;} #show-menu {font-size: 1.4rem; line-height: 1.4; margin-top: -10px;} +#logo {width:225px; height: auto;} .orbit.header {position: relative; z-index: 1;} .orbit.header .orbit-next, .orbit.header .orbit-previous { background-color: #ffffff; color: #4d4d4f; padding: 40px;} @@ -94,7 +95,7 @@ hr {border-bottom: 0;width: 5%; margin: 0 auto; position: relative; top: -15px; .assortment-h5 {text-align: center; text-transform: uppercase; font-weight: 500; font-size: 1.1rem;} .assortment-p {font-size: 0.8rem; text-align: center; margin: 15px auto 10px; width: 50%;} .assortment-more-btn {color: #46c1be; text-transform: uppercase; font-style: italic; text-align: center; font-size: 0.85rem; width: 100%; display: inline-block; font-weight: 500;} -img.thumbnail {border-radius: 50%; width: 100%; height: 250px; box-shadow: none; border-width: 2px; border-color: #ffffff;} +img.thumbnail {border-radius: 50%; width: 100%; height: auto; box-shadow: none; border-width: 2px; border-color: #ffffff;} img.thumbnail.assortment {width: 250px;} img.thumbnail:focus, img.thumbnail:hover {box-shadow: none; border-color: #ffffff;} @@ -159,7 +160,7 @@ footer a:hover {color: #46c1be !important;} @media (max-width:1023px) { #responsive-menu {display: none;} .top-bar-right .menu.hide-for-large {font-size: 1.5rem; position: absolute; right: 0; top: 25px;} - #logo {width: 175px; height: auto;} + #logo {width:160px; height: auto;} .top-bar-right {margin-top: 0;} .orbit.header .orbit-next, .orbit.header .orbit-previous {font-size: 0.7rem; transform: translateY(-20%);} diff --git a/resources/views/visitor/cwbs/defaultLayout.blade.php b/resources/views/visitor/cwbs/defaultLayout.blade.php index 9520c4bf..3ec17ed9 100644 --- a/resources/views/visitor/cwbs/defaultLayout.blade.php +++ b/resources/views/visitor/cwbs/defaultLayout.blade.php @@ -95,14 +95,12 @@ @widgetArea('mainMenu')
-

- @widgetArea('footer') -

+ @widgetArea('footer')
- Vytvořila společnost binarity s.r.o. logobinarity s.r.o. + Vytvořila společnost binarity s.r.o.
diff --git a/resources/views/visitor/cwbs/homepageLayout.blade.php b/resources/views/visitor/cwbs/homepageLayout.blade.php index add76506..a980c055 100644 --- a/resources/views/visitor/cwbs/homepageLayout.blade.php +++ b/resources/views/visitor/cwbs/homepageLayout.blade.php @@ -157,14 +157,12 @@ @widgetArea('mainMenu')
-

- @widgetArea('footer') -

+ @widgetArea('footer')
- Vytvořila společnost binarity s.r.o. logobinarity s.r.o. + Vytvořila společnost binarity s.r.o.
diff --git a/resources/views/visitor/cwbs/modules/Gallery/default.blade.php b/resources/views/visitor/cwbs/modules/Gallery/default.blade.php index c469d18e..62c619ff 100644 --- a/resources/views/visitor/cwbs/modules/Gallery/default.blade.php +++ b/resources/views/visitor/cwbs/modules/Gallery/default.blade.php @@ -9,7 +9,9 @@
{{$image->name}}
-
{{$image->name}}
+ @if (isset($image->name) && !empty($image->name)) +
{{$image->name}}
+ @endif

{{$image->description}}

{{--

počet ks

cena: 39,-Kč/ks

--}} diff --git a/resources/views/visitor/cwbs/modules/StaticPages/assortmentSubpage.blade.php b/resources/views/visitor/cwbs/modules/StaticPages/assortmentSubpage.blade.php index 87943044..16b4e118 100644 --- a/resources/views/visitor/cwbs/modules/StaticPages/assortmentSubpage.blade.php +++ b/resources/views/visitor/cwbs/modules/StaticPages/assortmentSubpage.blade.php @@ -2,14 +2,14 @@ @section('content')
-
+

{{$page->title}}

@forelse($page->subpages() as $i => $subpage) -
+
- + {{$subpage->title}}
{{$subpage->title}}
{{--

{{$subSubpage->meta_description}}

--}} diff --git a/resources/views/visitor/cwbs/modules/StaticPages/homepage.blade.php b/resources/views/visitor/cwbs/modules/StaticPages/homepage.blade.php index 4daa698a..d8f5f9fa 100644 --- a/resources/views/visitor/cwbs/modules/StaticPages/homepage.blade.php +++ b/resources/views/visitor/cwbs/modules/StaticPages/homepage.blade.php @@ -5,17 +5,15 @@ @if (!empty($page->subpages())) @foreach($page->subpages() as $i => $subpage)
-

{{$subpage->title}}

+

{{$subpage->title}}

-

- {!! $subpage->content !!} -

+ {!! $subpage->content !!}
@if (!empty($subpage->subpages())) @foreach($subpage->subpages() as $y => $subSubpage)
- + {{$subSubpage->title}}
{{$subSubpage->title}}
{{--

{{$subSubpage->meta_description}}

--}} diff --git a/resources/views/visitor/cwbs/quickFormWrapper.blade.php b/resources/views/visitor/cwbs/quickFormWrapper.blade.php index 81341960..dff27b7b 100644 --- a/resources/views/visitor/cwbs/quickFormWrapper.blade.php +++ b/resources/views/visitor/cwbs/quickFormWrapper.blade.php @@ -1,6 +1,6 @@

MÁTE DOTAZY? NEBO NÁM CHCETE ZASLAT RYCHLOU POPTÁVKU?

- NAPIŠTE NÁM! + NAPIŠTE NÁM
diff --git a/resources/views/widgets/orbitSlider/element.blade.php b/resources/views/widgets/orbitSlider/element.blade.php index 7c6691f2..6f6cd9b6 100644 --- a/resources/views/widgets/orbitSlider/element.blade.php +++ b/resources/views/widgets/orbitSlider/element.blade.php @@ -1,20 +1,26 @@ @if (!empty($images))
    - - +
  • + +
    • +
  • + +
    • @if ($settings->imagePerSlide == 'fullscreen') @foreach($images as $i => $image)

  • {{$image->name}}

    -

    {{$image->description}}

    + @if (isset($image->description) && !empty($image->description)) +

    {{$image->description}}

    + @endif
    • @@ -27,7 +33,7 @@ @break @endif
    - + {{config('app.upload_url')}}/{{$images[$i*$settings->imagePerSlide + $j]->name}}
    @endfor From e072e0e4afe8b1a1ecd6bbab2fa6e491f2f49b04 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 19 Apr 2016 00:16:38 +0200 Subject: [PATCH 2/2] FEATURE: added some more changes for client --- resources/views/visitor/cwbs/assets/style.css | 2 +- .../views/visitor/cwbs/modules/ContactForm/contact.blade.php | 1 - .../views/visitor/cwbs/modules/StaticPages/homepage.blade.php | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/views/visitor/cwbs/assets/style.css b/resources/views/visitor/cwbs/assets/style.css index 050ea24a..3fd5d93c 100644 --- a/resources/views/visitor/cwbs/assets/style.css +++ b/resources/views/visitor/cwbs/assets/style.css @@ -2,7 +2,7 @@ body,h1,h2,h3,h4,h5,h6, * {font-family: 'Ubuntu', sans-serif; color: #414042;} a, a:link, a:hover {color: #46c1be; font-weight: 500;} a:hover {text-decoration: underline;} -#binarity {width: 100%; display: block; opacity: 0.65; color: #46c1be; text-align: center; margin-bottom: 15px; font-size: 0.8rem;} +#binarity {width: 100%; display: block; opacity: 0.65; color: #46c1be; text-align: center; margin-bottom: 15px; margin-top:15px; font-size: 0.8rem;} #binarity img {margin-left: 10px; margin-right: 5px; height: 18px; width: auto; position: relative; top: -2px;} #binarity a, #binarity a:hover {color: #46c1be; font-weight: 700;} diff --git a/resources/views/visitor/cwbs/modules/ContactForm/contact.blade.php b/resources/views/visitor/cwbs/modules/ContactForm/contact.blade.php index 6a69ce65..4772cf88 100644 --- a/resources/views/visitor/cwbs/modules/ContactForm/contact.blade.php +++ b/resources/views/visitor/cwbs/modules/ContactForm/contact.blade.php @@ -12,7 +12,6 @@

    {!! nl2br($page->module_settings->address) !!}
    -
    -
    tel.: {{$page->module_settings->phone or "Telefonní kontakt"}}
    e-mail: {{$page->module_settings->email or "e-mail"}}

    diff --git a/resources/views/visitor/cwbs/modules/StaticPages/homepage.blade.php b/resources/views/visitor/cwbs/modules/StaticPages/homepage.blade.php index d8f5f9fa..a0a41c5e 100644 --- a/resources/views/visitor/cwbs/modules/StaticPages/homepage.blade.php +++ b/resources/views/visitor/cwbs/modules/StaticPages/homepage.blade.php @@ -11,7 +11,7 @@
    @if (!empty($subpage->subpages())) @foreach($subpage->subpages() as $y => $subSubpage) -
    +
    {{$subSubpage->title}}