Browse Source

redesigned all pages. Not complete but good state

Warafear 9 months ago
parent
commit
ab5fb8d0fe

+ 18 - 17
src/app/journal/journal-inventory/journal-inventory.component.scss

@@ -11,10 +11,10 @@
     flex: 1 1 0;
     flex: 1 1 0;
   }
   }
   > :first-child {
   > :first-child {
-    border-radius: 10px 0 0 0;
+    border-radius: 8px 0 0 0;
   }
   }
   > :last-child {
   > :last-child {
-    border-radius: 0 10px 0 0;
+    border-radius: 0 8px 0 0;
   }
   }
 }
 }
 
 
@@ -23,7 +23,7 @@
   font-size: 1.375rem;
   font-size: 1.375rem;
   font-weight: 600;
   font-weight: 600;
   color: black;
   color: black;
-  border: solid 1px var(--border-color);
+  border: none;
   transition: filter 0.25s ease-in-out;
   transition: filter 0.25s ease-in-out;
   background-image: url("/assets/images/texture-15.jpg");
   background-image: url("/assets/images/texture-15.jpg");
   filter: brightness(0.85);
   filter: brightness(0.85);
@@ -44,6 +44,7 @@
   flex-direction: column;
   flex-direction: column;
   background-image: url("/assets/images/texture.png");
   background-image: url("/assets/images/texture.png");
   box-shadow: var(--shadow);
   box-shadow: var(--shadow);
+  border: var(--golder);
 
 
   .heading-row {
   .heading-row {
     flex: 0 0 3rem;
     flex: 0 0 3rem;
@@ -80,11 +81,11 @@
     cursor: pointer;
     cursor: pointer;
     border-radius: 10px;
     border-radius: 10px;
     box-shadow: var(--shadow);
     box-shadow: var(--shadow);
-    transition: all 0.2s ease-in-out;
-    border: var(--new-border);
-    background-color: #dadad4;
+    transition: all 0.2 ease-in-out;
+    border: var(--golder);
+    background-image: url("/assets/images/texture-15.jpg");
     &:hover {
     &:hover {
-      background-color: #cbcbc6;
+      background-image: url("/assets/images/texture-40.jpg");
     }
     }
   }
   }
 
 
@@ -108,6 +109,7 @@
   height: calc(100% - 16rem);
   height: calc(100% - 16rem);
   width: 100%;
   width: 100%;
   border-radius: 10px;
   border-radius: 10px;
+  border: var(--golder);
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
   background-image: url("/assets/images/texture.png");
   background-image: url("/assets/images/texture.png");
@@ -145,10 +147,10 @@
     border-radius: 10px;
     border-radius: 10px;
     box-shadow: var(--shadow);
     box-shadow: var(--shadow);
     transition: all 0.2s ease-in-out;
     transition: all 0.2s ease-in-out;
-    border: var(--new-border);
-    background-color: #dadad4;
+    border: var(--golder);
+    background-image: url("/assets/images/texture-15.jpg");
     &:hover {
     &:hover {
-      background-color: #cbcbc6;
+      background-image: url("/assets/images/texture-40.jpg");
     }
     }
   }
   }
 
 
@@ -172,6 +174,7 @@
   // background-color: var(--field-background-color);
   // background-color: var(--field-background-color);
   background-image: url("/assets/images/texture.png");
   background-image: url("/assets/images/texture.png");
   box-shadow: var(--shadow);
   box-shadow: var(--shadow);
