Skip to content

Commit 4a9bb04

Browse files
Merge branch 'dev'
2 parents 365f18a + 7a0a1f4 commit 4a9bb04

File tree

6 files changed

+22
-12
lines changed

6 files changed

+22
-12
lines changed

script/core/InventoryEditor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ export class InventoryEditor {
271271
this.templates.unshift(duplicate);
272272
this.currentTemplate = duplicate;
273273
this.ui.loadTemplateToForm(duplicate);
274-
this.ui.selectTemplateInList(duplicate.id);
275274
this.ui.renderTemplatesList();
275+
this.ui.selectTemplateInList(duplicate.id);
276276
this.notifications.show('Template duplicated successfully', 'success');
277277
}
278278

script/database/TemplateRepository.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,18 @@ export class TemplateRepository {
1313
}
1414

1515
async save(template) {
16-
// Ensure template has required fields
1716
if (!template.id) {
1817
throw new Error('Template must have an id');
1918
}
2019

21-
// Set timestamps
2220
const now = new Date().toISOString();
2321
if (!template.createdAt) {
2422
template.createdAt = now;
2523
}
2624
template.updatedAt = now;
2725

28-
return await this.db.put(this.storeName, template);
26+
await this.db.put(this.storeName, template);
27+
return template;
2928
}
3029

3130
async delete(id) {

style/reset.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
body {
1010
font-family: var(--font-family);
11-
background: var(--background-gradient);
11+
background: var(--bg-white-solid);
1212
color: #333;
1313
min-height: 100vh;
1414
-ms-overflow-style: none;

style/responsive.css

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
@media (max-width: 1200px) {
4747
.main-content {
4848
flex-direction: column;
49-
margin-top: 1rem;
49+
/*margin-top: 1rem;*/
5050
}
5151

5252
.sidebar {
@@ -258,4 +258,10 @@
258258
.help-body {
259259
padding: var(--spacing-sm);
260260
}
261+
262+
#themeToggle {
263+
padding: var(--spacing-sm);
264+
min-width: 1rem;
265+
font-size: 1rem;
266+
}
261267
}

style/sidebar.css

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,22 @@
3232
#templatesList button {
3333
width: 100%;
3434
padding: 0.75rem;
35-
background: var(--bg-light);
36-
border: 1px solid var(--bg-border-dark);
35+
background: transparent;
36+
border: 1px solid transparent;
3737
border-radius: var(--border-radius-sm);
3838
cursor: pointer;
3939
text-align: left;
4040
transition: all var(--transition-fast);
41+
font-weight: 600;
42+
}
43+
44+
#templatesList button:hover {
45+
box-shadow: var(--shadow-sm);
46+
border-color: var(--bg-border);
4147
}
4248

4349
#templatesList button.active {
44-
background: var(--bg-white);
50+
background: var(--primary-gradient);
4551
border-color: var(--primary-color);
4652
border: 1px solid var(--primary-color);
4753
}

style/variables.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
:root {
33
/* Colors */
44
--primary-color: #4a90e2;
5-
--primary-gradient: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
5+
--primary-gradient: linear-gradient(135deg, #cbe5ff 0%, #430000 100%);
66
--background-gradient: linear-gradient(135deg, #1e3c72 0%, #2a5298 100%);
77
--secondary-color: #6c757d;
88
--danger-color: #dc3545;
@@ -68,8 +68,7 @@
6868
:root[data-theme="dark"] {
6969
/* Colors */
7070
--primary-color: #1b2b3b;
71-
--primary-gradient: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
72-
--background-gradient: linear-gradient(135deg, #0f172a 0%, #1e293b 100%);
71+
--primary-gradient: linear-gradient(183deg, #00082f 0%, #230000 100%);
7372
--secondary-color: #64748b;
7473
--danger-color: #ef4444;
7574
--success-color: #22c55e;

0 commit comments

Comments
 (0)