Skip to content

Commit

Permalink
Post-migration processing of imports
Browse files Browse the repository at this point in the history
Signed-off-by: Akiff Manji <akiff.manji@gmail.com>
  • Loading branch information
amanji committed Jan 17, 2021
1 parent d439c04 commit 016c053
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/app/app-header/app-header.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../_active/common";
@import "src/styles/common";

.navbar-collapse:not(.show) {
justify-content: flex-end;
Expand Down
6 changes: 3 additions & 3 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,20 @@ const ROUTE_PREFIX: string = 'ROUTES.';

export const appInitializerFn = (appConfig: AppConfigService) => {
return () => {
return appConfig.loadFromPromise(import(/* webpackMode: "eager" */ `../themes/_active/assets/config.json`));
return appConfig.loadFromPromise(import(/* webpackMode: "eager" */ `../assets/config.json`));
};
};

export class WebpackTranslateLoader implements TranslateLoader {
getTranslation(lang: string): Observable<any> {
return from(import(/* webpackMode: "eager" */ `../themes/_active/assets/i18n/${lang}.json`));
return from(import(/* webpackMode: "eager" */ `../assets/i18n/${lang}.json`));
}
}

export class WebpackLocalizeRouterLoader extends LocalizeParser {
load(routes: Routes): Promise<any> {
return new Promise(resolve => {
import(/* webpackMode: "eager" */ `../themes/_active/assets/locales.json`).then(data => {
import(/* webpackMode: "eager" */ `../assets/locales.json`).then(data => {
let config = <ILocalizeRouterParserConfig>(<any>data);
this.locales = config.locales;
this.prefix = config.prefix || '';
Expand Down
2 changes: 1 addition & 1 deletion src/app/search/advanced-search.component.scss
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@import '../common';
@import 'src/styles/common';
2 changes: 1 addition & 1 deletion src/app/search/filters.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../common";
@import "src/styles/common";

.filter-item {
cursor: pointer;
Expand Down
2 changes: 1 addition & 1 deletion src/app/search/input.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../common';
@import 'src/styles/common';

$input-border-color: lighten(rgba(theme-color(primary), 0.8), 10%);
$input-border-active: #5c8de6;
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/components/select/select.component.scss
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@import '../common';
@import 'src/styles/common';
2 changes: 1 addition & 1 deletion src/app/timeline/timeline.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../common';
@import 'src/styles/common';

$timeline-border-color: $card-border-color;
$timeline-border: 1px solid $timeline-border-color;
Expand Down
Binary file modified src/assets/map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 3 additions & 5 deletions src/styles/_bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
// replace me in your custom theme directory if you
// use a separate module to provide bootstrap CSS

@import "../_active/bootstrap.override";

@import "../../../node_modules/bootstrap/scss/bootstrap";
@import "./bootstrap.override";
@import "../../node_modules/bootstrap/scss/bootstrap";
@import "../../node_modules/font-awesome/scss/font-awesome";

$fa-font-path: "../../../node_modules/font-awesome/fonts/";
@import "../../../node_modules/font-awesome/scss/font-awesome";


// Option to keep footer at the bottom of the page
@each $breakpoint in map-keys($grid-breakpoints) {
Expand Down
8 changes: 4 additions & 4 deletions src/styles/_common.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// define variables and functions for use by isolated components

@import '../_active/bootstrap.override';
@import '../../../node_modules/bootstrap/scss/functions';
@import '../../../node_modules/bootstrap/scss/variables';
@import '../../../node_modules/bootstrap/scss/mixins';
@import './bootstrap.override';
@import '../../node_modules/bootstrap/scss/functions';
@import '../../node_modules/bootstrap/scss/variables';
@import '../../node_modules/bootstrap/scss/mixins';

0 comments on commit 016c053

Please sign in to comment.