diff --git a/ember-cli-build.js b/ember-cli-build.js index 73acfe50771..476245cbe98 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -16,6 +16,14 @@ module.exports = function(defaults) { sassOptions : { sourceMapEmbed: true }, + SemanticUI: { + source: { + css : 'node_modules/fomantic-ui-css/', + javascript : 'node_modules/fomantic-ui-css/', + images : 'node_modules/fomantic-ui-css/themes/default/assets/images', + fonts : 'node_modules/fomantic-ui-css/themes/default/assets/fonts' + } + }, autoprefixer: { overrideBrowserslist : targets.browsers, enabled : true, @@ -43,14 +51,6 @@ module.exports = function(defaults) { sourcemaps: { enabled: true }, - SemanticUI: { - source: { - css : 'node_modules/@open-event/theme/dist', - javascript : 'node_modules/@open-event/theme/dist', - images : 'node_modules/@open-event/theme/dist/themes/default/assets/images', - fonts : 'node_modules/@open-event/theme/dist/themes/default/assets/fonts' - } - }, autoImport: { webpack: { externals : { jquery: 'jQuery' }, diff --git a/package.json b/package.json index 33b275c7e46..63f66b17518 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ "@ember/optional-features": "^1.3.0", "@glimmer/component": "^1.0.1", "@glimmer/tracking": "^1.0.1", - "@open-event/theme": "0.2.1-rounded", "@sentry/apm": "^5.20.1", "@sentry/browser": "^5.20.1", "@sentry/integrations": "^5.20.1", @@ -132,6 +131,7 @@ "eslint-plugin-ember-suave": "^2.0.1", "eslint-plugin-node": "^11.1.0", "fastboot-app-server": "^2.0.0", + "fomantic-ui-css": "^2.8.6", "google-material-color": "^1.3.1", "http-status": "^1.4.2", "loader.js": "^4.7.0", diff --git a/yarn.lock b/yarn.lock index 36cdb361abc..4065fd29d99 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1474,11 +1474,6 @@ "@nodelib/fs.scandir" "2.1.3" fastq "^1.6.0" -"@open-event/theme@0.2.1-rounded": - version "0.2.1-rounded" - resolved "https://registry.yarnpkg.com/@open-event/theme/-/theme-0.2.1-rounded.tgz#841d711fbbc1837c6ff009c1ed1288c2371a02a6" - integrity sha512-Kcanx/LjRkJrf6Y46Tb7nk3GIc11kSUJY6DqUN22PmiP+LSutAv0Xxhs400CXT7mST3H/mrMq+CgZC9zc2YHDw== - "@sentry/apm@5.20.1", "@sentry/apm@^5.20.1": version "5.20.1" resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.20.1.tgz#2126407ec8ecc6f78f42a8a8de99b90dec982036" @@ -8724,6 +8719,13 @@ follow-redirects@^1.0.0: dependencies: debug "^3.2.6" +fomantic-ui-css@^2.8.6: + version "2.8.6" + resolved "https://registry.yarnpkg.com/fomantic-ui-css/-/fomantic-ui-css-2.8.6.tgz#65bb7d4534e12557bfa82128c32578db3d05186d" + integrity sha512-JRQD1QDNX+qEYml+XoiCzoJZQpB3wD9ISVSWkFzKn0XgCxA3NMVCpoeWqSVFAGbQPatDfG3IP67Hy9x5wm+tiQ== + dependencies: + jquery "^3.4.0" + for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -10467,7 +10469,7 @@ jquery-deferred@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/jquery-deferred/-/jquery-deferred-0.3.1.tgz#596eca1caaff54f61b110962b23cafea74c35355" -"jquery@2 - 3", jquery@>=1.11, jquery@^3.2.1, jquery@^3.4.1, jquery@^3.5.0, jquery@x.*: +"jquery@2 - 3", jquery@>=1.11, jquery@^3.2.1, jquery@^3.4.0, jquery@^3.4.1, jquery@^3.5.0, jquery@x.*: version "3.5.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5" integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==