Rely on dark-theme-base, add ckeditor theme, fix contrast issues

steffunky · Jul 29, 2024 · e8dce54 · e8dce54
1 parent cdcefc4
commit e8dce54
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 25 deletions.
diff --git a/...nky-backoffice-lunar-eclipse-theme/datamodel.steffunky-backoffice-lunar-eclipse-theme.xml b/...nky-backoffice-lunar-eclipse-theme/datamodel.steffunky-backoffice-lunar-eclipse-theme.xml
@@ -11,9 +11,10 @@
         </imports>
         <stylesheets>
           <stylesheet id="fullmoon">../css/backoffice/main.scss</stylesheet>
-          <stylesheet id="style">steffunky-backoffice-lunar-eclipse-theme/scss/style.scss</stylesheet>
+          <stylesheet id="dark-stylesheet">steffunky-backoffice-dark-theme-base/scss/stylesheet.scss</stylesheet>
+          <stylesheet id="stylesheet">steffunky-backoffice-lunar-eclipse-theme/scss/style.scss</stylesheet>
           <stylesheet id="ace_editor">steffunky-backoffice-lunar-eclipse-theme/scss/ace_editor.scss</stylesheet>
-          <stylesheet id="ck_editor">steffunky-backoffice-lunar-eclipse-theme/scss/editor.scss</stylesheet>
+          <stylesheet id="ckeditor">steffunky-backoffice-dark-theme-base/scss/ckeditor.scss</stylesheet>
         </stylesheets>
         <precompiled_stylesheet>steffunky-backoffice-lunar-eclipse-theme/precompiled-themes/main.css</precompiled_stylesheet>
       </theme>

diff --git a/steffunky-backoffice-lunar-eclipse-theme/scss/scss-variables.scss b/steffunky-backoffice-lunar-eclipse-theme/scss/scss-variables.scss
@@ -192,14 +192,15 @@ $ibo-quick-create--icon--color--on-hover: $ibo-color-primary-300;
 $ibo-quick-create--icon--color--on-active: $ibo-color-primary-400;
 
 $ibo-datatable--toolbar--text-color: $ibo-color-white-200;
-$ibo-vendors-datatables--pagination-button--background-color--on-hover: $ibo-color-highlight-med-500;
+$ibo-vendors-datatables--pagination-button--background-color--on-hover: $ibo-color-highlight-high-500;
 $ibo-vendors-datatables--pagination-button--text-color--is-active: $ibo-color-white-200;
-$ibo-vendors-datatables--pagination-button--background-color--is-active: $ibo-color-highlight-low-500;
+$ibo-vendors-datatables--pagination-button--background-color--is-active: $ibo-color-highlight-med-500;
 $ibo-vendors-datatables--pagination-button--box-shadow--is-active: inset 0px 1px 0px rgba(0, 0, 0, 0.15);
 $ibo-vendors-datatables--pagination-button--text-color--is-disabled: $ibo-color-grey-600;
 
 $ibo-vendors-datatables--page-length-selector--text-color: $ibo-color-grey-100;
 $ibo-vendors-datatables--page-length-selector--background-color: $ibo-color-grey-600;
+$ibo-vendors-datatables--page-length-selector--background-color: $ibo-color-grey-600;
 $ibo-vendors-datatables--page-length-selector--border-color: $ibo-color-grey-800;
 $ibo-vendors-datatables--page-length-selector--border-color--on-focus: $ibo-color-primary-300;
 
@@ -299,7 +300,7 @@ $ibo-search-form-panel--criteria--border-color: transparent;
 $ibo-search-form-panel--multiple-choice--hover--color: $ibo-color-grey-500;
 $ibo-search-form-panel--items--hover--color: $ibo-search-form-panel--multiple-choice--hover--color;
 
-$ibo-activity-entry--main-information--background-color: $ibo-color-white-150;
+$ibo-activity-entry--main-information--background-color: $ibo-color-white-100;
 $ibo-activity-entry--main-information--is-current-user--background-color: $ibo-color-primary-100;
 $ibo-activity-entry--medallion--has-no-image--background-color: $ibo-color-grey-300;
 $ibo-activity-entry--medallion--has-no-image--text-color: $ibo-color-white-100;

diff --git a/steffunky-backoffice-lunar-eclipse-theme/scss/style.scss b/steffunky-backoffice-lunar-eclipse-theme/scss/style.scss
@@ -1,21 +1,5 @@
-.dataTable {
-    @each $sColorLabel, $aAttributes in $ibo-vendors-datatables--row-highlight--colors {
-        $sBgColor: nth($aAttributes, 1);
-        tr.ibo-is-#{$sColorLabel}{
-          color: $sBgColor;
-          &:nth-child(odd) {
-            background-color: $ibo-vendors-datatables--row--background-color--is-odd;
-          }
-
-          &:nth-child(even) {
-            background-color: $ibo-vendors-datatables--row--background-color--is-even;
-          }
-          &:hover, &.selected:hover {
-            background-color: $ibo-datatable--row--background-color--is-hover;
-          }
-          &.selected {
-            background-color: $ibo-datatable--row--background-color--is-selected;
-          }
-        }
-      }
+.ibo-is-html-content pre{
+  color: $ibo-color-white-100;
+  background-color: $ibo-color-grey-700;
+  border: 1px solid $ibo-color-grey-600;
 }