diff --git a/README.txt b/README.txt index 8c891f2..590fc41 100644 --- a/README.txt +++ b/README.txt @@ -23,4 +23,4 @@ TINYMCE ------- To integrate this theme with TinyMCE, configure your editor profile in Drupal by: 1) Under "Editor CSS" select "Define CSS" -2) Under "CSS path", use: //www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/css/ebi-global.css, //www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/libraries/foundation-6/css/foundation.css, //www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/css/ebi-global-drupal.css \ No newline at end of file +2) Under "CSS path", use: https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/css/ebi-global.css, https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/libraries/foundation-6/css/foundation.css, https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/css/ebi-global-drupal.css \ No newline at end of file diff --git a/template.php b/template.php index d0f9f44..7bcaae1 100644 --- a/template.php +++ b/template.php @@ -447,11 +447,11 @@ function ebi_framework_preprocess_html(&$variables) { // TODO: make use of user specified framework version theme_get_setting('ebi_framework_version') $framework_version_to_use = theme_get_setting('ebi_framework_version'); //1.1, etc - $framework_location = 'https://www.ebi.ac.uk/web_guidelines/EBI-Framework/' . 'v' . $framework_version_to_use; // todo: this should be configurable by the UI + $framework_location = 'https://ebi.emblstatic.net/web_guidelines/EBI-Framework/' . 'v' . $framework_version_to_use; // todo: this should be configurable by the UI drupal_add_css($framework_location . '/libraries/foundation-6/css/foundation.css', array('type' => 'external')); drupal_add_css($framework_location . '/css/ebi-global.css', array('type' => 'external')); - drupal_add_css('https://www.ebi.ac.uk/web_guidelines/EBI-Icon-fonts/v1.2/fonts.css', array('type' => 'external')); + drupal_add_css('https://ebi.emblstatic.net/web_guidelines/EBI-Icon-fonts/v1.2/fonts.css', array('type' => 'external')); if (theme_get_setting('ebi_framework_style') === 1) { // autodetect the appropriate theme by the url, /research /services, etc. $url_parts = explode('/', drupal_get_path_alias()); diff --git a/templates/html.tpl.php b/templates/html.tpl.php index 7fa73a5..05aac86 100644 --- a/templates/html.tpl.php +++ b/templates/html.tpl.php @@ -88,24 +88,24 @@ function ebi_framework_tidy($buffer, $is_admin, $is_prod) {