mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 10:26:08 +01:00 
			
		
		
		
	font family for popup, different clip types for notes and whole pages
This commit is contained in:
		
							
								
								
									
										10
									
								
								.idea/inspectionProfiles/Project_Default.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								.idea/inspectionProfiles/Project_Default.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,10 @@ | |||||||
|  | <component name="InspectionProjectProfileManager"> | ||||||
|  |   <profile version="1.0"> | ||||||
|  |     <option name="myName" value="Project Default" /> | ||||||
|  |     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false"> | ||||||
|  |       <option name="processCode" value="true" /> | ||||||
|  |       <option name="processLiterals" value="true" /> | ||||||
|  |       <option name="processComments" value="true" /> | ||||||
|  |     </inspection_tool> | ||||||
|  |   </profile> | ||||||
|  | </component> | ||||||
							
								
								
									
										3
									
								
								.idea/misc.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										3
									
								
								.idea/misc.xml
									
									
									
										generated
									
									
									
								
							| @@ -1,5 +1,8 @@ | |||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
| <project version="4"> | <project version="4"> | ||||||
|  |   <component name="JavaScriptSettings"> | ||||||
|  |     <option name="languageLevel" value="ES6" /> | ||||||
|  |   </component> | ||||||
|   <component name="ProjectRootManager"> |   <component name="ProjectRootManager"> | ||||||
|     <output url="file://$PROJECT_DIR$/out" /> |     <output url="file://$PROJECT_DIR$/out" /> | ||||||
|   </component> |   </component> | ||||||
|   | |||||||
							
								
								
									
										24
									
								
								.idea/workspace.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										24
									
								
								.idea/workspace.xml
									
									
									
										generated
									
									
									
								
							| @@ -2,9 +2,11 @@ | |||||||
