Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "micropad",
"version": "4.6.0",
"version": "4.7.0",
"private": true,
"scripts": {
"preinstall": "python3 ../libs/build-libs.py && ./get_precache_files.py > src/extraPrecacheFiles.ts",
Expand Down
15 changes: 15 additions & 0 deletions app/src/app/ThemeValues.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,21 @@ export const ThemeValues: { [K in ThemeName]: ITheme } = {
element: elementInstructionsLight
}
},
Grandma: {
background: '#fbcbd4',
accent: '#f8e3fd',
chrome: '#f79cad',
text: '#000000',
links: '#444444',
explorerContent: '#333333',
accentContent: '#333333',
backgroundImage: filledBackground,
instructionImages: {
notepad: instructionImageLight,
note: noteInstructionsLight,
element: elementInstructionsLight
}
},
Purple: {
background: '#ffffff',
accent: '#ffcc00',
Expand Down
7 changes: 5 additions & 2 deletions app/src/app/assets/Help.npx

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions app/src/app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import './theme-styles/Wellington.css';
import './theme-styles/Peach.css';
import './theme-styles/Pastel.css';
import './theme-styles/Purple.css';
import './theme-styles/Grandma.css';
/* JS Imports */
import React from 'react';
import 'materialize-css/dist/js/materialize.js';
Expand Down
11 changes: 11 additions & 0 deletions app/src/app/theme-styles/Grandma.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.theme-Grandma a {
color: #333;
}

.theme-Grandma .notepad-explorer a {
color: #231e23;
}

#breadcrumb-holder > nav.Grandma {
background-color: #fdc3a4;
}
13 changes: 12 additions & 1 deletion app/src/app/types/Themes.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
export type ThemeName = 'Classic' | 'Solarized' | 'Gruvbox' | 'Midnight' | 'Void' | 'Peach' | 'Pastel' | 'Wellington' | 'Purple' | 'IanPad';
export type ThemeName =
| 'Classic'
| 'Solarized'
| 'Gruvbox'
| 'Midnight'
| 'Void'
| 'Peach'
| 'Pastel'
| 'Wellington'
| 'Grandma'
| 'Purple'
| 'IanPad';

export interface ITheme {
background: string;
Expand Down
Loading