Переглянути джерело

restyled character general and changed the primary color

Warafear 1 рік тому
батько
коміт
7f04e93f35
17 змінених файлів з 414 додано та 189 видалено
  1. 145 0
      .nx/cache/d/daemon.log
  2. 1 1
      .nx/cache/d/server-process.json
  3. 59 61
      src/app/journal/journal-character/general/general.component.html
  4. 45 15
      src/app/journal/journal-character/general/general.component.scss
  5. 2 2
      src/app/journal/journal-home/navigation-panel/navigation-panel.component.scss
  6. 2 2
      src/app/journal/journal-spellcards/add-card/add-card.component.scss
  7. 6 0
      src/app/journal/journal-stats/ability-panel/spellslots/spellslots.component.html
  8. 21 0
      src/app/journal/journal-stats/ability-panel/spellslots/spellslots.component.scss
  9. 10 9
      src/app/journal/journal-stats/ability-panel/spellslots/spellslots.component.ts
  10. 1 1
      src/app/journal/journal-stats/attribute-skill-container/attribute-panel/attribute-field/attribute-details/attribute-details.component.scss
  11. 1 0
      src/app/journal/journal-stats/life-container/life/life.component.ts
  12. 3 1
      src/app/journal/journal-stats/weapons-container/spell-table/favorite-spells-modal/favorite-spells-modal.component.html
  13. 1 1
      src/app/journal/journal-stats/weapons-container/spell-table/favorite-spells-modal/favorite-spells-modal.component.scss
  14. 1 1
      src/app/journal/journal-stats/weapons-container/spell-table/spell-table.component.html
  15. 1 1
      src/app/journal/journal-stats/weapons-container/spell-table/spell-table.component.scss
  16. 95 0
      src/helpers.scss
  17. 20 94
      src/styles.scss

+ 145 - 0
.nx/cache/d/daemon.log

@@ -467035,3 +467035,148 @@ To fix this, set a unique name for each project in a project.json inside the pro
     at async processFilesAndCreateAndSerializeProjectGraph (c:\Softwareprojekte\DnD\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:138:17)
 [NX Daemon Server] - 2024-02-14T14:37:10.689Z - Time taken for 'hash changed files from watcher' 424.6177000403404ms
 [NX Daemon Server] - 2024-02-14T14:37:10.690Z - Done responding to the client null
