mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 02:16:05 +01:00 
			
		
		
		
	fixes after merge
This commit is contained in:
		| @@ -45,7 +45,7 @@ class NoteShort { | |||||||
|         /** @param {int} */ |         /** @param {int} */ | ||||||
|         this.contentLength = row.contentLength; |         this.contentLength = row.contentLength; | ||||||
|         /** @param {boolean} */ |         /** @param {boolean} */ | ||||||
|         this.isProtected = row.isProtected; |         this.isProtected = !!row.isProtected; | ||||||
|         /** @param {string} one of 'text', 'code', 'file' or 'render' */ |         /** @param {string} one of 'text', 'code', 'file' or 'render' */ | ||||||
|         this.type = row.type; |         this.type = row.type; | ||||||
|         /** @param {string} content-type, e.g. "application/json" */ |         /** @param {string} content-type, e.g. "application/json" */ | ||||||
|   | |||||||
| @@ -214,6 +214,7 @@ export default class NoteDetailWidget extends TabAwareWidget { | |||||||
|                 "libraries/ckeditor/ckeditor-content.css", |                 "libraries/ckeditor/ckeditor-content.css", | ||||||
|                 "libraries/bootstrap/css/bootstrap.min.css", |                 "libraries/bootstrap/css/bootstrap.min.css", | ||||||
|                 "stylesheets/print.css", |                 "stylesheets/print.css", | ||||||
|  |                 "stylesheets/relation_map.css", | ||||||
|                 "stylesheets/themes.css", |                 "stylesheets/themes.css", | ||||||
|                 "stylesheets/detail.css" |                 "stylesheets/detail.css" | ||||||
|             ], |             ], | ||||||
|   | |||||||
| @@ -5,25 +5,6 @@ import TypeWidget from "./type_widget.js"; | |||||||
|  |  | ||||||
| const TPL = ` | const TPL = ` | ||||||
| <div class="note-detail-file note-detail-printable"> | <div class="note-detail-file note-detail-printable"> | ||||||
|     <style> |  | ||||||
|     .note-detail-file { |  | ||||||
|         padding: 10px; |  | ||||||
|     } |  | ||||||
|      |  | ||||||
|     .file-table th, .file-table td { |  | ||||||
|         padding: 10px; |  | ||||||
|         font-size: larger; |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     .file-preview-content { |  | ||||||
|         background-color: var(--accented-background-color); |  | ||||||
|         padding: 15px; |  | ||||||
|         max-height: 300px; |  | ||||||
|         overflow: auto; |  | ||||||
|         margin: 10px; |  | ||||||
|     } |  | ||||||
|     </style> |  | ||||||
|  |  | ||||||
|     <table class="file-table"> |     <table class="file-table"> | ||||||
|         <tr> |         <tr> | ||||||
|             <th nowrap>Note ID:</th> |             <th nowrap>Note ID:</th> | ||||||
|   | |||||||
| @@ -5,17 +5,7 @@ import TypeWidget from "./type_widget.js"; | |||||||
|  |  | ||||||
| const TPL = ` | const TPL = ` | ||||||
| <div class="note-detail-image note-detail-printable"> | <div class="note-detail-image note-detail-printable"> | ||||||
|     <style> |     <div class="no-print" style="display: flex; justify-content: space-evenly; margin: 10px;"> | ||||||
|     .note-detail-image { |  | ||||||
|         text-align: center; |  | ||||||
|     } |  | ||||||
|      |  | ||||||
|     .note-detail-image-view { |  | ||||||
|         max-width: 100%; |  | ||||||
|     } |  | ||||||
|     </style> |  | ||||||
|  |  | ||||||
|     <div style="display: flex; justify-content: space-evenly; margin: 10px;"> |  | ||||||
|         <button class="image-download btn btn-sm btn-primary" type="button">Download</button> |         <button class="image-download btn btn-sm btn-primary" type="button">Download</button> | ||||||
|  |  | ||||||
|         <button class="image-copy-to-clipboard btn btn-sm btn-primary" type="button">Copy to clipboard</button> |         <button class="image-copy-to-clipboard btn btn-sm btn-primary" type="button">Copy to clipboard</button> | ||||||
|   | |||||||
| @@ -64,7 +64,7 @@ const linkOverlays = [ | |||||||
|  |  | ||||||
| const TPL = ` | const TPL = ` | ||||||
| <div class="note-detail-relation-map note-detail-printable"> | <div class="note-detail-relation-map note-detail-printable"> | ||||||
|     <button class="relation-map-create-child-note btn btn-sm floating-button" type="button" |     <button class="relation-map-create-child-note btn btn-sm floating-button no-print" type="button" | ||||||
|             title="Create new child note and add it into this relation map"> |             title="Create new child note and add it into this relation map"> | ||||||
|         <span class="bx bx-folder-plus"></span> |         <span class="bx bx-folder-plus"></span> | ||||||
|  |  | ||||||
| @@ -72,11 +72,11 @@ const TPL = ` | |||||||
|     </button> |     </button> | ||||||
|  |  | ||||||
|     <button type="button" |     <button type="button" | ||||||
|             class="relation-map-reset-pan-zoom btn icon-button floating-button bx bx-crop" |             class="relation-map-reset-pan-zoom btn icon-button floating-button bx bx-crop no-print" | ||||||
|             title="Reset pan & zoom to initial coordinates and magnification" |             title="Reset pan & zoom to initial coordinates and magnification" | ||||||
|             style="right: 70px;"></button> |             style="right: 70px;"></button> | ||||||
|  |  | ||||||
|     <div class="btn-group floating-button" style="right: 10px;"> |     <div class="btn-group floating-button no-print" style="right: 10px;"> | ||||||
|         <button type="button" |         <button type="button" | ||||||
|                 class="relation-map-zoom-in btn icon-button bx bx-zoom-in" |                 class="relation-map-zoom-in btn icon-button bx bx-zoom-in" | ||||||
|                 title="Zoom In"></button> |                 title="Zoom In"></button> | ||||||
|   | |||||||
| @@ -73,3 +73,20 @@ | |||||||
| .note-detail-image-view { | .note-detail-image-view { | ||||||
|     max-width: 100%; |     max-width: 100%; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | .note-detail-file { | ||||||
|  |     padding: 10px; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .file-table th, .file-table td { | ||||||
|  |     padding: 10px; | ||||||
|  |     font-size: larger; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .file-preview-content { | ||||||
|  |     background-color: var(--accented-background-color); | ||||||
|  |     padding: 15px; | ||||||
|  |     max-height: 300px; | ||||||
|  |     overflow: auto; | ||||||
|  |     margin: 10px; | ||||||
|  | } | ||||||
| @@ -2,6 +2,7 @@ | |||||||
|     height: 100%; |     height: 100%; | ||||||
|     overflow: hidden !important; |     overflow: hidden !important; | ||||||
|     padding-top: 10px; |     padding-top: 10px; | ||||||
|  |     position: relative; | ||||||
| } | } | ||||||
|  |  | ||||||
| .relation-map-wrapper { | .relation-map-wrapper { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user