ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5431 from tsiegleauq/dark-theme-improvements

Browse Source 
Improve dark themes
This commit is contained in:
Sean 2020-06-18 13:35:17 +02:00 committed by GitHub
commit 677595fe5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
View File

@ -136,8 +136,8 @@
{{ getTitleWithChanges() }} {{ getTitleWithChanges() }}
</h1> </h1>
<button <button
class="primary-accent-by-theme"
mat-icon-button mat-icon-button
color="accent"
(click)="toggleFavorite()" (click)="toggleFavorite()"
matTooltip="{{ 'Mark as personal favorite' | translate }}" matTooltip="{{ 'Mark as personal favorite' | translate }}"
> >

1
client/src/assets/styles/component-themes.scss
View File

@ -141,6 +141,7 @@ $narrow-spacing: (
* Custom configuration for dark themes * Custom configuration for dark themes
*/ */
[class^="openslides-"][class*="-dark-theme"] { [class^="openslides-"][class*="-dark-theme"] {
color: white;
.logo-container { .logo-container {
img.dark { img.dark {
display: inherit; display: inherit;

8
client/src/assets/styles/global-components-style.scss
View File

@ -15,11 +15,11 @@
h1, h1,
h3.accent { h3.accent {
color: mat-color($primary); color: mat-color(if($is-dark-theme, $accent, $primary));
} }
a { a {
color: mat-color($primary); color: mat-color(if($is-dark-theme, $accent, $primary));
} }
.anchor-button { .anchor-button {
@ -31,8 +31,8 @@
color: mat-color($accent); color: mat-color($accent);
} }
.button24 { .primary-accent-by-theme {
color: mat-color($primary); color: mat-color(if($is-dark-theme, $accent, $primary));
} }
//custom table header for search button, filtering and more. Used in ListViews //custom table header for search button, filtering and more. Used in ListViews

2
client/src/assets/styles/themes/red-dark.scss
View File

@ -1,7 +1,7 @@
@import './assets/styles/color-palettes/os-red.scss'; @import './assets/styles/color-palettes/os-red.scss';
$openslides-primary: mat-palette($openslides-primary-red, 500, 300, 900); $openslides-primary: mat-palette($openslides-primary-red, 500, 300, 900);
$openslides-accent: mat-palette($openslides-primary-red, 500, 300, 900); $openslides-accent: mat-palette($mat-amber);
$openslides-warn: mat-palette($mat-orange, 700, 300, 900); $openslides-warn: mat-palette($mat-orange, 700, 300, 900);
$openslides-red-dark: mat-dark-theme($openslides-primary, $openslides-accent, $openslides-warn); $openslides-red-dark: mat-dark-theme($openslides-primary, $openslides-accent, $openslides-warn);

2
client/src/assets/styles/themes/red-light.scss
View File

@ -1,7 +1,7 @@
@import './assets/styles/color-palettes/os-red.scss'; @import './assets/styles/color-palettes/os-red.scss';
$openslides-primary: mat-palette($openslides-primary-red, 500, 300, 900); $openslides-primary: mat-palette($openslides-primary-red, 500, 300, 900);
$openslides-accent: mat-palette($openslides-primary-red, 500, 300, 900); $openslides-accent: mat-palette($mat-amber);
$openslides-warn: mat-palette($mat-orange, 700, 300, 900); $openslides-warn: mat-palette($mat-orange, 700, 300, 900);
$openslides-red-light: mat-light-theme($openslides-primary, $openslides-accent, $openslides-warn); $openslides-red-light: mat-light-theme($openslides-primary, $openslides-accent, $openslides-warn);