+[NX Daemon Server] - 2024-02-15T16:12:32.778Z - Started listening on: \\.\pipe\nx\C:\Users\chris\AppData\Local\Temp\83d14e7134fc08a15480\d.sock
+[NX Daemon Server] - 2024-02-15T16:12:32.787Z - [WATCHER]: Subscribed to changes within: c:\Softwareprojekte\DnD (native)
+[NX Daemon Server] - 2024-02-15T16:12:32.789Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2024-02-15T16:12:32.789Z - Established a connection. Number of open connections: 2
+[NX Daemon Server] - 2024-02-15T16:12:32.790Z - Closed a connection. Number of open connections: 1
+[NX Daemon Server] - 2024-02-15T16:12:32.794Z - [REQUEST]: Client Request for Project Graph Received
+[NX Daemon Server] - 2024-02-15T16:12:34.972Z - Error detected when recomputing project file map: The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+[NX Daemon Server] - 2024-02-15T16:12:34.972Z - [REQUEST]: Responding to the client with an error. Error when preparing serialized project graph. The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+Error: The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+    at readProjectConfigurationsFromRootMap (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\project-configuration-utils.js:97:15)
+    at buildProjectsConfigurationsFromProjectPathsAndPlugins (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\project-configuration-utils.js:70:19)
+    at createProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:131:129)
+    at WorkspaceContext.<anonymous> (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:82:39)
+    at getProjectConfigurationsFromContext (c:\Softwareprojekte\DnD\node_modules\nx\src\utils\workspace-context.js:26:29)
+    at _retrieveProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:81:72)
+    at retrieveProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:58:12)
+    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)
+    at async processCollectedUpdatedAndDeletedFiles (c:\Softwareprojekte\DnD\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:102:34)
+    at async processFilesAndCreateAndSerializeProjectGraph (c:\Softwareprojekte\DnD\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:138:17)
+[NX Daemon Server] - 2024-02-15T16:12:34.973Z - Time taken for 'hash changed files from watcher' 598.3834999999963ms
+[NX Daemon Server] - 2024-02-15T16:12:34.974Z - Done responding to the client null
+[NX Daemon Server] - 2024-02-15T17:16:46.920Z - Started listening on: \\.\pipe\nx\C:\Users\chris\AppData\Local\Temp\83d14e7134fc08a15480\d.sock
+[NX Daemon Server] - 2024-02-15T17:16:46.926Z - [WATCHER]: Subscribed to changes within: c:\Softwareprojekte\DnD (native)
+[NX Daemon Server] - 2024-02-15T17:16:46.927Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2024-02-15T17:16:46.927Z - Established a connection. Number of open connections: 2
+[NX Daemon Server] - 2024-02-15T17:16:46.928Z - Closed a connection. Number of open connections: 1
+[NX Daemon Server] - 2024-02-15T17:16:46.930Z - [REQUEST]: Client Request for Project Graph Received
+[NX Daemon Server] - 2024-02-15T17:16:47.043Z - Error detected when recomputing project file map: The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+[NX Daemon Server] - 2024-02-15T17:16:47.043Z - [REQUEST]: Responding to the client with an error. Error when preparing serialized project graph. The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+Error: The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+    at readProjectConfigurationsFromRootMap (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\project-configuration-utils.js:97:15)
+    at buildProjectsConfigurationsFromProjectPathsAndPlugins (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\project-configuration-utils.js:70:19)
+    at createProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:131:129)
+    at WorkspaceContext.<anonymous> (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:82:39)
+    at getProjectConfigurationsFromContext (c:\Softwareprojekte\DnD\node_modules\nx\src\utils\workspace-context.js:26:29)
+    at _retrieveProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:81:72)
+    at retrieveProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:58:12)
+    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)
+    at async processCollectedUpdatedAndDeletedFiles (c:\Softwareprojekte\DnD\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:102:34)
+    at async processFilesAndCreateAndSerializeProjectGraph (c:\Softwareprojekte\DnD\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:138:17)
+[NX Daemon Server] - 2024-02-15T17:16:47.043Z - Time taken for 'hash changed files from watcher' 45.21750000026077ms
+[NX Daemon Server] - 2024-02-15T17:16:47.043Z - Done responding to the client null
+[NX Daemon Server] - 2024-02-16T07:05:12.711Z - Started listening on: \\.\pipe\nx\C:\Users\chris\AppData\Local\Temp\83d14e7134fc08a15480\d.sock
+[NX Daemon Server] - 2024-02-16T07:05:12.713Z - [WATCHER]: Subscribed to changes within: c:\Softwareprojekte\DnD (native)
+[NX Daemon Server] - 2024-02-16T07:05:12.724Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2024-02-16T07:05:12.725Z - Closed a connection. Number of open connections: 0
+[NX Daemon Server] - 2024-02-16T07:05:12.725Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2024-02-16T07:05:12.728Z - [REQUEST]: Client Request for Project Graph Received
+[NX Daemon Server] - 2024-02-16T07:05:13.825Z - Error detected when recomputing project file map: The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+[NX Daemon Server] - 2024-02-16T07:05:13.825Z - [REQUEST]: Responding to the client with an error. Error when preparing serialized project graph. The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+Error: The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+    at readProjectConfigurationsFromRootMap (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\project-configuration-utils.js:97:15)
+    at buildProjectsConfigurationsFromProjectPathsAndPlugins (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\project-configuration-utils.js:70:19)
+    at createProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:131:129)
+    at WorkspaceContext.<anonymous> (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:82:39)
+    at getProjectConfigurationsFromContext (c:\Softwareprojekte\DnD\node_modules\nx\src\utils\workspace-context.js:26:29)
+    at _retrieveProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:81:72)
+    at retrieveProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:58:12)
+    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)
+    at async processCollectedUpdatedAndDeletedFiles (c:\Softwareprojekte\DnD\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:102:34)
+    at async processFilesAndCreateAndSerializeProjectGraph (c:\Softwareprojekte\DnD\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:138:17)
+[NX Daemon Server] - 2024-02-16T07:05:13.826Z - Time taken for 'hash changed files from watcher' 369.80250000208616ms
+[NX Daemon Server] - 2024-02-16T07:05:13.826Z - [WATCHER]: Processing file changes in outputs
+[NX Daemon Server] - 2024-02-16T07:05:13.826Z - Done responding to the client null
+[NX Daemon Server] - 2024-02-16T07:05:26.430Z - Started listening on: \\.\pipe\nx\C:\Users\chris\AppData\Local\Temp\83d14e7134fc08a15480\d.sock
+[NX Daemon Server] - 2024-02-16T07:05:26.432Z - [WATCHER]: Subscribed to changes within: c:\Softwareprojekte\DnD (native)
+[NX Daemon Server] - 2024-02-16T07:05:26.441Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2024-02-16T07:05:26.441Z - Closed a connection. Number of open connections: 0
+[NX Daemon Server] - 2024-02-16T07:05:26.441Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2024-02-16T07:05:26.443Z - [REQUEST]: Client Request for Project Graph Received
+[NX Daemon Server] - 2024-02-16T07:05:26.518Z - Error detected when recomputing project file map: The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+[NX Daemon Server] - 2024-02-16T07:05:26.518Z - [REQUEST]: Responding to the client with an error. Error when preparing serialized project graph. The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+Error: The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+    at readProjectConfigurationsFromRootMap (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\project-configuration-utils.js:97:15)
+    at buildProjectsConfigurationsFromProjectPathsAndPlugins (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\project-configuration-utils.js:70:19)
+    at createProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:131:129)
+    at WorkspaceContext.<anonymous> (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:82:39)
+    at getProjectConfigurationsFromContext (c:\Softwareprojekte\DnD\node_modules\nx\src\utils\workspace-context.js:26:29)
+    at _retrieveProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:81:72)
+    at retrieveProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:58:12)
+    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)
+    at async processCollectedUpdatedAndDeletedFiles (c:\Softwareprojekte\DnD\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:102:34)
+    at async processFilesAndCreateAndSerializeProjectGraph (c:\Softwareprojekte\DnD\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:138:17)
+[NX Daemon Server] - 2024-02-16T07:05:26.518Z - Time taken for 'hash changed files from watcher' 29.85249999910593ms
+[NX Daemon Server] - 2024-02-16T07:05:26.519Z - Done responding to the client null

