Skip to content

GitLab

Commit ae3b11ad authored by Jorge Samuel Mendes de Jesus's avatar Jorge Samuel Mendes de Jesus
Browse files

Font flicker problem now using webfonts

parent 5b1f117f
Hide whitespace changes
Inline Side-by-side
www/assets/css/styles.css
View file @ ae3b11ad
@import url('fonts/stylesheet.css');
/* ====================================================
GENERAL STYLES
......
www/assets/js/initialise-functions.js
View file @ ae3b11ad
......@@ -212,6 +212,7 @@ function initialise_document_ready_functions()
$(document).ready(function()
{
initialise_document_ready_functions();
});
/*
......@@ -249,6 +250,7 @@ function initialise_window_load_functions()
$(window).load(function()
{
initialise_window_load_functions();
});
/* FOR THE ALL COLAPSABLE CONTENT */
......
www/index.html
View file @ ae3b11ad
......@@ -2,12 +2,33 @@
<!-- final version with all components integrated -->
<html lang="en">
<head>
<script>
(function() {
var wf = document.createElement('script');
wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
'://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
wf.type = 'text/javascript';
wf.async = 'true';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(wf, s);
})();
</script>
<script>
WebFontConfig = {
google: {families:['Asap']},
custom: {
families: ['ViperISRIC','open_sanssemibold','open_sansbold','open_sansitalic','open_sanslight','open_sansregular' ],
urls: ['/assets/css/fonts/stylesheet.css']
}
};
</script>
<title>World Soil Museum</title>
<link rel="icon" type="image/x-icon" href="./assets/isric_icon.ico">
<link rel="preload" href="./images/background/bg5.jpg">
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Asap">
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
......@@ -26,26 +47,11 @@
<meta name="twitter:title" content="World Soil Museum Website" />
<meta name="twitter:description" content="World Soil Museum, generic museum information and content online for visual tour" />
<meta name="twitter:image" content="http://wsm.isric.org/images/misc/World_Soil_Museum_ISRIC.png" />
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//webstats.isric.org/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', 15]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="//webstats.isric.org/piwik.php?idsite=15" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
<!-- we meed Jquery to load subsections -->
<script src="assets/js/jquery-1.11.2.min.js"></script>
<script src="/assets/js/loadingoverlay.js"></script>
<!-- adopting tap events for on -->
<script src="/assets/js/touche.js"></script>
......@@ -89,10 +95,9 @@
<!-- data-overlay-opacity: set the opacity/transparency of the black overlay -->
<body data-default-background-img="./images/background/bg5.jpg" data-overlay="true" data-overlay-opacity="0.35">
<script>
(function(){
console.log("trying overlay")
$.LoadingOverlay("show");
})();
</script>
<!-- Outer Container -->
<div id="outer-container">
......@@ -254,12 +259,24 @@
<script src="assets/js/wow/wow.min.js"></script>
<!-- responsive videos -->
<script src="assets/js/jquery.fitvids.js"></script>
<!-- Piwik -->
<!-- Custom functions for this theme -->
<script src="assets/js/functions.js"></script>
<script src="assets/js/initialise-functions.js"></script>
<script>
$.LoadingOverlay("hide");
</script>
<script async type="text/javascript">
var _paq = _paq || [];
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//webstats.isric.org/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', 15]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="//webstats.isric.org/piwik.php?idsite=15" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
</html>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment