Skip to content

Commit 96c9e85

Browse files
Merge pull request #4 from irohalab/fix-sidebar-contrast-ratio
adjust sidebar contrast ratio in dark theme
2 parents 98679dc + d7ac8a8 commit 96c9e85

File tree

3 files changed

+38
-4
lines changed

3 files changed

+38
-4
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mira-ui",
3-
"version": "2.1.0",
3+
"version": "2.1.1",
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve",

src/app/home/my-bangumi/my-bangumi.component.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, HostListener, OnDestroy, OnInit } from '@angular/core';
1+
import { Component, HostBinding, HostListener, OnDestroy, OnInit } from '@angular/core';
22
import { BehaviorSubject, merge, Subscription } from 'rxjs';
33
import { filter, mergeMap } from 'rxjs/operators';
44
import { closest } from '../../../helpers/dom';
@@ -8,6 +8,7 @@ import { WatchProgress } from '../../entity/watch-progress';
88
import { VideoPlayerService } from '../../video-player/video-player.service';
99
import { FavoriteManagerService } from '../favorite-manager.service';
1010
import { HomeService } from '../home.service';
11+
import { DARK_THEME, DarkThemeService } from '@irohalab/deneb-ui';
1112

1213
@Component({
1314
selector: 'my-bangumi',
@@ -22,12 +23,16 @@ export class MyBangumiComponent implements OnInit, OnDestroy {
2223

2324
favoriteLabel = FAVORITE_LABEL;
2425

26+
@HostBinding('class.dark-theme')
27+
isDarkTheme: boolean;
28+
2529
get currentStatus(): number {
2630
return this._statusSubject.getValue();
2731
}
2832

2933
constructor(private _homeService: HomeService,
3034
private _favoriteManager: FavoriteManagerService,
35+
private _darkThemeService: DarkThemeService,
3136
private _videoPlayerService: VideoPlayerService) {
3237
this.myBangumiList = [];
3338
}
@@ -46,6 +51,10 @@ export class MyBangumiComponent implements OnInit, OnDestroy {
4651
}
4752

4853
ngOnInit(): void {
54+
this._subscription.add(
55+
this._darkThemeService.themeChange
56+
.subscribe(theme => {this.isDarkTheme = theme === DARK_THEME;})
57+
);
4958
this._subscription.add(
5059
this._videoPlayerService.onWatchStatusChanges
5160
.pipe(filter(episode => {

src/app/home/my-bangumi/my-bangumi.less

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,31 @@
1+
@headerColor: #2185d0;
2+
@itemColor: #696969;
3+
@emptyPlaceHolderColor: #4c4c4c;
4+
@labelUndecoratedColor: #999999;
5+
16
:host {
27
display: block;
38
box-sizing: border-box;
9+
&.dark-theme {
10+
.header {
11+
color: lighten(@headerColor, 20%);
12+
}
13+
.menu.favorite-list {
14+
> .item.favorite-item {
15+
> .bangumi-name {
16+
color: lighten(@itemColor, 35%);
17+
}
18+
}
19+
> .ui.label {
20+
&.undecorated {
21+
color: lighten(@labelUndecoratedColor, 20%);
22+
}
23+
}
24+
}
25+
.empty-placeholder {
26+
color: lighten(@emptyPlaceHolderColor, 40%);
27+
}
28+
}
429
}
530

631
.status-picker {
@@ -14,7 +39,7 @@
1439
font-size: 0.9rem;
1540
font-weight: 700;
1641
line-height: 2;
17-
color: #2185d0;
42+
color: @headerColor;
1843
}
1944

2045
.menu.favorite-list {
@@ -27,7 +52,7 @@
2752
> .bangumi-name {
2853
display: inline-block;
2954
width: 9em;
30-
color: #696969;
55+
color: @itemColor;
3156
overflow: hidden;
3257
text-overflow: ellipsis;
3358
white-space: nowrap;

0 commit comments

Comments
 (0)