Skip to content

Commit b40069d

Browse files
authored
Merge pull request #20 from vorlie/mica
Mica
2 parents ba72f55 + cb839d4 commit b40069d

File tree

6 files changed

+85
-60
lines changed

6 files changed

+85
-60
lines changed

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Iota's Notepad
1+
# Iota's Notepad - Mica
22

33
Iota's Notepad is a simple note-taking application built with Electron. It allows you to create, edit, and delete notes with a user-friendly interface.
44

@@ -63,9 +63,13 @@ You can add custom themes to Iota's Notepad by importing a JSON file with the th
6363
{
6464
"customThemeName": {
6565
"--color-bg-dark": "#yourColor",
66+
"--color-bg-dark-alpha": "#yourColorWithAlpha",
6667
"--color-bg-darker": "#yourColor",
68+
"--color-bg-darker-alpha": "#yourColorWithAlpha",
6769
"--color-bg-medium": "#yourColor",
70+
"--color-bg-medium-alpha": "#yourColorWithAlpha",
6871
"--color-bg-light": "#yourColor",
72+
"--color-bg-light-alpha": "#yourColorWithAlpha",
6973
"--color-border": "#yourColor",
7074
"--color-text": "#yourColor",
7175
"--color-placeholder": "#yourColor",

index.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
const { app, BrowserWindow, Tray, Menu, ipcMain, Notification } = require('electron');
1+
const { app, Tray, Menu, ipcMain, Notification } = require('electron');
2+
const { PARAMS, VALUE, MicaBrowserWindow, IS_WINDOWS_11, WIN10 } = require('mica-electron');
23
const path = require('path');
34

45
let mainWindow;
56
let tray = null;
67

78
app.on('ready', () => {
8-
mainWindow = new BrowserWindow({
9+
mainWindow = new MicaBrowserWindow({
910
width: 800,
1011
height: 600,
1112
webPreferences: {
@@ -14,18 +15,22 @@ app.on('ready', () => {
1415
preload: __dirname + '/preload.js',
1516
},
1617
menuBarVisible: false,
18+
frame: false,
1719
titleBarStyle: 'hidden',
1820
...(process.platform !== 'darwin' ? { titleBarOverlay: true } : {})
1921
});
2022

23+
mainWindow.setRoundedCorner();
24+
mainWindow.setMicaAcrylicEffect();
25+
2126
mainWindow.setTitleBarOverlay({
2227
color: 'rgba(0, 0, 0, 0)', // Transparent background
2328
symbolColor: 'rgba(205, 214, 244, 1)', // Symbol color
2429
height: 48
2530
});
2631
mainWindow.setMinimumSize(950, 600);
2732

28-
Menu.setApplicationMenu(null);
33+
//Menu.setApplicationMenu(null);
2934

3035
mainWindow.loadFile('index.html');
3136

package-lock.json

Lines changed: 10 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
},
5858
"dependencies": {
5959
"electron-log": "^5.3.0",
60-
"electron-squirrel-startup": "^1.0.1"
60+
"electron-squirrel-startup": "^1.0.1",
61+
"mica-electron": "^1.5.16"
6162
}
6263
}

src/globals.css

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
:root {
22
/* Default Color Variables (Mocha) */
33
--color-bg-dark: #1e1e2e;
4+
--color-bg-dark-alpha: #1e1e2e70;
45
--color-bg-darker: #11111b;
6+
--color-bg-darker-alpha: #11111b70;
57
--color-bg-medium: #313244;
8+
--color-bg-medium-alpha: #31324470;
69
--color-bg-light: #45475a;
10+
--color-bg-light-alpha: #45475a70;
711
--color-border: #6c7086;
812
--color-text: #cdd6f4;
913
--color-placeholder: #a6adc8;
@@ -23,12 +27,12 @@
2327
--body-height: 100vh;
2428
--body-margin: 0;
2529
--body-font-family: Arial, sans-serif;
26-
--body-background-color: var(--color-bg-dark);
30+
--body-background-color: var(--color-bg-dark-alpha);
2731
--body-color: var(--color-text);
2832

2933
--hover-transition: 0.2s ease;
3034

31-
--titlebar-bg-color: var(--color-bg-medium);
35+
--titlebar-bg-color: var(--color-bg-medium-alpha);
3236
--titlebar-padding: 10px;
3337
--titlebar-color: var(--color-text);
3438
--titlebar-border-bottom: 1px solid var(--color-border);
@@ -42,15 +46,15 @@
4246
--search-bar-margin-bottom: 10px;
4347
--search-bar-border-radius: 8px;
4448
--search-bar-border: 1px solid var(--color-border);
45-
--search-bar-bg-color: var(--color-bg-light);
49+
--search-bar-bg-color: var(--color-bg-light-alpha);
4650
--search-bar-color: var(--color-text);
4751
--search-bar-placeholder-color: var(--color-placeholder);
4852

4953
--dropdown-padding: 2px;
5054
--dropdown-margin-right: 2px;
5155
--dropdown-border-radius: 5px;
5256
--dropdown-border: 1px solid var(--color-border);
53-
--dropdown-bg-color: var(--color-bg-light);
57+
--dropdown-bg-color: var(--color-bg-light-alpha);
5458
--dropdown-color: var(--color-text);
5559
--dropdown-font-size: 14px;
5660

@@ -60,7 +64,8 @@
6064

6165
--sidebar-width: 35%;
6266
--sidebar-max-width: 400px;
63-
--sidebar-bg-color: var(--color-bg-dark);
67+
--sidebar-bg-color: var(--color-bg-dark-alpha);
68+
--sidebar-bg-color-alpha: var(--color-bg-dark-alpha);
6469
--sidebar-border-right: 1px solid var(--color-border);
6570
--sidebar-padding: 10px;
6671
--sidebar-radius: 8px;
@@ -78,8 +83,8 @@
7883
--note-list-item-cursor: pointer;
7984
--note-list-item-position: relative;
8085
--note-list-item-hover-bg-color: var(--color-hover);
81-
--note-list-item-selected-bg-color: var(--color-bg-light);
82-
--note-list-item-background-color: var(--color-bg-medium);
86+
--note-list-item-selected-bg-color: var(--color-bg-light-alpha);
87+
--note-list-item-background-color: var(--color-bg-medium-alpha);
8388

8489
--note-title-font-size: 1em;
8590
--note-title-display: block;
@@ -94,15 +99,15 @@
9499
--note-actions-top: 10px;
95100
--note-actions-button-margin-right: 5px;
96101

97-
--button-bg-color: var(--color-bg-light);
102+
--button-bg-color: var(--color-bg-light-alpha);
98103
--button-bg-color-hover: var(--color-hover-light);
99104
--button-color: var(--color-text);
100105
--button-border-color: var(--color-border);
101106
--button-border-radius: 5px;
102107
--button-padding: 5px;
103108
--button-padding-2: 4.2px;
104109

105-
--editor-bg-color: var(--color-bg-darker);
110+
--editor-bg-color: var(--color-bg-darker-alpha);
106111
--editor-font-family: var(--body-font-family);
107112
--editor-text-color: var(--color-text);
108113
--editor-border: none;
@@ -115,7 +120,7 @@
115120
--scrollbar-thumb-bg-color: var(--color-scrollbar-thumb);
116121
--scrollbar-thumb-hover-bg-color: var(--color-scrollbar-thumb-hover);
117122

118-
--edit-title-input-bg-color: var(--color-bg-light);
123+
--edit-title-input-bg-color: var(--color-bg-light-alpha);
119124
--edit-title-input-color: var(--color-text);
120125
--edit-title-input-border: 1px solid var(--color-border);
121126
--edit-title-input-border-radius: 5px;
@@ -138,7 +143,7 @@
138143
--modal-close-font-weight: bold;
139144
--modal-close-hover-color: var(--color-close-hover);
140145

141-
--modal-export-item-bg-color: var(--color-bg-medium);
146+
--modal-export-item-bg-color: var(--color-bg-medium-alpha);
142147
--modal-export-item-color: var(--color-text);
143148
--modal-export-item-padding: 10px;
144149
--modal-export-item-border-bottom: 1px solid var(--color-border);
@@ -152,7 +157,7 @@
152157
--updater-background-color: var(--color-bg-dark);
153158
--updater-text-color: var(--color-text);
154159
--updater-text-download-color: var(--color-button-download-text);
155-
--updater-button-background-color: var(--color-bg-medium);
160+
--updater-button-background-color: var(--color-bg-medium-alpha);
156161
--updater-button-hover-background-color: var(--color-hover-light);
157162
--updater-button-download-background-color: var(--color-button-download);
158163
--updater-button-download-hover-background-color: var(--color-button-download-hover);
@@ -187,9 +192,13 @@
187192

188193
:root[data-theme='frappe'] {
189194
--color-bg-dark: #303446;
195+
--color-bg-dark-alpha: #30344670;
190196
--color-bg-darker: #232634;
197+
--color-bg-darker-alpha: #23263470;
191198
--color-bg-medium: #292c3c;
199+
--color-bg-medium-alpha: #292c3c70;
192200
--color-bg-light: #414559;
201+
--color-bg-light-alpha: #41455970;
193202
--color-border: #51576d;
194203
--color-text: #c6d0f5;
195204
--color-placeholder: #a5adcb;
@@ -206,9 +215,13 @@
206215

207216
:root[data-theme='macchiato'] {
208217
--color-bg-dark: #24273a;
218+
--color-bg-dark-alpha: #24273a70;
209219
--color-bg-darker: #181926;
220+
--color-bg-darker-alpha: #18192670;
210221
--color-bg-medium: #1e2030;
222+
--color-bg-medium-alpha: #1e203070;
211223
--color-bg-light: #363a4f;
224+
--color-bg-light-alpha: #363a4f70;
212225
--color-border: #494d64;
213226
--color-text: #cad3f5;
214227
--color-placeholder: #a5adcb;
@@ -229,13 +242,13 @@ body {
229242
height: var(--body-height);
230243
margin: var(--body-margin);
231244
font-family: var(--body-font-family);
232-
background-color: var(--body-background-color);
245+
/*background-color: var(--body-background-color);*/
233246
color: var(--body-color);
234247
overflow: hidden;
235248
}
236249

237250
.titlebar {
238-
background-color: var(--titlebar-bg-color);
251+
/*background-color: var(--titlebar-bg-color);*/
239252
border-bottom: var(--sidebar-border-right);
240253
padding: var(--titlebar-padding);
241254
color: var(--titlebar-color);
@@ -281,7 +294,7 @@ body {
281294
.sidebar {
282295
width: var(--sidebar-width);
283296
max-width: var(--sidebar-max-width);
284-
background-color: var(--sidebar-bg-color);
297+
background-color: var(--sidebar-bg-color-alpha);
285298
border-right: var(--sidebar-border-right);
286299
padding: var(--sidebar-padding);
287300
box-sizing: var(--sidebar-box-sizing);
@@ -427,7 +440,7 @@ body {
427440
.editor .status{
428441
margin: 0;
429442
padding: 5px;
430-
background-color: var(--color-bg-dark);
443+
background-color: var(--color-bg-dark-alpha);
431444
color: var(--color-text);
432445
font-size: 14px;
433446
width: fit-content;
@@ -634,7 +647,7 @@ body {
634647
.context-menu {
635648
display: none;
636649
position: absolute;
637-
background-color: var(--color-bg-medium);
650+
background-color: var(--color-bg-medium-alpha);
638651
border: 1px solid var(--color-border);
639652
border-radius: 5px;
640653
z-index: 1000;

0 commit comments

Comments
 (0)