+ 1 - 1
.nx/cache/d/server-process.json

@@ -1 +1 @@
-{"processId":2748}
+{"processId":12564}

+ 59 - 61
src/app/journal/journal-character/general/general.component.html

@@ -42,101 +42,99 @@
       </div>
       <div class="looks-entry">
         <div class="looks-label">Alter</div>
-        <input
-          type="text"
-          class="looks-input"
-          [(ngModel)]="data.age"
-          (change)="updateData()"
-        />
+        <mat-form-field appearance="outline" class="looks-input">
+          <input matInput [(ngModel)]="data.age" (change)="updateData()" />
+        </mat-form-field>
       </div>
       <div class="looks-entry">
         <div class="looks-label">Größe</div>
-        <input
-          type="text"
-          class="looks-input"
-          [(ngModel)]="data.height"
-          (change)="updateData()"
-        />
+        <mat-form-field appearance="outline" class="looks-input">
+          <input matInput [(ngModel)]="data.height" (change)="updateData()" />
+        </mat-form-field>
       </div>
       <div class="looks-entry">
         <div class="looks-label">Gewicht</div>
-        <input
-          type="text"
-          class="looks-input"
-          [(ngModel)]="data.weight"
-          (change)="updateData()"
-        />
+        <mat-form-field appearance="outline" class="looks-input">
+          <input matInput [(ngModel)]="data.weight" (change)="updateData()" />
+        </mat-form-field>
       </div>
       <div class="looks-entry">
         <div class="looks-label">Haarfarbe</div>