+  border: var(--golder);
 
 
   .money-box {
   .money-box {
     width: 6rem;
     width: 6rem;
@@ -184,10 +187,9 @@
     font-size: 1.5rem;
     font-size: 1.5rem;
     position: relative;
     position: relative;
     border-radius: 10px;
     border-radius: 10px;
-    // background-color: white;
-    background-image: url("/assets/images/texture.png");
-    filter: brightness(0.85);
+    background-image: url("/assets/images/texture-15.jpg");
     box-shadow: var(--shadow);
     box-shadow: var(--shadow);
+    border: var(--golder);
   }
   }
 
 
   .money-icon {
   .money-icon {
@@ -224,10 +226,9 @@
   justify-content: center;
   justify-content: center;
   gap: 2rem;
   gap: 2rem;
   position: relative;
   position: relative;
-  // border: 1px solid var(--border-color);
+  border: var(--golder);
   border-radius: 10px;
   border-radius: 10px;
   background-image: url("/assets/images/texture.png");
   background-image: url("/assets/images/texture.png");
-  // background-image: url("/assets/border/border1.svg");
   box-shadow: var(--shadow);
   box-shadow: var(--shadow);
 
 
   .weight-box {
   .weight-box {
@@ -238,8 +239,8 @@
     justify-content: center;
     justify-content: center;
     align-items: center;
     align-items: center;
     border-radius: 10px;
     border-radius: 10px;
-    background-image: url("/assets/images/texture.png");
-    filter: brightness(0.85);
+    background-image: url("/assets/images/texture-15.jpg");
+    border: var(--golder);
     box-shadow: var(--shadow);
     box-shadow: var(--shadow);
   }
   }
 }
 }

+ 1 - 1
src/app/journal/journal-spellbook/custom-spells-modal/custom-spells-modal.component.scss

@@ -44,7 +44,7 @@
     0 3px 10px 2px rgba(0, 0, 0, 0.12);
     0 3px 10px 2px rgba(0, 0, 0, 0.12);
   transition: background-color 0.2s ease-in-out;
   transition: background-color 0.2s ease-in-out;
   &:hover {
   &:hover {
-    border: 1px solid #9b8559;
+    border: 1px solid var(--gold);
   }
   }
 }
 }
 
 

+ 4 - 4
src/app/journal/journal-stats/ability-panel/ability-panel.component.scss

@@ -1,6 +1,6 @@
 .ability-panel-container {
 .ability-panel-container {
-  border: solid 1px var(--border-color);
-  background-color: var(--field-background-color);
+  border: var(--golder);
+  background-image: url("/assets/images/texture.png");
   box-shadow: var(--shadow);
   box-shadow: var(--shadow);
   border-radius: 10px;
   border-radius: 10px;
   display: flex;
   display: flex;
@@ -17,7 +17,7 @@
     flex: 1 1 0;
     flex: 1 1 0;
   }
   }
   > :first-child {
   > :first-child {
-    border-radius: 10px 0 0 0;
+    border-radius: 8px 0 0 0;
     border-right: 1px solid var(--border-color);
     border-right: 1px solid var(--border-color);
   }
   }
   > :nth-child(2) {
   > :nth-child(2) {
@@ -29,7 +29,7 @@
     border-right: 1px solid var(--border-color);
     border-right: 1px solid var(--border-color);
   }
   }
   > :last-child {
   > :last-child {
-    border-radius: 0 10px 0 0;
+    border-radius: 0 8px 0 0;
     border-left: 1px solid var(--border-color);
     border-left: 1px solid var(--border-color);
   }
   }
 }
 }

+ 8 - 5
src/app/journal/journal-stats/ability-panel/spellslots/spellslots.component.scss

