Merge pull request #1021 from adshares/develop

Develop
adshares · May 15, 2023 · 53d5478 · 53d5478
2 parents cb8183d + 2b477a8
commit 53d5478
Show file tree

Hide file tree

Showing 13 changed files with 2,225 additions and 2,299 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,8 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [2.5.0] - 2023-05-15
 ### Added
 - Instructions for adding the ads.txt file entry
+- Dark mode support
 ### Fixed
 - Inform user while campaign has no active ads
 - Allow to add new advertisement to campaign without ads
@@ -27,7 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [2.4.3] - 2023-02-21
 ### Fixed
-Display admin role on screen smaller than 1800px
+- Display admin role on screen smaller than 1800px
 
 ## [2.4.2] - 2023-02-14
 ### Changed
@@ -575,7 +578,8 @@ Display admin role on screen smaller than 1800px
 - Publisher features (Sites & AdUnits)
 
 
-[Unreleased]: https://github.com/adshares/adpanel/compare/v2.4.6...develop
+[Unreleased]: https://github.com/adshares/adpanel/compare/v2.5.0...develop
+[2.5.0]: https://github.com/adshares/adpanel/compare/v2.4.6...v2.5.0
 [2.4.6]: https://github.com/adshares/adpanel/compare/v2.4.5...v2.4.6
 [2.4.5]: https://github.com/adshares/adpanel/compare/v2.4.4...v2.4.5
 [2.4.4]: https://github.com/adshares/adpanel/compare/v2.4.3...v2.4.4

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adpanel",
-  "version": "2.4.5",
+  "version": "2.5.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve adshares",

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -2,7 +2,7 @@ sonar.host.url=https://sonarcloud.io
 sonar.organization=adshares-github
 sonar.projectKey=adshares-adpanel
 sonar.projectName=Adshares AdPanel
-sonar.projectVersion=2.4
+sonar.projectVersion=2.5
 
 # =====================================================
 #   Meta-data for the project

