mirror of
https://github.com/Eugeny/tabby.git
synced 2024-12-24 19:13:31 +03:00
apply styles on start and to the terminal iframe (fixes #134)
This commit is contained in:
parent
ed0bfb39f3
commit
5f5772501b
@ -13,7 +13,6 @@ export class ThemesService {
|
||||
this.applyCurrentTheme()
|
||||
config.changed$.subscribe(() => {
|
||||
this.applyCurrentTheme()
|
||||
document.querySelector('style#custom-css').innerHTML = config.store.appearance.css
|
||||
})
|
||||
}
|
||||
|
||||
@ -32,6 +31,7 @@ export class ThemesService {
|
||||
document.querySelector('head').appendChild(this.styleElement)
|
||||
}
|
||||
this.styleElement.textContent = theme.css
|
||||
document.querySelector('style#custom-css').innerHTML = this.config.store.appearance.css
|
||||
}
|
||||
|
||||
applyCurrentTheme (): void {
|
||||
|
@ -21,7 +21,6 @@ export class TerminalTabComponent extends BaseTabComponent {
|
||||
@ViewChild('content') content
|
||||
@HostBinding('style.background-color') backgroundColor: string
|
||||
hterm: any
|
||||
configSubscription: Subscription
|
||||
sessionCloseSubscription: Subscription
|
||||
hotkeysSubscription: Subscription
|
||||
bell$ = new Subject()
|
||||
@ -48,9 +47,6 @@ export class TerminalTabComponent extends BaseTabComponent {
|
||||
super()
|
||||
this.decorators = this.decorators || []
|
||||
this.title = 'Terminal'
|
||||
this.configSubscription = config.changed$.subscribe(() => {
|
||||
this.configure()
|
||||
})
|
||||
this.resize$.first().subscribe(async (resizeEvent) => {
|
||||
this.session = this.sessions.addSession(
|
||||
Object.assign({}, this.sessionOptions, resizeEvent)
|
||||
@ -99,6 +95,7 @@ export class TerminalTabComponent extends BaseTabComponent {
|
||||
|
||||
ngOnInit () {
|
||||
this.focused$.subscribe(() => {
|
||||
this.configure()
|
||||
setTimeout(() => {
|
||||
this.hterm.scrollPort_.resize()
|
||||
this.hterm.scrollPort_.focus()
|
||||
@ -294,6 +291,7 @@ export class TerminalTabComponent extends BaseTabComponent {
|
||||
}
|
||||
`
|
||||
}
|
||||
css += config.appearance.css
|
||||
preferenceManager.set('user-css', dataurl.convert({
|
||||
data: css,
|
||||
mimetype: 'text/css',
|
||||
@ -322,7 +320,6 @@ export class TerminalTabComponent extends BaseTabComponent {
|
||||
this.decorators.forEach(decorator => {
|
||||
decorator.detach(this)
|
||||
})
|
||||
this.configSubscription.unsubscribe()
|
||||
this.hotkeysSubscription.unsubscribe()
|
||||
if (this.sessionCloseSubscription) {
|
||||
this.sessionCloseSubscription.unsubscribe()
|
||||
|
Loading…
Reference in New Issue
Block a user