@@ -10,11 +10,13 @@
 
 
 .spell-container {
 .spell-container {
   margin: 15px 10px;
   margin: 15px 10px;
-  background-color: var(--items);
-  border: var(--border);
+  // background-color: var(--items);
+  // border: var(--border);
   border-radius: 10px;
   border-radius: 10px;
   box-shadow: var(--shadow);
   box-shadow: var(--shadow);
   padding-bottom: 1.25rem;
   padding-bottom: 1.25rem;
+  border: var(--golder);
+  background-image: url("/assets/images/texture-15.jpg");
 }
 }
 .level-row {
 .level-row {
   padding: 1rem 1.5rem 0 1.5rem;
   padding: 1rem 1.5rem 0 1.5rem;
@@ -58,7 +60,7 @@ input[type="checkbox"]:checked::after {
   left: 50%;
   left: 50%;
   width: 12px;
   width: 12px;
   height: 12px;
   height: 12px;
-  background: #815139;
+  background: var(--gold-active);
   transform: translate(-50%, -50%);
   transform: translate(-50%, -50%);
 }
 }
 
 
@@ -69,9 +71,10 @@ input[type="checkbox"]:checked::after {
   font-size: 1.5rem;
   font-size: 1.5rem;
   text-align: center;
   text-align: center;
   border-radius: 10px;
   border-radius: 10px;
-  border: none;
+  border: var(--golder);
   box-shadow: var(--shadow);
   box-shadow: var(--shadow);
-  background-color: white;
+  // background-color: white;
+  background-image: url("/assets/images/texture-15.jpg");
   display: flex;
   display: flex;
   justify-content: center;
   justify-content: center;
   align-items: center;
   align-items: center;

+ 2 - 2
src/app/journal/journal-stats/attribute-panel/attribute-field/attribute-field.component.scss

@@ -1,7 +1,7 @@
 .attribute-box {
 .attribute-box {
   width: 8rem;
   width: 8rem;
-  border: var(--border);
-  background-color: var(--field-background-color);
+  border: var(--golder);
+  background-image: url("/assets/images/texture.png");
   box-shadow: var(--shadow);
   box-shadow: var(--shadow);
   border-radius: 10px;
   border-radius: 10px;
   text-align: center;
   text-align: center;

+ 4 - 3
src/app/journal/journal-stats/info-row/conditions/conditions.component.scss

@@ -1,7 +1,7 @@
 .condition-container {
 .condition-container {
   display: flex;
   display: flex;
-  border: solid 1px var(--border-color);
-  background-color: var(--field-background-color);
+  border: var(--golder);
+  background-image: url("/assets/images/texture.png");
   box-shadow: var(--shadow);
   box-shadow: var(--shadow);
   border-radius: 10px;
   border-radius: 10px;
   height: 6rem;
   height: 6rem;
@@ -20,7 +20,8 @@
   height: 4rem;
   height: 4rem;
   margin: 0.25rem 0.25rem 0 0.25rem;
   margin: 0.25rem 0.25rem 0 0.25rem;
   overflow-y: auto;
   overflow-y: auto;
-  background-color: var(--background-color);
+  border: var(--golder);
+  background-image: url("/assets/images/texture-15.jpg");
   border-radius: 10px;
   border-radius: 10px;
 }
 }
 
 

+ 2 - 2
src/app/journal/journal-stats/life/life.component.scss

@@ -1,8 +1,8 @@
 .life-box {
 .life-box {
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
-  border: solid 1px var(--border-color);
-  background-color: var(--field-background-color);
+  border: var(--golder);
+  background-image: url("/assets/images/texture.png");
   box-shadow: var(--shadow);
   box-shadow: var(--shadow);
   border-radius: 10px;
   border-radius: 10px;
   cursor: pointer;
   cursor: pointer;

+ 2 - 2
src/app/journal/journal-stats/save-throw-panel/save-throw-panel.component.scss

@@ -1,8 +1,8 @@
 @import "../../../../responsive";
 @import "../../../../responsive";
 
 
 .save-throw-panel {
 .save-throw-panel {
-  border: var(--border);
-  background-color: var(--field-background-color);
+  border: var(--golder);
+  background-image: url("/assets/images/texture.png");
   box-shadow: var(--shadow);
   box-shadow: var(--shadow);
   border-radius: 10px;
   border-radius: 10px;
   display: flex;
   display: flex;

+ 2 - 2
src/app/journal/journal-stats/skill-panel/skill-panel.component.scss

@@ -3,8 +3,8 @@
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
   justify-content: space-evenly;
   justify-content: space-evenly;
-  border: solid 1px var(--border-color);
-  background-color: var(--field-background-color);
+  border: var(--golder);
+  background-image: url("/assets/images/texture.png");
   box-shadow: var(--shadow);
   box-shadow: var(--shadow);
   border-radius: 10px;
   border-radius: 10px;
   height: 37.875rem;
   height: 37.875rem;

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

@@ -26,8 +26,6 @@
   align-items: center;
   align-items: center;
   justify-content: space-between;
   justify-content: space-between;
   box-sizing: border-box;
   box-sizing: border-box;
-  cursor: move;
-  background: var(--items);
   border-radius: 10px;
   border-radius: 10px;
   font-size: 1rem;
   font-size: 1rem;
   font-weight: 600;
   font-weight: 600;
@@ -36,9 +34,15 @@
     0 5px 5px -3px rgba(0, 0, 0, 0.2),
     0 5px 5px -3px rgba(0, 0, 0, 0.2),
     0 8px 8px 1px rgba(0, 0, 0, 0.14),
     0 8px 8px 1px rgba(0, 0, 0, 0.14),
     0 3px 10px 2px rgba(0, 0, 0, 0.12);
     0 3px 10px 2px rgba(0, 0, 0, 0.12);
-  transition: background-color 0.2s ease-in-out;
+  // background: var(--items);
+  // transition: background-color 0.2s ease-in-out;
+  // &:hover {
+  //   background: var(--items-hover);
+  // }
+  border: var(--golder);
+  background-image: url("/assets/images/texture-15.jpg");
   &:hover {
   &:hover {
-    background: var(--items-hover);
+    background-image: url("/assets/images/texture-40.jpg");
   }
   }
 }
 }
 
 

+ 9 - 4
src/app/journal/journal-stats/weapons-container/weapon-table/weapon-table.component.scss

@@ -23,8 +23,7 @@
   align-items: center;
   align-items: center;
   justify-content: space-between;
   justify-content: space-between;
   box-sizing: border-box;
   box-sizing: border-box;
-  cursor: move;
-  background: var(--items);
+  cursor: pointer;
   border-radius: 10px;
   border-radius: 10px;
   font-size: 1rem;
   font-size: 1rem;
   font-weight: 600;
   font-weight: 600;
@@ -33,9 +32,15 @@
     0 5px 5px -3px rgba(0, 0, 0, 0.2),
     0 5px 5px -3px rgba(0, 0, 0, 0.2),
     0 8px 8px 1px rgba(0, 0, 0, 0.14),
     0 8px 8px 1px rgba(0, 0, 0, 0.14),
     0 3px 10px 2px rgba(0, 0, 0, 0.12);
     0 3px 10px 2px rgba(0, 0, 0, 0.12);
-  transition: background-color 0.2s ease-in-out;
+  // background: var(--items);
+  // transition: background-color 0.2s ease-in-out;
+  // &:hover {
+  //   background: var(--items-hover);
+  // }
+  border: var(--golder);
+  background-image: url("/assets/images/texture-15.jpg");
   &:hover {
   &:hover {
-    background: var(--items-hover);
+    background-image: url("/assets/images/texture-40.jpg");
   }
   }
 }
 }
 
 

+ 7 - 9
src/app/journal/journal-stats/weapons-container/weapons-container.component.scss

@@ -1,6 +1,6 @@
 .weapon-spell-container {
 .weapon-spell-container {
-  border: solid 1px var(--border-color);
-  background-color: var(--field-background-color);
+  border: var(--golder);
+  background-image: url("/assets/images/texture.png");
   box-shadow: var(--shadow);
   box-shadow: var(--shadow);
   border-radius: 10px;
   border-radius: 10px;
   display: flex;
   display: flex;
@@ -17,12 +17,10 @@
   background-color: var(--tab);
   background-color: var(--tab);
   border-top: 0;
   border-top: 0;
   border-left: 0;
   border-left: 0;
-  border-bottom: 1px solid var(--border-color);
   border-right: 0;
   border-right: 0;
 
 
   &.active {
   &.active {
     background-color: var(--tab-active);
     background-color: var(--tab-active);
-    border-bottom: 3px solid var(--border-color);
   }
   }
 }
 }
 
 
@@ -33,16 +31,16 @@
     flex: 1 1 0;
     flex: 1 1 0;
   }
   }
   > :first-child {
   > :first-child {
-    border-radius: 10px 0 0 0;
+    border-radius: 8px 0 0 0;
     &.active {
     &.active {
-      border-right: 1px solid var(--border-color);
+      // border-right: 1px solid var(--border-color);
     }
     }
   }
   }
   > :last-child {
   > :last-child {
-    border-radius: 0 10px 0 0;
-    border-right: 1px solid var(--border-color);
+    border-radius: 0 8px 0 0;
+    // border-right: 1px solid var(--border-color);
     &.active {
     &.active {
-      border-left: 1px solid var(--border-color);
+      // border-left: 1px solid var(--border-color);
     }
     }
   }
   }
 }
 }