-        <input
-          type="text"
-          class="looks-input"
-          [(ngModel)]="data.hair"
-          (change)="updateData()"
-        />
+        <mat-form-field appearance="outline" class="looks-input">
+          <input matInput [(ngModel)]="data.hair" (change)="updateData()" />
+        </mat-form-field>
       </div>
       <div class="looks-entry">
         <div class="looks-label">Augenfarbe</div>
-        <input
-          type="text"
-          class="looks-input"
-          [(ngModel)]="data.eyes"
-          (change)="updateData()"
-        />
+        <mat-form-field appearance="outline" class="looks-input">
+          <input matInput [(ngModel)]="data.eyes" (change)="updateData()" />
+        </mat-form-field>
       </div>
       <div class="looks-entry">
         <div class="looks-label">Hautfarbe</div>
-        <input
-          type="text"
-          class="looks-input"
-          [(ngModel)]="data.skin"
-          (change)="updateData()"
-        />
+
+        <mat-form-field appearance="outline" class="looks-input">
+          <input matInput [(ngModel)]="data.skin" (change)="updateData()" />
+        </mat-form-field>
       </div>
     </div>
     <!-- DESCRIPTION -->
     <div class="description">
-      <textarea
-        class="description-area"
-        [(ngModel)]="data.description"
-        (change)="updateData()"
-      ></textarea>
+      <mat-form-field appearance="outline" class="description-wrapper">
+        <textarea
+          class="description-input"
+          matInput
+          [(ngModel)]="data.description"
+          (change)="updateData()"
+        ></textarea>
+      </mat-form-field>
       <label class="description-label">Beschreibung</label>
     </div>
   </div>
   <!-- PERSONALITY -->
   <div class="personality">
     <div class="personality-box">
-      <textarea
-        class="personality-area"
-        [(ngModel)]="data.personalityTraits"
-        (change)="updateData()"
-      ></textarea>
+      <mat-form-field appearance="outline" class="personality-wrapper">
+        <textarea
+          matInput
+          class="personality-input"
+          [(ngModel)]="data.personalityTraits"
+          (change)="updateData()"
+        ></textarea>
+      </mat-form-field>
       <label class="personality-label">Persönlichkeitsmerkmale</label>
     </div>
     <div class="personality-box">
-      <textarea
-        class="personality-area"
-        [(ngModel)]="data.ideals"
-        (change)="updateData()"
-      ></textarea>
+      <mat-form-field appearance="outline" class="personality-wrapper">
+        <textarea
+          matInput
+          class="personality-input"
+          [(ngModel)]="data.ideals"
+          (change)="updateData()"
+        ></textarea>
+      </mat-form-field>
       <label class="personality-label">Ideale</label>
     </div>
     <div class="personality-box">
-      <textarea
-        class="personality-area"
-        [(ngModel)]="data.bonds"
-        (change)="updateData()"
-      ></textarea>
+      <mat-form-field appearance="outline" class="personality-wrapper">
+        <textarea
+          matInput
+          class="personality-input"
+          [(ngModel)]="data.bonds"
+          (change)="updateData()"
+        ></textarea>
+      </mat-form-field>
       <label class="personality-label">Bindungen</label>
     </div>
     <div class="personality-box">
