Skip to content

Commit

Permalink
Merge pull request #45 from cmgriffing/feat/font-settings
Browse files Browse the repository at this point in the history
Add Font settings
  • Loading branch information
cmgriffing authored Oct 27, 2024
2 parents bd298f9 + 1c89ef2 commit a39f337
Show file tree
Hide file tree
Showing 12 changed files with 399 additions and 7 deletions.
6 changes: 5 additions & 1 deletion packages/shiki-magic-move/src/style.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.shiki-magic-move-container {
position: relative;
white-space: pre;
font-family: inherit !important;
font-size: inherit !important;
}

.shiki-magic-move-line-number {
Expand All @@ -11,6 +13,8 @@
.shiki-magic-move-item {
display: inline-block;
transition: color var(--smm-duration, 0.5s) var(--smm-easing, 'ease');
font-family: inherit !important;
font-size: inherit !important;
}

.shiki-magic-move-move {
Expand Down Expand Up @@ -49,4 +53,4 @@

br.shiki-magic-move-leave-active {
display: none;
}
}
2 changes: 2 additions & 0 deletions playgrounds/app/migrations/0003_futuristic_wiccan.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE `snippets_table` ADD `fontSize` integer DEFAULT 16 NOT NULL;--> statement-breakpoint
ALTER TABLE `snippets_table` ADD `fontFamily` text DEFAULT 'Fira Code' NOT NULL;
287 changes: 287 additions & 0 deletions playgrounds/app/migrations/meta/0003_snapshot.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,287 @@
{
"version": "6",
"dialect": "sqlite",
"id": "55589ffe-ec55-466e-9854-e59f5c5810b1",
"prevId": "a9edb9c1-c4eb-4710-9ca9-48355da04fac",
"tables": {
"snippets_table": {
"name": "snippets_table",
"columns": {
"id": {
"name": "id",
"type": "text",
"primaryKey": true,
"notNull": true,
"autoincrement": false
},
"userId": {
"name": "userId",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"title": {
"name": "title",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"codeLeft": {
"name": "codeLeft",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"codeRight": {
"name": "codeRight",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"createdAt": {
"name": "createdAt",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": 0
},
"updatedAt": {
"name": "updatedAt",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": 0
},
"snippetWidth": {
"name": "snippetWidth",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": 450
},
"yPadding": {
"name": "yPadding",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": 42
},
"xPadding": {
"name": "xPadding",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": 42
},
"shadowEnabled": {
"name": "shadowEnabled",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": true
},
"shadowOffsetY": {
"name": "shadowOffsetY",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": 10
},
"shadowBlur": {
"name": "shadowBlur",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": 10
},
"shadowColor": {
"name": "shadowColor",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "'#000000'"
},
"shadowOpacity": {
"name": "shadowOpacity",
"type": "real",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": 0.6
},
"bgColor": {
"name": "bgColor",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "'#ffffff'"
},
"language": {
"name": "language",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "'tsx'"
},
"theme": {
"name": "theme",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "'nord'"
},
"fontSize": {
"name": "fontSize",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": 16
},
"fontFamily": {
"name": "fontFamily",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "'Fira Code'"
}
},
"indexes": {},
"foreignKeys": {
"snippets_table_userId_users_table_id_fk": {
"name": "snippets_table_userId_users_table_id_fk",
"tableFrom": "snippets_table",
"tableTo": "users_table",
"columnsFrom": [
"userId"
],
"columnsTo": [
"id"
],
"onDelete": "no action",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"checkConstraints": {}
},
"users_table": {
"name": "users_table",
"columns": {
"id": {
"name": "id",
"type": "text",
"primaryKey": true,
"notNull": true,
"autoincrement": false
},
"email": {
"name": "email",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"githubId": {
"name": "githubId",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"githubUsername": {
"name": "githubUsername",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"githubAvatarUrl": {
"name": "githubAvatarUrl",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"createdAt": {
"name": "createdAt",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": 0
},
"updatedAt": {
"name": "updatedAt",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": 0
}
},
"indexes": {
"users_table_email_unique": {
"name": "users_table_email_unique",
"columns": [
"email"
],
"isUnique": true
},
"users_table_githubId_unique": {
"name": "users_table_githubId_unique",
"columns": [
"githubId"
],
"isUnique": true
},
"users_table_githubUsername_unique": {
"name": "users_table_githubUsername_unique",
"columns": [
"githubUsername"
],
"isUnique": true
},
"users_table_githubAvatarUrl_unique": {
"name": "users_table_githubAvatarUrl_unique",
"columns": [
"githubAvatarUrl"
],
"isUnique": true
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"checkConstraints": {}
}
},
"views": {},
"enums": {},
"_meta": {
"schemas": {},
"tables": {},
"columns": {}
},
"internal": {
"indexes": {}
}
}
7 changes: 7 additions & 0 deletions playgrounds/app/migrations/meta/_journal.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@
"when": 1729650906143,
"tag": "0002_dizzy_timeslip",
"breakpoints": true
},
{
"idx": 3,
"version": "6",
"when": 1730069290357,
"tag": "0003_futuristic_wiccan",
"breakpoints": true
}
]
}
Loading

0 comments on commit a39f337

Please sign in to comment.