+ 1 - 1
src/app/shared-components/divider/divider.component.scss

@@ -1,5 +1,5 @@
 div {
 div {
-  border-top: 2px solid var(--primary);
+  border-top: 2px solid var(--gold);
   height: 1px;
   height: 1px;
   width: 100%;
   width: 100%;
 }
 }

+ 7 - 2
src/colors.scss

@@ -7,8 +7,8 @@
   --edit-hover: #6f8e9f;
   --edit-hover: #6f8e9f;
   --neutral: #b9835d;
   --neutral: #b9835d;
   --neutral-hover: #a76b43;
   --neutral-hover: #a76b43;
-  --tab: #c79980;
-  --tab-active: #bc8567;
+  --tab: #c1ae75;
+  --tab-active: #98895c;
 
 
   --abjuration-background: #cab8de;
   --abjuration-background: #cab8de;
   --abjuration-border: 0 0 0 2px #171314, 0 0 0 5px #9586a5;
   --abjuration-border: 0 0 0 2px #171314, 0 0 0 5px #9586a5;
@@ -68,4 +68,9 @@
   --items: #fff2e9;
   --items: #fff2e9;
   --items-hover: #f7e3d7;
   --items-hover: #f7e3d7;
   --border: 1px solid var(--border-color);
   --border: 1px solid var(--border-color);