diff --git a/src/app/common/components/settings-menu-item/settings-menu-item.component.scss b/src/app/common/components/settings-menu-item/settings-menu-item.component.scss
@@ -8,7 +8,7 @@
     & .mat-expansion-panel-header {
       padding: 12px 2rem;
       height: auto;
-      color: pal(light,light);
+      color: pal(secondary);
 
       &:hover:not([aria-disabled=true]) {
         background-color: rgba(0, 47, 54, 0.5);
@@ -30,20 +30,20 @@
 
   &__submenu-title {
     @include copy (
-      $color: pal(light,light),
+      $color: pal(secondary),
       $font-size: 18,
       $font-weight: semiBold
     );
   }
 
   &__submenu {
     @include copy (
-      $color: pal(light,light),
+      $color: pal(secondary),
       $font-size: 18,
     );
 
     & .active-tab {
-      color: pal(secondary)
+      color: pal(secondary-alt)
     }
   }
 

diff --git a/src/app/publisher/site-details/site-details.component.html b/src/app/publisher/site-details/site-details.component.html
@@ -22,23 +22,20 @@
       </button>
     </div>
 
-    <div *ngIf="site.needsAdsTxtConfirmation" class="ap-box">
-      <h1 class="ap-heading ap-heading--h2 box-title">Add ads.txt entry</h1>
-      <div class="box-content">
-        <span class="ap-copy">
-          This site needs specific ads.txt entry to display advertisements. Please add the following entry to your
-          ads.txt file:<br />{{ adsTxtEntry }}
-        </span>
-      </div>
-      <div class="box-content">
-        <span class="ap-copy">
-          Detailed instructions can be found in documentation:
-          <a href="{{ ADS_TXT_INSTRUCTION }}" rel="noopener nofollow noreferrer" target="_blank">{{
-            ADS_TXT_INSTRUCTION
-          }}</a
-          >.
-        </span>
-      </div>
+    <div *ngIf="site.needsAdsTxtConfirmation" class="ap-alert ap-alert--warning">
+      <h1 class="ap-heading--h4">Add ads.txt entry</h1>
+      <p>
+        This site needs specific ads.txt entry to display advertisements. Please add the following entry to your
+        ads.txt file:<br />
+        <code>{{ adsTxtEntry }}</code>
+      </p>
+      <p>
+        Detailed instructions can be found in documentation:
+        <a href="{{ ADS_TXT_INSTRUCTION }}" rel="noopener nofollow noreferrer" target="_blank">{{
+          ADS_TXT_INSTRUCTION
+        }}</a
+        >.
+      </p>
     </div>
 
     <div class="ap-box">

diff --git a/src/styles.scss b/src/styles.scss
@@ -25,5 +25,3 @@ $app-theme: mat.define-light-theme($app-primary, $app-accent);
 @import 'styles/material-override';
 @import 'styles/common';
 @import 'styles/charts';
-
-
diff --git a/src/styles/_buttons.scss b/src/styles/_buttons.scss
@@ -8,7 +8,7 @@
   padding: 8px 16px;
   background: transparent;
   cursor: pointer;
-  color: pal(light,light);
+  color: pal(secondary);
   @include font(16, semiBold);
   line-height: 1.5;
   transition: 0.3s ease;

diff --git a/src/styles/_colors.scss b/src/styles/_colors.scss
@@ -48,7 +48,6 @@ $palette-colors: (
   ),
   light: (
     base: $light,
-    light: #fff,
   ),
   gray: (
     base: $gray,
@@ -95,4 +94,4 @@ $main_colors: light, primary, secondary, success, error, warning;
 
 @function pal($palette, $tone: 'base') {
   @return palette($palette, $tone);
-}
+}
diff --git a/src/styles/_common.scss b/src/styles/_common.scss
@@ -569,12 +569,6 @@ a, a:has(.fa-icon) {
   color: pal(body-color);
 }
 
-.ap-form-input,
-input {
-  background-color: pal(light);
-  color: pal(body-color);
-}
-
 .user-id {
   background-color: pal(gray) !important;
   color: pal(body-color) !important;
@@ -587,7 +581,7 @@ input {
 }
 
 .bid-strategy__rank-button {
- color: pal(body-bg) !important;
+ color: pal(primary-alt) !important;
 }
 
 .table-nav,

diff --git a/src/styles/_material-override.scss b/src/styles/_material-override.scss
@@ -89,6 +89,7 @@ mat-chip:not(.mat-basic-chip) {
 .mat-expansion-panel-header-title {
   flex-grow: 1;
   display: inline;
+  color: pal(dark);
 }
 
 .mat-form-field-infix {
@@ -317,7 +318,7 @@ mat-chip:not(.mat-basic-chip) {
 }
 
 .ap-header .ap-btn-light {
-  color: pal(light,light);
+  color: pal(secondary);
 }
 
 // --- paginator --- //
@@ -357,6 +358,8 @@ mat-chip:not(.mat-basic-chip) {
 // --- expansion-panel --- //
 
 .mat-expansion-panel {
+  background-color: pal(light);
+  color: pal(body-color);
 
   .mat-expansion-indicator::after {
     color: pal(body-color);
@@ -369,3 +372,36 @@ mat-chip:not(.mat-basic-chip) {
 .mat-tab-header {
   border-bottom-color: pal(gray);
 }
+
+// --- form --- //
+
+// --- textarea --- //
+
+.code-container {
+  background-color: pal(light);
+}
+
+// --- input --- //
+
+.ap-form-input {
+  background-color: pal(light);
+  color: pal(dark);
+
+  &__box span {
+    color: pal(dark);
+  }
+}
+
+.mat-select-panel {
+  background: pal(body-bg);
+
+  .mat-option-text {
+    color: pal(body-color) !important;
+  }
+}
+
+// --- reports --- //
+
+.ap-btn.ap-btn--text {
+  color: pal(body-color);
+}
diff --git a/src/styles/_typography.scss b/src/styles/_typography.scss
@@ -56,12 +56,13 @@
   &--medium {
     @include font(22, normal);
   }
+
   &--large {
     @include font(32, normal);
   }
 
   &--light {
-    color: pal(light) !important;
+    color: #fff !important;
   }
 
   &--primary {
@@ -129,6 +130,11 @@
   padding: 12px 12px 12px 12px;
   min-width: 150px;
 
+  p {
+    padding-top: 5px;
+    padding-bottom: 5px;
+  }
+
   &__full-width {
     width: 100%;
   }
@@ -137,29 +143,44 @@
   &[data-alert-status = 'rejected'] {
     color: pal(error);
     background-color: pal(error, light);
+    a {
+      color: pal(error);
+    }
   }
 
   &--success,
   &[data-alert-status = 'active'] {
     color: pal(success);
     background-color: pal(success, light);
+    a {
+      color: pal(success);
+    }
   }
 
   &--warning,
   &[data-alert-status = 'pending'] {
     color: pal(warning);
     background-color: pal(warning, light);
+    a {
+      color: pal(warning);
+    }
   }
 
   &--info,
   &[data-alert-status = 'inactive'] {
     color: pal(primary);
     background-color: pal(info-bg);
+    a {
+      color: pal(primary);
+    }
   }
 
   &[data-alert-status = 'draft'] {
     color: pal(primary);
     background-color: pal(body-bg);
+    a {
+      color: pal(primary);
+    }
   }
 }
 
@@ -174,3 +195,8 @@
 .lowercase {
   text-transform: lowercase;
 }
+
+code {
+  font-family: monospace;
+  text-wrap: none;
+}
diff --git a/src/styles/colors-light.css b/src/styles/colors-light.css
@@ -2,7 +2,7 @@
     --primary: #003d4d;
     --primary-alt: #002f36;
     --secondary: #96dfef;
-    --secondary-alt: #bff7ff;
+    --secondary-alt: #56a6b7;
     --body-bg: #dfdfdf;
     --body-color: #003d4d;
     --dark: #000000;
@@ -12,7 +12,7 @@
     --danger-bg: #ffa0a6;
     --warning: #ffb400;
     --warning-bg: #f8e7bf;
-    --success: #19ad42;
+    --success: #05ad6e;
     --success-bg: #8debc8;
     --info: #003d4d;
     --info-bg: #96dfef;
@@ -22,10 +22,10 @@
 
 @media (prefers-color-scheme: dark) {
     :root {
-        --body-bg: #002f36;
+        --body-bg: #292929;
         --body-color: #f2f2f2;
         --gray: #666666;
-        --light: #000;
+        --light: #222222;
         --secondary: #bff7ff;
         --dark: #fff;
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,5 +25,3 @@ $app-theme: mat.define-light-theme($app-primary, $app-accent);
		@import 'styles/material-override';
		@import 'styles/common';
		@import 'styles/charts';