Skip to content
This repository was archived by the owner on Aug 25, 2020. It is now read-only.

Commit 4022651

Browse files
committed
feat: restore dark theme
1 parent 59f26bf commit 4022651

35 files changed

Lines changed: 224 additions & 226 deletions

File tree

angular.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
],
7878
"styles": [
7979
"projects/ui/src/themes/main.css",
80+
"projects/ui/src/themes/dark.css",
8081
"projects/ui-docs/src/styles/main.scss",
8182
"projects/ui-docs/src/styles/theme.scss",
8283
"projects/ui-docs/src/styles/hljs-default.scss"

projects/ui-docs/src/app/layout/layout.module.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { CommonModule } from '@angular/common';
22
import { NgModule } from '@angular/core';
3+
import { FormsModule } from '@angular/forms';
34
import { RouterModule } from '@angular/router';
45
import { KitIconsModule, KitModalModule, KitMqModule, KitOverlayModule } from '@ngx-kit/core';
5-
import { UiButtonModule, UiLoadingBarModule, UiScrollModule, UiVerticalMenuModule } from 'ui';
6+
import { UiButtonModule, UiLoadingBarModule, UiScrollModule, UiToggleModule, UiVerticalMenuModule } from 'ui';
67
import { HeaderComponent } from './header/header.component';
78
import { LayoutComponent } from './layout/layout.component';
89
import { NavComponent } from './nav/nav.component';
@@ -11,10 +12,12 @@ import { NavComponent } from './nav/nav.component';
1112
imports: [
1213
CommonModule,
1314
RouterModule,
15+
FormsModule,
1416
UiButtonModule,
1517
UiVerticalMenuModule,
1618
UiScrollModule,
1719
UiLoadingBarModule,
20+
UiToggleModule,
1821
KitIconsModule,
1922
KitMqModule,
2023
KitOverlayModule,

projects/ui-docs/src/app/layout/nav/nav.component.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
:host {
2-
background: var(--whiteColor);
2+
background: var(--navBgColor);
3+
color: var(--navTextColor);
34
box-shadow: 2px 2px 16px rgba(0, 0, 0, 0.04);
45
}
56

@@ -20,7 +21,7 @@ ul {
2021
margin: var(--grid) 0 0 0;
2122
padding: var(--grid);
2223
font-size: 0.9rem;
23-
color: var(--mainColorLight2);
24+
color: var(--mainBdColor);
2425
}
2526
a {
2627
display: block;
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
.name {
2-
background: var(--mainColorLight4);
3-
padding: calc(var(--grid) * 2);
4-
}

projects/ui-docs/src/styles/main.scss

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,11 @@
22
@import "loader";
33
@import "mq";
44

5-
html {
6-
display: flex;
7-
flex-direction: row;
8-
width: 100%;
9-
}
10-
115
body {
126
font-family: var(--sansSerif);
137
font-size: 16px;
148
line-height: 1.35em;
15-
color: var(--mainColor);
9+
color: var(--mainTextColor);
1610
display: flex;
1711
flex-direction: row;
1812
flex-grow: 1;
@@ -32,7 +26,7 @@ table {
3226
}
3327

3428
table th {
35-
color: var(--mainColorLight3);
29+
color: var(--mainTextLightColor);
3630
padding: 8px 16px;
3731
text-align: left;
3832
white-space: nowrap;
@@ -66,12 +60,7 @@ code, pre {
6660
font-size: 0.85em;
6761
}
6862

69-
pre {
70-
background: #f8f8f8;
71-
}
72-
7363
code {
74-
background-color: #f4f4f4;
7564
margin: 0;
7665
padding: 0.2em 0.4em;
7766
}
@@ -86,9 +75,3 @@ pre {
8675
padding: 16px;
8776
overflow: auto;
8877
}
89-
90-
//@include mq(var(--from): tablet) {
91-
// html {
92-
// height: 100%;
93-
// }
94-
//}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
:host {
22
display: block;
33
overflow: hidden;
4-
color: var(--mainColorLight3);
4+
color: var(--panelTextColor);
55
}
66

77
.content {
8-
border-top: 1px solid var(--mainColorLight4);
8+
border-top: 1px solid var(--panelBdColor);
99
margin: 0 calc(var(--grid) * 3);
1010
padding: calc(var(--grid) * 1.5) 0;
1111
}

projects/ui/src/lib/ui-accordion/ui-accordion-panel/ui-accordion-panel.component.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
:host {
22
display: block;
33
margin: var(--grid) 0;
4+
background: var(--panelBgColor);
45
border-radius: var(--borderRadius);
5-
border: 1px solid var(--mainColorLight4);
6+
border: 1px solid var(--panelBdColor);
7+
color: var(--panelTextColor);
68
transition: var(--transition);
79
&:hover {
810
box-shadow: var(--shadow);

projects/ui/src/lib/ui-accordion/ui-accordion-title/ui-accordion-title.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:host {
22
background: transparent;
33
cursor: pointer;
4-
color: var(--mainColor);
4+
color: var(--mainTextColor);
55
display: block;
66
padding: calc(var(--grid) * 1.5) calc(var(--grid) * 3);
77
transition-duration: .25s;

projects/ui/src/lib/ui-breadcrumbs/ui-breadcrumbs-item/ui-breadcrumbs-item.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:host {
22
background: transparent;
33
border: 0;
4-
color: var(--mainColorLight3);
4+
color: var(--mainTextLightColor);
55
cursor: pointer;
66
font-size: 1rem;
77
padding: 0;
@@ -10,7 +10,7 @@
1010
color: var(--mainColorLight2);
1111
}
1212
&:last-child {
13-
color: var(--mainColor);
13+
color: var(--mainTextColor);
1414
cursor: inherit;
1515
}
1616
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.separator {
2-
color: var(--mainColor);
2+
color: var(--mainTextColor);
33
padding: 0 var(--grid);
44
}

0 commit comments

Comments
 (0)