Mercurial Mercurial > corpus_parole / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correct rootUrl for module + css on FF 38
authorymh <ymh.work@gmail.com>
Mon, 28 Nov 2016 22:17:48 +0100
changeset 452 85cf1c3a2fea
parent 451 1a11d01ece78
child 453 1059a7ae018a
correct rootUrl for module + css on FF 38
cms/app-client/app/styles/app.scss file | annotate | diff | comparison | revisions
cms/corpus_module/corpus.module.tmpl file | annotate | diff | comparison | revisions 
--- 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 {
--- 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()
corpus_parole