From a2e061ad2e5e5fc394e7efb7616ea4d71f564fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20Ferenczi?= <ferenczi.krisztian@gmail.com>
Date: Mon, 4 Jul 2016 15:39:21 +0200
Subject: [PATCH] Feature/videofix (#1220)

[GeneratorBundle] Feature/videofix
---
 .../skeleton/layout/Resources/ui/js/app.js                    | 4 ++--
 .../Resources/ui/scss/components/pageparts/_totop-pp.scss     | 3 +--
 .../Resources/ui/scss/components/pageparts/_video-pp.scss     | 4 ++--
 .../Resources/ui/scss/config/vendors/_cargobay-imports.scss   | 3 ++-
 .../skeleton/layout/gulp/.groundcontrolrc                     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/js/app.js b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/js/app.js
index f0919f68dd..a1d265948a 100644
--- a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/js/app.js
+++ b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/js/app.js
@@ -5,11 +5,11 @@ var {{ bundle.getName() }} = {{ bundle.getName() }} || {};
     var init;
 
     init = function() {
-{% if demosite %}
+        cargobay.videolink.init();        
         cargobay.scrollToTop.init();
+{% if demosite %}
         cargobay.toggle.init();
         cargobay.sidebarToggle.init();
-        cargobay.videolink.init();
         cargobay.cookieConsent.init();
         {{ bundle.getName() }}.search.init();
         {{ bundle.getName() }}.demoMsg.init();
diff --git a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/components/pageparts/_totop-pp.scss b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/components/pageparts/_totop-pp.scss
index 11a6d901a7..cea0dd5fbb 100644
--- a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/components/pageparts/_totop-pp.scss
+++ b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/components/pageparts/_totop-pp.scss
@@ -5,7 +5,7 @@
 .totop-pp {
     margin: 3rem 0;
 
-{% if demosite %}
+
     padding-bottom: .5rem;
 
     font-size: .85rem;
@@ -17,7 +17,6 @@
 
         color: $text-color;
     }
-{% endif %}
 }
 
 /*doc
diff --git a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/components/pageparts/_video-pp.scss b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/components/pageparts/_video-pp.scss
index b965adc8c8..1b69eadb63 100644
--- a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/components/pageparts/_video-pp.scss
+++ b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/components/pageparts/_video-pp.scss
@@ -12,7 +12,7 @@
 
 /* videolink
    ========================================================================== */
-{% if demosite %}
+
 .videolink {
     a {
         position: relative;
@@ -42,7 +42,7 @@
         }
     }
 }
-{% endif %}
+
 
 /*doc
 ---
diff --git a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/config/vendors/_cargobay-imports.scss b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/config/vendors/_cargobay-imports.scss
index da217a1592..e7b509b1e5 100644
--- a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/config/vendors/_cargobay-imports.scss
+++ b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/scss/config/vendors/_cargobay-imports.scss
@@ -11,5 +11,6 @@
         "app/Resources/vendor_bower/cargobay/src/sidebar-toggle/styles/scss/sidebar-toggle",
         "app/Resources/vendor_bower/cargobay/src/videolink/styles/scss/videolink";
 {% else %}
-@import "app/Resources/vendor_bower/cargobay/src/cookie-consent/styles/scss/cookie-consent";
+@import "app/Resources/vendor_bower/cargobay/src/cookie-consent/styles/scss/cookie-consent",
+        "app/Resources/vendor_bower/cargobay/src/videolink/styles/scss/videolink";
 {% endif %}
diff --git a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/gulp/.groundcontrolrc b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/gulp/.groundcontrolrc
index 8d847511ab..47bd35cbd8 100644
--- a/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/gulp/.groundcontrolrc
+++ b/src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/gulp/.groundcontrolrc
@@ -41,9 +41,9 @@
 	    "<=bowerComponentsPath>cargobay/src/toggle/js/jquery.toggle.js",
 	    "<=bowerComponentsPath>cargobay/src/sidebar-toggle/js/jquery.sidebar-toggle.js",
 	    "<=bowerComponentsPath>cargobay/src/cookie-consent/js/jquery.cookie-consent.js",
+{% endif %}
 	    "<=bowerComponentsPath>cargobay/src/scroll-to-top/js/jquery.scroll-to-top.js",
 	    "<=bowerComponentsPath>cargobay/src/videolink/js/jquery.videolink.js",
-{% endif %}
         "<=bowerComponentsPath>picturefill/dist/pictureFill.js",
 	    "<=resourcesPath>ui/js/**/*.js"
 	],