+
+  //
+  --gold: #c1ae75;
+  --gold-active: #98895c;
+  --golder: 2px solid var(--gold);
 }
 }

+ 10 - 5
src/styles.scss

@@ -71,15 +71,20 @@
 }
 }
 
 
 .item {
 .item {
-  background-color: var(--items);
   box-sizing: border-box;
   box-sizing: border-box;
-  border: var(--border);
   border-radius: 10px;
   border-radius: 10px;
   box-shadow: var(--shadow);
   box-shadow: var(--shadow);
   cursor: pointer;
   cursor: pointer;
   transition: background-color 0.2s ease-in-out;
   transition: background-color 0.2s ease-in-out;
+  // border: var(--border);
+  // background-color: var(--items);
+  // &:hover {
+  //   background-color: var(--items-hover);
+  // }
+  border: var(--golder);
+  background-image: url("/assets/images/texture-15.jpg");
   &:hover {
   &:hover {
-    background-color: var(--items-hover);
+    background-image: url("/assets/images/texture-40.jpg");
   }
   }
 }
 }
 
 
@@ -177,8 +182,8 @@ input[type="checkbox"] {
   flex-direction: column;
   flex-direction: column;
   justify-content: space-between;
   justify-content: space-between;
   align-items: center;
   align-items: center;
-  border: solid 1px var(--border-color);
-  background-color: var(--field-background-color);
+  border: var(--golder);
+  background-image: url("/assets/images/texture.png");
   box-shadow: var(--shadow);
   box-shadow: var(--shadow);
   border-radius: 10px;
   border-radius: 10px;
   height: 6rem;
   height: 6rem;