# HG changeset patch # User ymh # Date 1480367868 -3600 # Node ID 85cf1c3a2fea15bc971f800953270bf0031b608d # Parent 1a11d01ece786e15264fb2e24fb3fe4252df6920 correct rootUrl for module + css on FF 38 diff -r 1a11d01ece78 -r 85cf1c3a2fea cms/app-client/app/styles/app.scss --- a/cms/app-client/app/styles/app.scss Mon Nov 28 17:07:13 2016 +0100 +++ b/cms/app-client/app/styles/app.scss Mon Nov 28 22:17:48 2016 +0100 @@ -87,12 +87,14 @@ box-sizing: border-box; background-color: $corpus-white; position: relative; - overflow: scroll; + overflow: hidden; } body.videoscreen .corpus-app-container { margin-top: 260px; height: 280px; + overflow-x: hidden; + overflow-y: scroll; } h2 { diff -r 1a11d01ece78 -r 85cf1c3a2fea cms/corpus_module/corpus.module.tmpl --- a/cms/corpus_module/corpus.module.tmpl Mon Nov 28 17:07:13 2016 +0100 +++ b/cms/corpus_module/corpus.module.tmpl Mon Nov 28 22:17:48 2016 +0100 @@ -104,13 +104,13 @@ function corpus_page() { $app = CORPUS_APP; - $path = drupal_get_path('module', MODULE_NAME) . '/' . $app; + $path = rtrim(drupal_get_path('module', MODULE_NAME), '/') . '/' . $app; $appEnvironment = array( "rootElement" => "#corpus-app", "modulePrefix" => CORPUS_APP, "environment" => CORPUS_ENV, - "rootURL" => drupal_get_path('module', MODULE_NAME), + "rootURL" => "$path/", "locationType" => "hash", "EmberENV" => array( "FEATURES" => array()