Feature/videofix (#1220)

[GeneratorBundle] Feature/videofix
Kunstmaan · Jul 4, 2016 · a2e061a · a2e061a
1 parent 60c7b29
commit a2e061a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/...an/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/Resources/ui/js/app.js b/...an/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/...nsioGeneratorBundle/skeleton/layout/Resources/ui/scss/components/pageparts/_totop-pp.scss b/...nsioGeneratorBundle/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/...nsioGeneratorBundle/skeleton/layout/Resources/ui/scss/components/pageparts/_video-pp.scss b/...nsioGeneratorBundle/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/...ioGeneratorBundle/skeleton/layout/Resources/ui/scss/config/vendors/_cargobay-imports.scss b/...ioGeneratorBundle/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/...aan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/layout/gulp/.groundcontrolrc b/...aan/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"
 	],