Skip to content

Commit

Permalink
fix: wrong relative fonts path (#3990)
Browse files Browse the repository at this point in the history
  • Loading branch information
eitanavgil authored and OrenMe committed Mar 26, 2019
1 parent dd2038e commit b221646
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
5 changes: 4 additions & 1 deletion modules/KalturaSupport/KalturaSupport.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
"mw.KCuePoints",
"polyfill_Array_filter"
],
"styles": [
"../../resources/fonts/familyLato.css"
],
"kalturaLoad": "always",
"messageFile": "KalturaSupport.i18n.json"
},
Expand Down Expand Up @@ -522,4 +525,4 @@
"dependencies": "mw.KBasePlugin",
"kalturaPluginName": "kgitGuard"
}
}
}
1 change: 0 additions & 1 deletion modules/KalturaSupport/kalturaIframeClass.php
Original file line number Diff line number Diff line change
Expand Up @@ -1306,7 +1306,6 @@ function getIFramePageOutput( ){
<?php if($wgRemoteWebInspector && $wgEnableScriptDebug){
echo '<script src="' . $wgRemoteWebInspector . '"></script>';
} ?>
<link href='../resources/fonts/familyLato.css' rel='stylesheet' type='text/css'>
<?php if (isset($flashvars) && isset($flashvars['nativeCallout'])){
$nativeCallout = json_decode($flashvars['nativeCallout'],true);
if (isset($nativeCallout) && ($nativeCallout['plugin'] === true)){
Expand Down
10 changes: 5 additions & 5 deletions resources/fonts/familyLato.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@
font-family: 'Lato';
font-style: normal;
font-weight: 400;
src: local('Lato Regular'), local('Lato-Regular'), url('../fonts/Lato-Regular1.woff2') format('woff2');
src: local('Lato Regular'), local('Lato-Regular'), url('Lato-Regular1.woff2') format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 400;
src: local('Lato Regular'), local('Lato-Regular'), url('../fonts/Lato-Regular2.woff2') format('woff2');
src: local('Lato Regular'), local('Lato-Regular'), url('Lato-Regular2.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* latin-ext */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 700;
src: local('Lato Bold'), local('Lato-Bold'), url('../fonts/Lato-Bold1.woff2') format('woff2');
src: local('Lato Bold'), local('Lato-Bold'), url('Lato-Bold1.woff2') format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 700;
src: local('Lato Bold'), local('Lato-Bold'), url('../fonts/Lato-Bold2.woff2') format('woff2');
src: local('Lato Bold'), local('Lato-Bold'), url('Lato-Bold2.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
}

0 comments on commit b221646

Please sign in to comment.