From ec10f42fc8af7f88ecc57529fccc2741b5f9c608 Mon Sep 17 00:00:00 2001 From: "valentin.wacker" Date: Tue, 23 May 2017 12:05:40 +0000 Subject: [PATCH] #1338 git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3337 f459cee4-fb09-11de-96c3-f9c5f16c3c76 --- .../views/default/pages/cms/offers.html.twig | 2 +- .../Resources/assets/less/includes/fonts.less | 2 +- .../assets/less/includes/sections_pages.less | 4 ++ .../AppBundle/Resources/public/css/custom.css | 63 ++++++++++--------- 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/trunk/app/Resources/views/default/pages/cms/offers.html.twig b/trunk/app/Resources/views/default/pages/cms/offers.html.twig index 269d850f..0a90b577 100644 --- a/trunk/app/Resources/views/default/pages/cms/offers.html.twig +++ b/trunk/app/Resources/views/default/pages/cms/offers.html.twig @@ -8,7 +8,7 @@ {{ page.content|raw|keywords }} -
+

Unsere beliebtesten Kulturreisen

{{ render(controller('AppBundle:Component:offersCarousel', {country: page.effectiveCountry})) }} diff --git a/trunk/src/AppBundle/Resources/assets/less/includes/fonts.less b/trunk/src/AppBundle/Resources/assets/less/includes/fonts.less index ff5744ae..2d34b95d 100644 --- a/trunk/src/AppBundle/Resources/assets/less/includes/fonts.less +++ b/trunk/src/AppBundle/Resources/assets/less/includes/fonts.less @@ -2,7 +2,7 @@ FONTS ================================================================== */ -@import url(http://fonts.googleapis.com/css?family=Raleway:400,100,200,300,500,600,700,800,900); +@import url(https://fonts.googleapis.com/css?family=Raleway:400,100,200,300,500,600,700,800,900); @import url(https://fonts.googleapis.com/css?family=Oswald:400,700); @import url(https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css); 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 385b7245..31daead5 100644 --- a/trunk/src/AppBundle/Resources/assets/less/includes/sections_pages.less +++ b/trunk/src/AppBundle/Resources/assets/less/includes/sections_pages.less @@ -38,6 +38,10 @@ body.modal-open { } +.modal-body .hide-in-modal{ + display: none; +} + /* background setup */ .background { diff --git a/trunk/src/AppBundle/Resources/public/css/custom.css b/trunk/src/AppBundle/Resources/public/css/custom.css index 43067448..bdd8f40a 100644 --- a/trunk/src/AppBundle/Resources/public/css/custom.css +++ b/trunk/src/AppBundle/Resources/public/css/custom.css @@ -1,4 +1,10 @@ -@charset "UTF-8"; +@import url(https://fonts.googleapis.com/css?family=Raleway:400,100,200,300,500,600,700,800,900); +@import url(https://fonts.googleapis.com/css?family=Oswald:400,700); +@import url(https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css); +@import url(../../app/css/font-awesome-4.7.0.css); +@import url(../../app/css/bootstrap-select-1.12.0.css); +@import url(../../app/css/owl-carousel.css); +@import url(../../app/css/prettyPhoto.css); /* 0. =BOOTSTRAP FRAMEWORK REFERENCE IMPORTS @@ -15,13 +21,6 @@ A customized "theme_custom_bootstrap.css" is also loaded by the theme in a preco /* ================================================================== FONTS ================================================================== */ -@import url(https://fonts.googleapis.com/css?family=Raleway:400,100,200,300,500,600,700,800,900); -@import url(https://fonts.googleapis.com/css?family=Oswald:400,700); -@import url(https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css); -@import url(../../app/css/font-awesome-4.7.0.css); -@import url(../../app/css/bootstrap-select-1.12.0.css); -@import url(../../app/css/owl-carousel.css); -@import url(../../app/css/prettyPhoto.css); /* 2) RESET =============================================================== @@ -1918,6 +1917,9 @@ body.modal-open { max-height: 70vh; } } +.modal-body .hide-in-modal { + display: none; +} /* background setup */ .background { background-repeat: no-repeat; @@ -2048,7 +2050,7 @@ body.modal-open { .carousel-indicators li { width: 26px; height: 26px; - background-color: #fff; + background-color: #ffffff; border: 1px solid #ffc926; border-radius: 50%; box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.4); @@ -2058,7 +2060,7 @@ body.modal-open { width: 26px; height: 26px; background-color: #ffc926; - border: 1px solid #fff; + border: 1px solid #ffffff; border-radius: 50%; box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.4); } @@ -2079,7 +2081,7 @@ a.carousel-control .glyphicon { .px-bullet { width: 26px; height: 26px; - background-color: #fff; + background-color: #ffffff; border: 1px solid #ffc926; border-radius: 50%; cursor: pointer; @@ -2089,11 +2091,11 @@ a.carousel-control .glyphicon { } .px-bullet:hover { background-color: #ffc926; - border: 1px solid #fff; + border: 1px solid #ffffff; } .px-bullet-selected { background-color: #ffc926; - border: 1px solid #fff; + border: 1px solid #ffffff; } #ui-datepicker-div { z-index: 1000 !important; @@ -2368,18 +2370,18 @@ i { font-family: 'Oswald', serif; font-weight: 400; color: #5a5a5a; - border-color: #fff; + border-color: #ffffff; margin-bottom: 40px; } .table > thead > tr > th { background-color: #d8d8d8; - border: 1px solid #fff; + border: 1px solid #ffffff; text-align: center; vertical-align: middle; } .table > tbody > tr > td { background-color: #f2f2f2; - border: 1px solid #fff; + border: 1px solid #ffffff; text-align: center; vertical-align: middle; } @@ -2425,7 +2427,7 @@ i { font-size: 20px; float: left; background: #ffc926; - color: #fff; + color: #ffffff; border-radius: 50%; margin-top: 4px; } @@ -2675,7 +2677,7 @@ nav hr { background-color: transparent; } .dropdown-menu li { - color: #fff; + color: #ffffff; padding: 10px 12px 5px !important; font-size: 14px; line-height: 28px; @@ -2688,7 +2690,7 @@ nav hr { } .dropdown-menu > li:hover, .dropdown-menu > li:focus { - color: #fff; + color: #ffffff; background: #ffc926; } .yamm .dropdown-menu li h3 { @@ -3026,7 +3028,7 @@ footer.clearfix { background-color: #777777; padding: 30px 0 30px; font-size: 16px; - color: #fff; + color: #ffffff; } .footer .left-img { float: left; @@ -3053,8 +3055,8 @@ footer.clearfix { } .footer .form-control { background-color: #919191; - border-color: #fff; - color: #fff; + border-color: #ffffff; + color: #ffffff; height: 45px; margin: 0 6px 0 0; -webkit-border-radius: 50px; @@ -3121,14 +3123,14 @@ footer.clearfix { background-color: #e5aa30; } .footer .form-control::-moz-placeholder { - color: #fff; + color: #ffffff; opacity: 1; } .footer .form-control:-ms-input-placeholder { - color: #fff; + color: #ffffff; } .footer .form-control::-webkit-input-placeholder { - color: #fff; + color: #ffffff; } .footer .btn-primary { height: 45px !important; @@ -3145,7 +3147,7 @@ footer.clearfix { background-color: #5e5e5e; padding: 30px 0; font-size: 15px; - color: #fff; + color: #ffffff; } .copyrights p { margin: 0; @@ -3159,7 +3161,7 @@ footer.clearfix { margin-left: 7px; } .link-footer a:hover i { - color: #fff !important; + color: #ffffff !important; } /* 13) SIDEBAR WIDGETS @@ -3250,7 +3252,7 @@ footer.clearfix { height: 26px; border-radius: 50%; line-height: 26px; - color: #fff; + color: #ffffff; padding-left: 8px; font-size: 18px; } @@ -3874,7 +3876,7 @@ a, left: 0; top: 3px; margin-left: -20px; - border: 1px solid #ccc; + border: 1px solid #cccccc; border-radius: 3px; background-color: #fff; -webkit-transition: border 0.15s ease-in-out, color 0.15s ease-in-out; @@ -4044,7 +4046,7 @@ a, height: 17px; left: 0; margin-left: -20px; - border: 1px solid #ccc; + border: 1px solid #cccccc; border-radius: 50%; background-color: #fff; -webkit-transition: border 0.15s ease-in-out; @@ -4156,6 +4158,7 @@ input[type="radio"] .styled:checked + label::after { 18) FONT TRIPS =============================================================== */ +@charset "UTF-8"; @font-face { font-family: "trips"; src: url("../fonts/trips.eot");