Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ const routes: Routes = [
{
path: PathUrl.SETTINGS,
loadChildren: () => import('./settings/settings.module').then((m) => m.SettingsModule),
canActivate: [AuthGuard],
},
{ path: '**', component: NotFoundComponent },
];
Expand Down
2 changes: 0 additions & 2 deletions src/app/auth/auth.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@
gap: 15px;

border: 1px solid $border-color;
background-color: $main-color;
border-radius: 6px;

h3 {
color: $first-color;
margin: 0;
}

Expand Down
2 changes: 0 additions & 2 deletions src/app/board/board/board.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,11 @@

.space {
min-height: 100%;
background-color: $main-color;
display: flex;

&__main {
width: 100%;
min-height: 100%;
background-color: $main-color;
position: relative;

&.disabled {
Expand Down
2 changes: 1 addition & 1 deletion src/app/core/components/footer/footer.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<footer class="footer">
<footer class="footer mat-app-background">
<a href="https://rs.school/angular/" target="_blank" class="footer__img-link">
<img src="./assets/img/rs_school_js.svg" class="footer__img" alt="logo rs school" />
</a>
Expand Down
4 changes: 0 additions & 4 deletions src/app/core/components/footer/footer.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@
padding: 0 $main-padding;
justify-content: space-between;
align-items: center;
background-color: $main-color;
border-top: 1px solid $border-color;

&__text {
margin: 0;
color: $second-color;
}

&__img-link {
Expand All @@ -36,8 +34,6 @@
align-items: center;
gap: 4px;

color: $second-color !important;

&:hover {
color: $link-color !important;
}
Expand Down
1 change: 0 additions & 1 deletion src/app/profile/profile.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
gap: 15px;

border: 1px solid $border-color;
background-color: $main-color;
border-radius: 6px;

.profile-title {
Expand Down
1 change: 0 additions & 1 deletion src/app/search/search.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
gap: 30px;

border: 1px solid $border-color;
background-color: $main-color;
border-radius: 6px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
position: sticky;
height: calc(100vh - #{$footer-height});
overflow-y: auto;
background-color: $main-color;
border-right: $header-border;

&_open {
Expand Down
1 change: 0 additions & 1 deletion src/app/space/components/list/list.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

.space-list {
min-height: 100%;
background-color: $main-color;
padding: 0 $space-header-padding;

&__content {
Expand Down
1 change: 0 additions & 1 deletion src/app/space/pages/space/space.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

.space {
min-height: 100%;
background-color: $main-color;
display: flex;
&__main {
width: 100%;
Expand Down
88 changes: 88 additions & 0 deletions src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,91 @@ input {
.mr-8 {
margin-right: 8px;
}

.ant-menu {
background-color: $bg-light !important;
color: $light-color !important;
}

.darkMode {
.footer__link,
.header-nav__link,
.welcome__link,
.phase__link {
color: $link-color-dark !important;

&:hover {
color: $main-color !important;
}
}

.ant-card {
background: $bg-dark !important;
color: $main-color !important;
}

.ant-card-head {
background: $bg-dark !important;
color: $main-color !important;
}

h1,
h2,
h3,
h4,
h5,
h6 {
color: $main-color !important;
}

.ant-collapse > .ant-collapse-item > .ant-collapse-header {
background: $bg-dark !important;
color: $main-color !important;
}

.ant-collapse-content {
background: $bg-dark !important;
color: $main-color !important;
}

.search-input.error {
background-color: transparent !important;
}

.ant-tabs {
color: $main-color !important;
}

.welcome__slogan {
color: $main-color !important;
}

.welcome__text {
color: $main-color !important;

a {
color: $link-color-dark !important;

&:hover {
color: $main-color !important;
}
}
}

.welcome__title {
border-right: $main-color solid 2px !important;
}

.ant-menu {
background: $bg-dark !important;
color: $main-color !important;
}

.space-aside__add-button {
color: $link-color-dark !important;
}

.bar_right {
color: $link-color-dark !important;
}
}
4 changes: 4 additions & 0 deletions src/styles/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@ $second-color: #2c2c2cff;
$fourth-color: #eeeeeeff;
$error-color: #f95959;
$bg-loader: #0002;
$bg-dark: #303030;
$bg-light: #fafafa;
$task-color: #07a092;
$light-color: #000000de;

$border-color: #dfdfdfff;

$icont-first-color: #07a092ff;
$icont-second-color: #fff;

$link-color: #3f51b5;
$link-color-dark: #89d5ff;

//
// sizes
Expand Down