fix conflict
This commit is contained in:
parent
497a529c7b
commit
21d23ec9e7
@ -125,6 +125,7 @@ import { PaymentComponent} from './components/menus/payment.component';
|
||||
import { ConfirmationComponent } from './components/menus/confirmation.component';
|
||||
import { PersonalComponent } from './components/menus/personal.component';
|
||||
import { SeatComponent } from './components/menus/seat.component';
|
||||
import { LandingComponent } from './components/landing/landing.component';
|
||||
|
||||
import { CountryService } from './service/countryservice';
|
||||
import { CustomerService } from './service/customerservice';
|
||||
@ -134,11 +135,7 @@ import { NodeService } from './service/nodeservice';
|
||||
import { PhotoService } from './service/photoservice';
|
||||
import { ProductService } from './service/productservice';
|
||||
import { MenuService } from './service/app.menu.service';
|
||||
<<<<<<< HEAD
|
||||
import { LandingComponent } from './components/landing/landing.component';
|
||||
=======
|
||||
import { ConfigService } from './service/app.config.service';
|
||||
>>>>>>> ffd58ddc301f2db09fb646ebb6e97e77fc2ab70e
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
@ -1,16 +1,24 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { Component, OnInit, OnDestroy } from '@angular/core';
|
||||
@Component({
|
||||
selector: 'app-landing',
|
||||
templateUrl: './landing.component.html',
|
||||
styleUrls: ['./landing.component.scss']
|
||||
})
|
||||
export class LandingComponent implements OnInit {
|
||||
|
||||
themeElement: any;
|
||||
|
||||
constructor() { }
|
||||
|
||||
ngOnInit(): void {
|
||||
let themeElement = document.getElementById('theme-css');
|
||||
this.themeElement = document.getElementById('theme-css');
|
||||
console.log(this.themeElement);
|
||||
themeElement.setAttribute('href','assets/theme/saga-blue/theme.css');
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user