From 02e576ebc7ce4aaf6a540e553b4a4838ebb5a525 Mon Sep 17 00:00:00 2001 From: adametz Date: Mon, 6 Mar 2017 15:27:09 +0000 Subject: [PATCH] CSS Anpassungen Reiseprogramm-Tabs Mauszeiger / nav-tabs curser Pointer Anpassung Logos im Footer /images/st2/icons/arrowup.gif bei Video Link entfernen Model (Layer) Scrollbar / Ohne Script git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3311 f459cee4-fb09-11de-96c3-f9c5f16c3c76 --- .../views/default/components/footer.html.twig | 9 ++---- .../assets/less/includes/sections_pages.less | 29 +++++++++++++++++-- .../AppBundle/Resources/public/css/custom.css | 25 +++++++++++++++- .../AppBundle/Resources/public/js/custom.js | 2 +- 4 files changed, 55 insertions(+), 10 deletions(-) diff --git a/trunk/app/Resources/views/default/components/footer.html.twig b/trunk/app/Resources/views/default/components/footer.html.twig index f474ac29..6bb252f2 100644 --- a/trunk/app/Resources/views/default/components/footer.html.twig +++ b/trunk/app/Resources/views/default/components/footer.html.twig @@ -78,9 +78,6 @@ {% image '@AppBundle/Resources/public/images/logos/rundv.png' %}R + V{% endimage %}
-
- {% image '@AppBundle/Resources/public/images/logos/reisebuero.png' %}Empfohlenes Reisebüro{% endimage %} -
{% image '@AppBundle/Resources/public/images/logos/DB.png' %}DB Bahn{% endimage %}
@@ -91,14 +88,14 @@

Sicherheit & starke Marken:

- {% image '@AppBundle/Resources/public/images/logos/ssl.png' %}SSL{% endimage %} + {% image '@AppBundle/Resources/public/images/logos/ssl.png' %}SSL{% endimage %}
- {% image '@AppBundle/Resources/public/images/logos/logo-jugendreisen-spezialist.png' %}jugendreisen spezialist{% endimage %} + {% image '@AppBundle/Resources/public/images/logos/logo-jugendreisen-spezialist.png' %}jugendreisen spezialist{% endimage %}
- {% image '@AppBundle/Resources/public/images/logos/fairliners_g.png' %}fairliners{% endimage %} + {% image '@AppBundle/Resources/public/images/logos/fairliners_g.png' %}fairliners{% endimage %}
diff --git a/trunk/src/AppBundle/Resources/assets/less/includes/sections_pages.less b/trunk/src/AppBundle/Resources/assets/less/includes/sections_pages.less index 17d53c48..385b7245 100644 --- a/trunk/src/AppBundle/Resources/assets/less/includes/sections_pages.less +++ b/trunk/src/AppBundle/Resources/assets/less/includes/sections_pages.less @@ -18,6 +18,27 @@ body.modal-open { overflow: auto !important; } +.modal-dialog{ + overflow-y: initial !important +} +.modal-body{ + max-height: 85vh; + overflow-y: auto; + + +@media screen and (max-height: 1000px){ + max-height: 80vh; +} +@media screen and (max-height: 800px){ + max-height: 75vh; +} + @media screen and (max-height: 600px){ + max-height: 70vh; +} + +} + + /* background setup */ .background { background-repeat:no-repeat; @@ -362,7 +383,8 @@ i { margin-bottom: 5px; } } */ - + .nav-tabs > li { + } .nav-tabs > li > a { margin-right: 2px; line-height: 1.42857143; @@ -373,15 +395,18 @@ i { font-weight: 600; white-space: nowrap; padding: 10px 10px; + cursor: pointer; + } .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus, .nav-tabs > li > a:hover, .nav-tabs > li > a:focus { color: #fff; - cursor: default; + //cursor: default; background-color: @brand-secondary; border: 1px solid #ddd; border-bottom-color: transparent; + cursor: pointer; .fa { color: #fff; } diff --git a/trunk/src/AppBundle/Resources/public/css/custom.css b/trunk/src/AppBundle/Resources/public/css/custom.css index 61ce835b..b64019ec 100644 --- a/trunk/src/AppBundle/Resources/public/css/custom.css +++ b/trunk/src/AppBundle/Resources/public/css/custom.css @@ -1890,6 +1890,28 @@ body.modal-open { .modal-open { overflow: auto !important; } +.modal-dialog { + overflow-y: initial !important; +} +.modal-body { + max-height: 85vh; + overflow-y: auto; +} +@media screen and (max-height: 1000px) { + .modal-body { + max-height: 80vh; + } +} +@media screen and (max-height: 800px) { + .modal-body { + max-height: 75vh; + } +} +@media screen and (max-height: 600px) { + .modal-body { + max-height: 70vh; + } +} /* background setup */ .background { background-repeat: no-repeat; @@ -2223,6 +2245,7 @@ i { font-weight: 600; white-space: nowrap; padding: 10px 10px; + cursor: pointer; } #content section .nav-tabs > li.active > a, #content section .nav-tabs > li.active > a:hover, @@ -2230,10 +2253,10 @@ i { #content section .nav-tabs > li > a:hover, #content section .nav-tabs > li > a:focus { color: #fff; - cursor: default; background-color: #ffc926; border: 1px solid #ddd; border-bottom-color: transparent; + cursor: pointer; } #content section .nav-tabs > li.active > a .fa, #content section .nav-tabs > li.active > a:hover .fa, diff --git a/trunk/src/AppBundle/Resources/public/js/custom.js b/trunk/src/AppBundle/Resources/public/js/custom.js index 37e3df14..c06f6732 100644 --- a/trunk/src/AppBundle/Resources/public/js/custom.js +++ b/trunk/src/AppBundle/Resources/public/js/custom.js @@ -30,7 +30,7 @@ jQuery(document).ready(function($) { ; el$ .addClass('st-collapsed') - .css('background-image', 'url(/images/st2/icons/arrowup.gif)') + //.css('background-image', 'url(/images/st2/icons/arrowup.gif)') .text(caption + ' einblenden') .attr('href', 'javascript:void(0);') ;