From 13de88c1364dec38552d18e197118b2a377426e5 Mon Sep 17 00:00:00 2001 From: GabrielMeyer Date: Wed, 19 Feb 2020 13:17:08 +0100 Subject: [PATCH] Updates dark-theme --- .../amendment-create-wizard.component.scss | 7 ------- ...ent-create-wizard.components.scss-theme.scss | 17 +++++++++++++++++ .../motion-detail-diff.component.scss | 6 ------ ...motion-detail-diff.component.scss-theme.scss | 15 +++++++++++++++ .../projector-detail.component.scss | 4 ---- client/src/styles.scss | 4 ++++ 6 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.components.scss-theme.scss create mode 100644 client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss-theme.scss diff --git a/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.scss b/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.scss index 7f205d1a3..379ab3d09 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.scss +++ b/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.scss @@ -5,15 +5,8 @@ cursor: pointer; padding: 20px 0; - &:hover { - background-color: #eee; - } &.active { cursor: default; - background-color: #ccc; - &:hover { - background-color: #ccc; - } } .paragraph-select { diff --git a/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.components.scss-theme.scss b/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.components.scss-theme.scss new file mode 100644 index 000000000..57845d005 --- /dev/null +++ b/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.components.scss-theme.scss @@ -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); + } + } + } +} diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss index 690932f4b..5171f2885 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss @@ -1,16 +1,12 @@ /* Diffbox */ .diff-box { position: relative; - background-color: #f9f9f9; - border: solid 1px #eee; border-radius: 3px; margin-bottom: 0; padding-top: 0; padding-right: 40px; &:hover { - background-color: #f0f0f0; - .action-row { opacity: 1; } @@ -49,8 +45,6 @@ } .change-recommendation-overview { - background-color: #eee; - border: solid 1px #ddd; border-radius: 3px; margin-bottom: 15px; padding: 5px 10px; diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss-theme.scss b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss-theme.scss new file mode 100644 index 000000000..38b85c698 --- /dev/null +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.scss-theme.scss @@ -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); + } +} diff --git a/client/src/app/site/projector/components/projector-detail/projector-detail.component.scss b/client/src/app/site/projector/components/projector-detail/projector-detail.component.scss index 69051f2d6..85f0edbaf 100644 --- a/client/src/app/site/projector/components/projector-detail/projector-detail.component.scss +++ b/client/src/app/site/projector/components/projector-detail/projector-detail.component.scss @@ -7,8 +7,6 @@ } .column-left { - color: black; - /* Do not let the a tag ruin the projector */ a { color: inherit; @@ -17,8 +15,6 @@ } .control-group { - color: rgba(0, 0, 0, 0.5); - .button-size { padding-left: 5px; display: inline-block; diff --git a/client/src/styles.scss b/client/src/styles.scss index 3bc5a5f69..8cff8d348 100644 --- a/client/src/styles.scss +++ b/client/src/styles.scss @@ -25,6 +25,8 @@ @import './app/shared/components/rounded-input/rounded-input.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/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 */ @import './assets/styles/fonts.scss'; @@ -50,6 +52,8 @@ $narrow-spacing: ( @include os-rounded-input-style($theme); @include os-meta-text-block-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 */