-      <textarea
-        class="personality-area"
-        [(ngModel)]="data.flaws"
-        (change)="updateData()"
-      ></textarea>
+      <mat-form-field appearance="outline" class="personality-wrapper">
+        <textarea
+          matInput
+          class="personality-input"
+          [(ngModel)]="data.flaws"
+          (change)="updateData()"
+        ></textarea>
+      </mat-form-field>
       <label class="personality-label">Makel</label>
     </div>
   </div>

+ 45 - 15
src/app/journal/journal-character/general/general.component.scss

@@ -86,12 +86,12 @@
         display: flex;
         justify-content: space-between;
 
-        .looks-input {
-            border-radius: 4px;
-            border: 1px solid var(--border-color);
-            box-shadow: var(--shadow);
-            padding-left: 1rem;
-        }
+        // .looks-input {
+        //     border-radius: 4px;
+        //     border: 1px solid var(--border-color);
+        //     box-shadow: var(--shadow);
+        //     padding-left: 1rem;
+        // }
 
         .looks-field {
             width: 12.5rem;
@@ -103,6 +103,19 @@
             padding-left: 1rem;
         }
     }
+
+    .looks-input {
+        width: 12.5rem;
+        box-shadow: var(--shadow);
+        border-radius: 4px;
+        overflow: hidden;
+    }
+
+    ::ng-deep .mat-mdc-form-field-infix {
+        height: 32px !important;
+        min-height: 32px !important;
+        padding-top: 4px !important;
+    }
 }
 
 .description {
@@ -111,18 +124,22 @@
     align-items: center;
     gap: 1rem;
 
-    .description-area {
-        width: 20rem;
-        height: 90%;
-        border: 1px solid var(--border-color);
-        border-radius: 10px;
-        box-shadow: var(--shadow);
+    .description-label {
+        font-weight: 500;
+    }
+
+    .description-input {
         resize: none;
-        padding: 1rem;
+        height: 90%;
+        width: 20rem;
     }
 
-    .description-label {
-        font-weight: 500;
+    .description-wrapper {
+        height: 100%;
+        width: 20rem;
+        box-shadow: var(--shadow);
+        overflow: hidden;
+        border-radius: 4px;
     }
 }
 
@@ -145,6 +162,19 @@
             height: 15rem;
         }
 
+        .personality-wrapper {
+            width: 100%;
+            height: 90%;
+            box-shadow: var(--shadow);
+            overflow: hidden;
+            border-radius: 4px;
+        }
+
+        .personality-input {
+            resize: none;
+            height: 100%;
+        }
+
         .personality-area {
             width: 100%;
             height: 100%;

+ 2 - 2
src/app/journal/journal-home/navigation-panel/navigation-panel.component.scss

@@ -52,7 +52,7 @@ ul {
 
     &:hover,
     &.active {
-        background-color: var(--primary-color);
+        background-color: var(--primary);
         transform: scale(1.05);
         cursor: pointer;
     }
@@ -79,6 +79,6 @@ ul {
 }
 
 .settings-button:hover {
-    background-color: var(--primary-color);
+    background-color: var(--tab-active);
     transform: scale(1.05);
 }

+ 2 - 2
src/app/journal/journal-spellcards/add-card/add-card.component.scss

@@ -32,7 +32,7 @@
 .add-button {
     width: 90%;
     margin: 0 0.5rem;
-    background-color: var(--primary-color);
+    background-color: var(--primary);
     border: var(--border);
     border-radius: 10px;
     box-shadow: var(--shadow);
@@ -41,7 +41,7 @@
     transition: all 0.25s ease-in-out;
 
     &:hover {
-        background-color: var(--primary-color-dark);
+        background-color: var(--primary-dark);
     }
 }
 

+ 6 - 0
src/app/journal/journal-stats/ability-panel/spellslots/spellslots.component.html

@@ -47,6 +47,12 @@
 
     <div class="value-row">
       <value-box [value]="spellSaveDC" [label]="'Rettungswurf-SG'"></value-box>
+      <div>
+        <div class="value-box">
+          {{ attributeTranslator[spellcastingAttribute] }}
+        </div>
+        <div class="value-label t-0375">Zauberwirken-Attribut</div>
+      </div>
       <value-box
         [value]="spellAttackModifier"
         [label]="'Zauber-Angriffsbonus'"

+ 21 - 0
src/app/journal/journal-stats/ability-panel/spellslots/spellslots.component.scss

@@ -62,3 +62,24 @@ input[type="checkbox"]:checked::after {
     background: #815139;
     transform: translate(-50%, -50%);
 }
+
+.value-box {
+    max-width: 8rem;
+    padding: 0 0.25rem 0 0.25rem;
+    height: 2.75rem;
+    font-size: 1.5rem;
+    text-align: center;
+    border-radius: 10px;
+    border: none;
+    box-shadow: var(--shadow);
+    background-color: white;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.value-label {
+    width: 7rem;
+    font-weight: 500;
+    text-align: center;
+}

+ 10 - 9
src/app/journal/journal-stats/ability-panel/spellslots/spellslots.component.ts

@@ -12,7 +12,7 @@ export class SpellslotsComponent {
   public spellslots: any[] = [];
   public showSpellslots: boolean = false;
   public kiPoints: any;
-  public spellcastingAttribute: string | undefined = undefined;
+  public spellcastingAttribute: string = '';
   public proficiencyBonus: number = 2;
   public attributeValue: number = 0;
   public isMonk: boolean = true;
@@ -22,6 +22,15 @@ export class SpellslotsComponent {
 
   public slotNumber: number = 1;
 
+  attributeTranslator: any = {
+    Strength: 'Stärke',
+    Dexterity: 'Geschicklichkeit',
+    Constitution: 'Konstitution',
+    Intelligence: 'Intelligenz',
+    Wisdom: 'Weisheit',
+    Charisma: 'Charisma',
+  };
+
   public constructor(
     public dataAccessor: DataService,
     public modalAccessor: ModalService
@@ -71,18 +80,11 @@ export class SpellslotsComponent {
 
   private calculateModifiers(): void {
     const spellcastingAttribute = this.spellcastingAttribute;
-    console.log('calculateModifiers wurde aufgerufen');
-    console.log('Proficiency: ', this.proficiencyBonus);
-
-    console.log('Attribute: ', this.spellcastingAttribute);
-    console.log('Value: ', this.attributeValue);
 
     if (spellcastingAttribute !== undefined) {
       const modifier = (this.attributeValue - 10) / 2;
       this.spellAttackModifier = modifier + this.proficiencyBonus;
       this.spellSaveDC = 8 + modifier + this.proficiencyBonus;
-      console.log('Attack: ', this.spellAttackModifier);
-      console.log('Save: ', this.spellSaveDC);
     }
   }
 
@@ -92,7 +94,6 @@ export class SpellslotsComponent {
         'this.dataAccessor.' +
         this.spellcastingAttribute.toLowerCase() +
         '$.subscribe((attribute) => {this.attributeValue = attribute.value; this.calculateModifiers();});';
-      console.log(command);
       eval(command);
     }
   }

+ 1 - 1
src/app/journal/journal-stats/attribute-skill-container/attribute-panel/attribute-field/attribute-details/attribute-details.component.scss

@@ -12,7 +12,7 @@
 }
 
 .skill-item {
-    background-color: var(--primary-color);
+    background-color: var(--tab);
     border-radius: 1rem;
     font-weight: 500;
     padding: 0.25rem 0.5rem;

+ 1 - 0
src/app/journal/journal-stats/life-container/life/life.component.ts

@@ -29,6 +29,7 @@ export class LifeComponent {
     this.maxHitPoints = hitPointsData.maxHitPoints;
     this.currentHitPoints = hitPointsData.currentHitPoints;
     this.temporaryHitPoints = hitPointsData.temporaryHitPoints;
+    this.hitDice = this.dataAccessor.hitDice;
     this.calculatePercentages();
   }
 

+ 3 - 1
src/app/journal/journal-stats/weapons-container/spell-table/favorite-spells-modal/favorite-spells-modal.component.html

@@ -69,7 +69,9 @@
         font-weight: 500;
       "
     >
-      Noch keine Zauber hinzugefügt
+      Noch keine Zauber vorbereitet.
+      <br />
+      Dies kannst du im Menü <i><b>Zauber</b></i> tun.
     </div>
     }
   </div>

+ 1 - 1
src/app/journal/journal-stats/weapons-container/spell-table/favorite-spells-modal/favorite-spells-modal.component.scss

@@ -57,7 +57,7 @@
 
 .selected {
     background-color: #f8d8c6;
-    border: 3px solid #bc8567;
+    border: 3px solid var(--primary);
     &:hover {
         background-color: var(--items);
     }

+ 1 - 1
src/app/journal/journal-stats/weapons-container/spell-table/spell-table.component.html

@@ -81,7 +81,7 @@
   <ng-template #costTemplate let-spell="spell">
     <div class="bold">
       <span *ngIf="spell.cost === 'action'">A</span>
-      <span *ngIf="spell.cost === 'bonus'">B</span>
+      <span *ngIf="spell.cost === 'bonus action'">B</span>
       <span *ngIf="spell.cost === 'reaction'">R</span>
     </div>
   </ng-template>

+ 1 - 1
src/app/journal/journal-stats/weapons-container/spell-table/spell-table.component.scss

@@ -2,7 +2,7 @@
   flex: 0 0 3rem;
   padding: 10px 0.625rem;
   display: grid;
-  grid-template-columns: 6fr 20fr 10fr 8fr 20fr 16fr;
+  grid-template-columns: 4fr 17fr 9fr 8fr 19fr 16fr;
   text-align: center;
   font-weight: 700;
   box-shadow: var(--shadow-bottom);

+ 95 - 0
src/helpers.scss

@@ -154,3 +154,98 @@
     display: flex !important;
     flex-direction: column !important;
 }
+
+// Überprüfen, ob es verwendet wird
+
+.flex-centered {
+    align-items: center;
+    justify-content: center;
+}
+
+.flex-left {
+    justify-content: start;
+}
+
+.flex-right {
+    justify-content: end;
+}
+
+.gap-01 {
+    gap: 0.1rem;
+}
+
+.gap-02 {
+    gap: 0.2rem;
+}
+
+.gap-03 {
+    gap: 0.3rem;
+}
+
+.gap-04 {
+    gap: 0.4rem;
+}
+
+.gap-05 {
+    gap: 0.5rem;
+}
+
+.gap-06 {
+    gap: 0.6rem;
+}
+
+.gap-07 {
+    gap: 0.7rem;
+}
+
+.gap-08 {
+    gap: 0.8rem;
+}
+
+.gap-09 {
+    gap: 0.9rem;
+}
+
+.gap-10 {
+    gap: 1rem;
+}
+
+.gap-11 {
+    gap: 1.1rem;
+}
+
+.gap-12 {
+    gap: 1.2rem;
+}
+
+.gap-13 {
+    gap: 1.3rem;
+}
+
+.gap-14 {
+    gap: 1.4rem;
+}
+
+.gap-15 {
+    gap: 1.5rem;
+}
+
+.gap-16 {
+    gap: 1.6rem;
+}
+
+.gap-17 {
+    gap: 1.7rem;
+}
+
+.gap-18 {
+    gap: 1.8rem;
+}
+
+.gap-19 {
+    gap: 1.9rem;
+}
+
+.gap-20 {
+    gap: 2rem;
+}

+ 20 - 94
src/styles.scss

@@ -8,9 +8,9 @@
 
 :root {
     // COLORS to use but not official
-    --primary-color: #d8ac96;
-    --primary-color-light: #e8c7b5;
-    --primary-color-dark: #d89777;
+    // --primary: #d8ac96;
+    --primary-light: #e8c7b5;
+    --primary-dark: #d89777;
     --secondary-color: #efc8af;
     --secondary-color-light: #f8e1d7;
     --secondary-color-dark: #cfaa8c;
@@ -43,6 +43,9 @@
 
     // OFFICIAL COLORS
 
+    --primary-old: #d8ac96;
+    --primary: #b0826b;
+
     // Buttons
     --accept: #84a36f;
     --accept-hover: #6f9158;
@@ -54,6 +57,7 @@
     --neutral-hover: #a76b43;
     --tab: #c79980;
     --tab-active: #bc8567;
+    //
     // c28c6f
 
     // Spellcards
@@ -83,7 +87,8 @@
     --shadow-bottom: 0px 5px 10px 0px rgba(0, 0, 0, 0.5);
     --shadow-top: 0px -5px 10px 0px rgba(0, 0, 0, 0.5);
 
-    --primary-color: #d8ac96;
+    --old-primary: #d8ac96;
+    --primary-color: #a9836f;
     --background-color: #fff2e9;
     --field-background-color: #efc8af;
     --border-color: #8d8c8c;
@@ -351,9 +356,8 @@ input[type="checkbox"] {
 html,
 body {
     height: 100%;
-}
-body {
     margin: 0;
+    font-family: var(--bs-body-font-family) !important;
 }
 
 .flex-row {
@@ -366,97 +370,19 @@ body {
     flex-direction: column;
 }
 
-// SOLL WEG
-
-.flex-centered {
-    align-items: center;
-    justify-content: center;
-}
-
-.flex-left {
-    justify-content: start;
-}
-
-.flex-right {
-    justify-content: end;
-}
-
-.gap-01 {
-    gap: 0.1rem;
-}
-
-.gap-02 {
-    gap: 0.2rem;
-}
-
-.gap-03 {
-    gap: 0.3rem;
-}
-
-.gap-04 {
-    gap: 0.4rem;
-}
-
-.gap-05 {
-    gap: 0.5rem;
-}
-
-.gap-06 {
-    gap: 0.6rem;
-}
-
-.gap-07 {
-    gap: 0.7rem;
-}
-
-.gap-08 {
-    gap: 0.8rem;
-}
-
-.gap-09 {
-    gap: 0.9rem;
-}
-
-.gap-10 {
-    gap: 1rem;
-}
-
-.gap-11 {
-    gap: 1.1rem;
-}
-
-.gap-12 {
-    gap: 1.2rem;
-}
-
-.gap-13 {
-    gap: 1.3rem;
-}
-
-.gap-14 {
-    gap: 1.4rem;
-}
-
-.gap-15 {
-    gap: 1.5rem;
-}
-
-.gap-16 {
-    gap: 1.6rem;
-}
-
-.gap-17 {
-    gap: 1.7rem;
-}
+// Overriding the default styles of angular material
 
-.gap-18 {
-    gap: 1.8rem;
+.mat-mdc-option.mdc-list-item--selected:not(.mdc-list-item--disabled) .mdc-list-item__primary-text {
+    color: var(--primary) !important;
 }
 
-.gap-19 {
-    gap: 1.9rem;
+.mat-primary .mat-pseudo-checkbox-checked.mat-pseudo-checkbox-minimal::after,
+.mat-primary .mat-pseudo-checkbox-indeterminate.mat-pseudo-checkbox-minimal::after {
+    color: var(--primary) !important;
 }
 
-.gap-20 {
-    gap: 2rem;
+.mdc-text-field--outlined:not(.mdc-text-field--disabled).mdc-text-field--focused .mdc-notched-outline__leading,
+.mdc-text-field--outlined:not(.mdc-text-field--disabled).mdc-text-field--focused .mdc-notched-outline__notch,
+.mdc-text-field--outlined:not(.mdc-text-field--disabled).mdc-text-field--focused .mdc-notched-outline__trailing {
+    border-color: var(--primary) !important;
 }