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

Updates dark-theme

Browse Source
This commit is contained in:
GabrielMeyer 2020-02-19 13:17:08 +01:00
parent 98146a29c7
commit 13de88c136
6 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.scss
View File

@ -5,15 +5,8 @@
cursor: pointer; cursor: pointer;
padding: 20px 0; padding: 20px 0;
&:hover {
background-color: #eee;
}
&.active { &.active {
cursor: default; cursor: default;
background-color: #ccc;
&:hover {
background-color: #ccc;
}
} }
.paragraph-select { .paragraph-select {

17
client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.components.scss-theme.scss Normal file
View File

@ -0,0 +1,17 @@
@import '~@angular/material/theming';
@mixin os-amendment-create-wizard-style($theme) {
$background: map-get($theme, background);
.paragraph-row {
&:hover {
background-color: mat-color($background, background);
}
&.active {
background-color: mat-color($background, selected-button);
&:hover {
background-color: mat-color($background, selected-button);
}
}
}
}

6
client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss
View File

@ -1,16 +1,12 @@
/* Diffbox */ /* Diffbox */
.diff-box { .diff-box {
position: relative; position: relative;
background-color: #f9f9f9;
border: solid 1px #eee;
border-radius: 3px; border-radius: 3px;
margin-bottom: 0; margin-bottom: 0;
padding-top: 0; padding-top: 0;
padding-right: 40px; padding-right: 40px;
&:hover { &:hover {
background-color: #f0f0f0;
.action-row { .action-row {
opacity: 1; opacity: 1;
} }
@ -49,8 +45,6 @@
} }
.change-recommendation-overview { .change-recommendation-overview {
background-color: #eee;
border: solid 1px #ddd;
border-radius: 3px; border-radius: 3px;
margin-bottom: 15px; margin-bottom: 15px;
padding: 5px 10px; padding: 5px 10px;

15
client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss-theme.scss Normal file
View File

@ -0,0 +1,15 @@
@import '~@angular/material/theming';
@mixin os-motion-detail-diff-style($theme) {
$background: map-get($theme, background);
.change-recommendation-overview,
.diff-box {
background-color: mat-color($background, background);
border: 1px solid mat-color($background, selected-button);
}
.diff-box:hover {
background-color: mat-color($background, selected-button);
}
}

4
client/src/app/site/projector/components/projector-detail/projector-detail.component.scss
View File

@ -7,8 +7,6 @@
} }
.column-left { .column-left {
color: black;
/* Do not let the a tag ruin the projector */ /* Do not let the a tag ruin the projector */
a { a {
color: inherit; color: inherit;
@ -17,8 +15,6 @@
} }
.control-group { .control-group {
color: rgba(0, 0, 0, 0.5);
.button-size { .button-size {
padding-left: 5px; padding-left: 5px;
display: inline-block; display: inline-block;

4
client/src/styles.scss
View File

@ -25,6 +25,8 @@
@import './app/shared/components/rounded-input/rounded-input.component.scss'; @import './app/shared/components/rounded-input/rounded-input.component.scss';
@import './app/shared/components/meta-text-block/meta-text-block.component.scss'; @import './app/shared/components/meta-text-block/meta-text-block.component.scss';
@import './app/site/config/components/config-field/config-field.component.scss-theme.scss'; @import './app/site/config/components/config-field/config-field.component.scss-theme.scss';
@import './app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.components.scss-theme.scss';
@import './app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss-theme.scss';
/** fonts */ /** fonts */
@import './assets/styles/fonts.scss'; @import './assets/styles/fonts.scss';
@ -50,6 +52,8 @@ $narrow-spacing: (
@include os-rounded-input-style($theme); @include os-rounded-input-style($theme);
@include os-meta-text-block-style($theme); @include os-meta-text-block-style($theme);
@include os-config-field-style($theme); @include os-config-field-style($theme);
@include os-amendment-create-wizard-style($theme);
@include os-motion-detail-diff-style($theme);
} }
/** Load projector specific SCSS values */ /** Load projector specific SCSS values */