mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 11:41:32 +01:00 
			
		
		
		
	Merge branch 'main' into feat-32257-add-comments-unchanged-lines-and-show
This commit is contained in:
		
						commit
						65ef1740b0
					
				| @ -51,7 +51,7 @@ function getIconForDiffType(pType) { | |||||||
|   <div v-else class="item-directory" :title="item.name" @click.stop="collapsed = !collapsed"> |   <div v-else class="item-directory" :title="item.name" @click.stop="collapsed = !collapsed"> | ||||||
|     <!-- directory --> |     <!-- directory --> | ||||||
|     <SvgIcon :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'"/> |     <SvgIcon :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'"/> | ||||||
|     <SvgIcon class="text primary" name="octicon-file-directory-fill"/> |     <SvgIcon class="text primary" :name="collapsed ? 'octicon-file-directory-fill' : 'octicon-file-directory-open-fill'"/> | ||||||
|     <span class="gt-ellipsis">{{ item.name }}</span> |     <span class="gt-ellipsis">{{ item.name }}</span> | ||||||
|   </div> |   </div> | ||||||
| 
 | 
 | ||||||
| @ -87,12 +87,16 @@ a, a:hover { | |||||||
|   color: var(--color-text-light-3); |   color: var(--color-text-light-3); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | .item-directory { | ||||||
|  |   user-select: none; | ||||||
|  | } | ||||||
|  | 
 | ||||||
| .item-file, | .item-file, | ||||||
| .item-directory { | .item-directory { | ||||||
|   display: flex; |   display: flex; | ||||||
|   align-items: center; |   align-items: center; | ||||||
|   gap: 0.25em; |   gap: 0.25em; | ||||||
|   padding: 3px 6px; |   padding: 6px; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .item-file:hover, | .item-file:hover, | ||||||
|  | |||||||
| @ -27,6 +27,7 @@ import octiconDownload from '../../public/assets/img/svg/octicon-download.svg'; | |||||||
| import octiconEye from '../../public/assets/img/svg/octicon-eye.svg'; | import octiconEye from '../../public/assets/img/svg/octicon-eye.svg'; | ||||||
| import octiconFile from '../../public/assets/img/svg/octicon-file.svg'; | import octiconFile from '../../public/assets/img/svg/octicon-file.svg'; | ||||||
| import octiconFileDirectoryFill from '../../public/assets/img/svg/octicon-file-directory-fill.svg'; | import octiconFileDirectoryFill from '../../public/assets/img/svg/octicon-file-directory-fill.svg'; | ||||||
|  | import octiconFileDirectoryOpenFill from '../../public/assets/img/svg/octicon-file-directory-open-fill.svg'; | ||||||
| import octiconFilter from '../../public/assets/img/svg/octicon-filter.svg'; | import octiconFilter from '../../public/assets/img/svg/octicon-filter.svg'; | ||||||
| import octiconGear from '../../public/assets/img/svg/octicon-gear.svg'; | import octiconGear from '../../public/assets/img/svg/octicon-gear.svg'; | ||||||
| import octiconGitBranch from '../../public/assets/img/svg/octicon-git-branch.svg'; | import octiconGitBranch from '../../public/assets/img/svg/octicon-git-branch.svg'; | ||||||
| @ -101,6 +102,7 @@ const svgs = { | |||||||
|   'octicon-eye': octiconEye, |   'octicon-eye': octiconEye, | ||||||
|   'octicon-file': octiconFile, |   'octicon-file': octiconFile, | ||||||
|   'octicon-file-directory-fill': octiconFileDirectoryFill, |   'octicon-file-directory-fill': octiconFileDirectoryFill, | ||||||
|  |   'octicon-file-directory-open-fill': octiconFileDirectoryOpenFill, | ||||||
|   'octicon-filter': octiconFilter, |   'octicon-filter': octiconFilter, | ||||||
|   'octicon-gear': octiconGear, |   'octicon-gear': octiconGear, | ||||||
|   'octicon-git-branch': octiconGitBranch, |   'octicon-git-branch': octiconGitBranch, | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user