Skip to content

Commit 0a9a5a2

Browse files
authored
Merge pull request #471 from MicroPad/next-dev
v4.7.0
2 parents 1fbef60 + 9e2033b commit 0a9a5a2

6 files changed

Lines changed: 45 additions & 4 deletions

File tree

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "micropad",
3-
"version": "4.6.0",
3+
"version": "4.7.0",
44
"private": true,
55
"scripts": {
66
"preinstall": "python3 ../libs/build-libs.py && ./get_precache_files.py > src/extraPrecacheFiles.ts",

app/src/app/ThemeValues.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,21 @@ export const ThemeValues: { [K in ThemeName]: ITheme } = {
135135
element: elementInstructionsLight
136136
}
137137
},
138+
Grandma: {
139+
background: '#fbcbd4',
140+
accent: '#f8e3fd',
141+
chrome: '#f79cad',
142+
text: '#000000',
143+
links: '#444444',
144+
explorerContent: '#333333',
145+
accentContent: '#333333',
146+
backgroundImage: filledBackground,
147+
instructionImages: {
148+
notepad: instructionImageLight,
149+
note: noteInstructionsLight,
150+
element: elementInstructionsLight
151+
}
152+
},
138153
Purple: {
139154
background: '#ffffff',
140155
accent: '#ffcc00',

app/src/app/assets/Help.npx

Lines changed: 5 additions & 2 deletions
Large diffs are not rendered by default.

app/src/app/root.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import './theme-styles/Wellington.css';
1616
import './theme-styles/Peach.css';
1717
import './theme-styles/Pastel.css';
1818
import './theme-styles/Purple.css';
19+
import './theme-styles/Grandma.css';
1920
/* JS Imports */
2021
import React from 'react';
2122
import 'materialize-css/dist/js/materialize.js';
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.theme-Grandma a {
2+
color: #333;
3+
}
4+
5+
.theme-Grandma .notepad-explorer a {
6+
color: #231e23;
7+
}
8+
9+
#breadcrumb-holder > nav.Grandma {
10+
background-color: #fdc3a4;
11+
}

app/src/app/types/Themes.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
export type ThemeName = 'Classic' | 'Solarized' | 'Gruvbox' | 'Midnight' | 'Void' | 'Peach' | 'Pastel' | 'Wellington' | 'Purple' | 'IanPad';
1+
export type ThemeName =
2+
| 'Classic'
3+
| 'Solarized'
4+
| 'Gruvbox'
5+
| 'Midnight'
6+
| 'Void'
7+
| 'Peach'
8+
| 'Pastel'
9+
| 'Wellington'
10+
| 'Grandma'
11+
| 'Purple'
12+
| 'IanPad';
213

314
export interface ITheme {
415
background: string;

0 commit comments

Comments
 (0)