| <project version="4"> | <project version="4"> | ||||||
|   <component name="ChangeListManager"> |   <component name="ChangeListManager"> | ||||||
|     <list default="true" id="735e41bc-d058-4745-9f22-50aeb04ec2d7" name="Default Changelist" comment=""> |     <list default="true" id="735e41bc-d058-4745-9f22-50aeb04ec2d7" name="Default Changelist" comment=""> | ||||||
|       <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" /> |       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> | ||||||
|       <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" /> |  | ||||||
|       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | ||||||
|  |       <change beforePath="$PROJECT_DIR$/background.js" beforeDir="false" afterPath="$PROJECT_DIR$/background.js" afterDir="false" /> | ||||||
|  |       <change beforePath="$PROJECT_DIR$/content.js" beforeDir="false" afterPath="$PROJECT_DIR$/content.js" afterDir="false" /> | ||||||
|  |       <change beforePath="$PROJECT_DIR$/popup/popup.css" beforeDir="false" afterPath="$PROJECT_DIR$/popup/popup.css" afterDir="false" /> | ||||||
|     </list> |     </list> | ||||||
|     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | ||||||
|     <option name="SHOW_DIALOG" value="false" /> |     <option name="SHOW_DIALOG" value="false" /> | ||||||
| @@ -15,6 +17,12 @@ | |||||||
|   <component name="Git.Settings"> |   <component name="Git.Settings"> | ||||||
|     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> | ||||||
|   </component> |   </component> | ||||||
|  |   <component name="JsFlowSettings"> | ||||||
|  |     <service-enabled>true</service-enabled> | ||||||
|  |     <exe-path /> | ||||||
|  |     <other-services-enabled>true</other-services-enabled> | ||||||
|  |     <auto-save>true</auto-save> | ||||||
|  |   </component> | ||||||
|   <component name="ProjectId" id="1OF6mJDrJJ99biD9ZeM2EJmkKPy" /> |   <component name="ProjectId" id="1OF6mJDrJJ99biD9ZeM2EJmkKPy" /> | ||||||
|   <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> |   <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> | ||||||
|   <component name="PropertiesComponent"> |   <component name="PropertiesComponent"> | ||||||
| @@ -23,6 +31,7 @@ | |||||||
|     <property name="aspect.path.notification.shown" value="true" /> |     <property name="aspect.path.notification.shown" value="true" /> | ||||||
|     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> |     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> | ||||||
|     <property name="nodejs_npm_path_reset_for_default_project" value="true" /> |     <property name="nodejs_npm_path_reset_for_default_project" value="true" /> | ||||||
|  |     <property name="settings.editor.selected.configurable" value="Errors" /> | ||||||
|   </component> |   </component> | ||||||
|   <component name="RunDashboard"> |   <component name="RunDashboard"> | ||||||
|     <option name="ruleStates"> |     <option name="ruleStates"> | ||||||
| @@ -46,7 +55,7 @@ | |||||||
|       <option name="number" value="Default" /> |       <option name="number" value="Default" /> | ||||||
|       <option name="presentableId" value="Default" /> |       <option name="presentableId" value="Default" /> | ||||||
|       <updated>1563561154310</updated> |       <updated>1563561154310</updated> | ||||||
|       <workItem from="1563561158232" duration="469000" /> |       <workItem from="1563561158232" duration="1538000" /> | ||||||
|     </task> |     </task> | ||||||
|     <task id="LOCAL-00001" summary="gitignore"> |     <task id="LOCAL-00001" summary="gitignore"> | ||||||
|       <created>1563561565148</created> |       <created>1563561565148</created> | ||||||
| @@ -55,7 +64,14 @@ | |||||||
|       <option name="project" value="LOCAL" /> |       <option name="project" value="LOCAL" /> | ||||||
|       <updated>1563561565148</updated> |       <updated>1563561565148</updated> | ||||||
|     </task> |     </task> | ||||||
|     <option name="localTasksCounter" value="2" /> |     <task id="LOCAL-00002" summary="gitignore"> | ||||||
|  |       <created>1563561631038</created> | ||||||
|  |       <option name="number" value="00002" /> | ||||||
|  |       <option name="presentableId" value="LOCAL-00002" /> | ||||||
|  |       <option name="project" value="LOCAL" /> | ||||||
|  |       <updated>1563561631038</updated> | ||||||
|  |     </task> | ||||||
|  |     <option name="localTasksCounter" value="3" /> | ||||||
|     <servers /> |     <servers /> | ||||||
|   </component> |   </component> | ||||||
|   <component name="TypeScriptGeneratedFilesManager"> |   <component name="TypeScriptGeneratedFilesManager"> | ||||||
|   | |||||||
| @@ -216,7 +216,8 @@ async function saveWholePage() { | |||||||
| async function saveNote(title, content) { | async function saveNote(title, content) { | ||||||
| 	const resp = await triliumServerFacade.callService('POST', 'notes', { | 	const resp = await triliumServerFacade.callService('POST', 'notes', { | ||||||
| 		title: title, | 		title: title, | ||||||
| 		content: content | 		content: content, | ||||||
|  | 		clipType: 'note' | ||||||
| 	}); | 	}); | ||||||
|  |  | ||||||
| 	if (!resp) { | 	if (!resp) { | ||||||
|   | |||||||
| @@ -278,7 +278,8 @@ async function prepareMessageResponse(message) { | |||||||
| 			title: title, | 			title: title, | ||||||
| 			content: body.innerHTML, | 			content: body.innerHTML, | ||||||
| 			images: images, | 			images: images, | ||||||
| 			pageUrl: getPageLocationOrigin() + location.pathname + location.search | 			pageUrl: getPageLocationOrigin() + location.pathname + location.search, | ||||||
|  | 			clipType: 'page' | ||||||
| 		}; | 		}; | ||||||
| 	} | 	} | ||||||
| 	else { | 	else { | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| { | { | ||||||
|   "manifest_version": 2, |   "manifest_version": 2, | ||||||
|   "name": "Trilium Web Clipper (dev)", |   "name": "Trilium Web Clipper (dev)", | ||||||
|   "version": "0.1.5", |   "version": "0.1.0-beta", | ||||||
|   "description": "Save web clippings to Trilium Notes.", |   "description": "Save web clippings to Trilium Notes.", | ||||||
|   "homepage_url": "https://github.com/zadam/trilium-web-clipper", |   "homepage_url": "https://github.com/zadam/trilium-web-clipper", | ||||||
|   "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'", |   "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'", | ||||||
|   | |||||||
| @@ -1,6 +1,7 @@ | |||||||
| html, body { | html, body { | ||||||
|   width: 300px; |   width: 300px; | ||||||
|   font-size: 12px; |   font-size: 12px; | ||||||
|  |   font-family: sans-serif; | ||||||
| } | } | ||||||
|  |  | ||||||
| .button { | .button { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user