diff --git a/assets/css/themes/chamilo/default.css b/assets/css/themes/chamilo/default.css index 291f5ef39b..1d7b820560 100644 --- a/assets/css/themes/chamilo/default.css +++ b/assets/css/themes/chamilo/default.css @@ -5,31 +5,6 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Based on Bootstrap v3 */ - -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url(fonts/OpenSans-Light.woff2) format('woff2'), url(fonts/OpenSans-Light.woff) format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url(fonts/OpenSans.woff2) format('woff2'), url(fonts/OpenSans.woff) format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 600; - src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(fonts/OpenSans-Semibold.woff2) format('woff2'), url(fonts/OpenSans-Semibold.woff) format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), url(fonts/OpenSans-Bold.woff2) format('woff2'), url(fonts/OpenSans-Bold.woff) format('woff'); -} body { margin: 0; font-family: 'Open Sans', sans-serif; diff --git a/package.json b/package.json index 1a6cc04cfd..c4428d7f1a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "devDependencies": { - "@symfony/webpack-encore": "^0.17.1", + "@symfony/webpack-encore": "^0.19", "babel-preset-react": "^6.24.1", "bootstrap-sass": "^3.3.7", "copy-webpack-plugin": "^4.3.1", diff --git a/webpack.config.js b/webpack.config.js index 35ec4d85f2..374af98b4e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -4,9 +4,9 @@ var copyWebpackPlugin = require('copy-webpack-plugin'); Encore .setOutputPath('public/build/') - .setManifestKeyPrefix('build/public') + .setManifestKeyPrefix('build/') // If chamilo is installed in localhost/chamilo2 - .setPublicPath('/chamilo2/public/build/') + .setPublicPath('./public/build/') // If chamilo is installed in a domain my.chamilo.net //.setPublicPath('/build') .cleanupOutputBeforeBuild() diff --git a/yarn.lock b/yarn.lock index 01b4736e8a..86ec97f077 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,9 +2,9 @@ # yarn lockfile v1 -"@symfony/webpack-encore@^0.17.1": - version "0.17.1" - resolved "https://registry.yarnpkg.com/@symfony/webpack-encore/-/webpack-encore-0.17.1.tgz#4889d92bd241eff48ff4b72e76fa367b4c085c9e" +"@symfony/webpack-encore@^0.19": + version "0.19.0" + resolved "https://registry.yarnpkg.com/@symfony/webpack-encore/-/webpack-encore-0.19.0.tgz#f0725dbbede5ff9d9fdbd7a07f84accafc83ca14" dependencies: babel-core "^6.24.0" babel-loader "^7.1.0"