chore:fix my merge mistake

scss/components/_effects.scss

@@ -0,0 +1,22 @@
+.effects .item {
+  .effect-source,
+  .effect-duration,
+  .effect-controls {
+    text-align: center;
+    border-left: 1px solid #c9c7b8;
+    border-right: 1px solid #c9c7b8;
+    font-size: 12px;
+  }
+
+  .effect-controls {
+    border: none;
+  }
+}
+
+// _effects.scss
+.kids-on-brooms input:focus,
+.kids-on-brooms textarea:focus,
+.kids-on-brooms select:focus {
+  outline: none;
+  border-color: $focus-border-color;
+}

scss/components/_forms.scss

@@ -0,0 +1,66 @@
+.item-form {
+  font-family: $font-primary;
+}
+
+.sheet-header {
+  @include flexbox(row, wrap, flex-start); // Use a mixin for flexbox
+  flex: 0 auto;
+  overflow: hidden;
+  margin-bottom: 10px;
+
+  .profile-img {
+    flex: 0 0 100px;
+    height: 100px;
+    margin-right: 10px;
+  }
+
+  .header-fields {
+    flex: 1;
+  }
+
+  h1.charname {
+    height: 50px;
+    padding: 0;
+    margin: 5px 0;
+    border-bottom: 0;
+
+    input {
+      width: 100%;
+      height: 100%;
+      margin: 0;
+    }
+  }
+}
+
+div.editor-border {
+  border: 2px solid $primary-border-color; // Replace the hardcoded color with a variable
+  border-radius: 10px;
+}
+
+.sheet-tabs {
+  flex: 0;
+}
+
+.sheet-body,
+.sheet-body .tab,
+.sheet-body .tab .editor {
+  height: 100%;
+}
+
+.tox {
+  .tox-editor-container {
+    background: $c-white;
+  }
+
+  .tox-edit-area {
+    padding: 0 8px;
+  }
+}
+
+// Flexbox container for each row
+.selection-row {
+  display: flex;
+  justify-content: space-between; // Ensures label stays left and input moves to the right
+  align-items: center; // Vertically center the label and input
+  margin-bottom: 10px; // Optional: Add some space between rows
+}

scss/components/_items.scss

@@ -0,0 +1,124 @@
+// Section Header
+.items-header {
+  height: 28px;
+  margin: 2px 0;
+  padding: 0;
+  align-items: center;
+  background: rgba(0, 0, 0, 0.05);
+  border: $border-groove;
+  font-weight: bold;
+  
+  > * {
+    font-size: 14px;
+    text-align: center;
+  }
+
+  .item-name {
+    font-weight: bold;
+    padding-left: 5px;
+    text-align: left;
+    display: flex;
+  }
+}
+
+// Items Lists
+.items-list {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  overflow-y: auto;
+  scrollbar-width: thin;
+  color: $c-tan;
+
+  // Child lists
+  .item-list {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+  }
+
+  // Individual Item
+  .item {
+    display: flex;
+    align-items: center;
+    padding: 0 2px; // Align with the header border
+    border-bottom: 1px solid $c-faint;
+
+    &:last-child {
+      border-bottom: none;
+    }
+
+    // Item name and image
+    .item-name {
+      flex: 2;
+      margin: 0;
+      overflow: hidden;
+      font-size: 13px;
+      text-align: left;
+      display: flex;
+      color: $c-dark;
+
+      h3, h4 {
+        margin: 0;
+        white-space: nowrap;
+        overflow-x: hidden;
+      }
+
+      .item-image {
+        flex: 0 0 30px;
+        height: 30px;
+        background-size: 30px;
+        border: none;
+        margin-right: 5px;
+      }
+    }
+  }
+
+  // Control Buttons
+  .item-controls {
+    display: flex;
+    flex: 0 0 100px;
+    justify-content: flex-end;
+
+    a {
+      font-size: 12px;
+      text-align: center;
+      margin: 0 6px;
+    }
+  }
+
+  // Item Properties (like stats or details)
+  .item-prop {
+    text-align: center;
+    border-left: 1px solid $c-faint;
+    border-right: 1px solid $c-faint;
+    font-size: 12px;
+  }
+}
+
+// Section Header inside Items List
+.items-list .items-header {
+  height: 28px;
+  margin: 2px 0;
+  padding: 0;
+  align-items: center;
+  background: rgba(0, 0, 0, 0.05);
+  border: $border-groove;
+  font-weight: bold;
+
+  > * {
+    font-size: 12px;
+    text-align: center;
+  }
+
+  .item-name {
+    padding-left: 5px;
+    text-align: left;
+  }
+}
+
+// Optional item formula block
+.item-formula {
+  flex: 0 0 200px;
+  padding: 0 8px;
+}

scss/components/_resource.scss

@@ -0,0 +1,3 @@
+.resource-label {
+  font-weight: bold;
+}