mirror of
				https://github.com/TriliumNext/Notes.git
				synced 2025-10-31 21:11:30 +08:00 
			
		
		
		
	Merge remote-tracking branch 'origin/stable'
# Conflicts: # src/public/javascripts/desktop.js # src/public/stylesheets/style.css # src/views/details/image.ejs # src/views/details/relation_map.ejs
This commit is contained in:
		
						commit
						53f5df4e88
					
				| @ -64,4 +64,12 @@ | |||||||
|     border-radius: 10px; |     border-radius: 10px; | ||||||
|     padding: 5px; |     padding: 5px; | ||||||
|     margin-top: 5px; |     margin-top: 5px; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | .note-detail-image { | ||||||
|  |     text-align: center; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | .note-detail-image-view { | ||||||
|  |     max-width: 100%; | ||||||
| } | } | ||||||
| @ -4,4 +4,8 @@ | |||||||
|     { |     { | ||||||
|         display: none !important; |         display: none !important; | ||||||
|     } |     } | ||||||
|  | 
 | ||||||
|  |     .relation-map-wrapper { | ||||||
|  |         height: 100vh !important; | ||||||
|  |     } | ||||||
| } | } | ||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 zadam
						zadam