Skip to content

Commit 9799159

Browse files
authored
Remove all direct references to font-awesome (#24448)
- Related #10410 - I had to add an SVG for an empty checkbox primer/octicons#942 # Before ![image](https://user-images.githubusercontent.com/20454870/235374683-13f355c3-1245-40db-adda-4c710fc80288.png) # After ![image](https://user-images.githubusercontent.com/20454870/235374655-cc637132-f314-424d-9243-13d45b8915d5.png) --------- Signed-off-by: Yarden Shoham <[email protected]>
1 parent 6981885 commit 9799159

File tree

4 files changed

+24
-17
lines changed

4 files changed

+24
-17
lines changed

public/img/svg/gitea-empty-checkbox.svg

Lines changed: 1 addition & 0 deletions
Loading

web_src/js/features/comp/ComboMarkdownEditor.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {handleGlobalEnterQuickSubmit} from './QuickSubmit.js';
88
import {emojiString} from '../emoji.js';
99
import {renderPreviewPanelContent} from '../repo-editor.js';
1010
import {matchEmoji, matchMention} from '../../utils/match.js';
11+
import {svg} from '../../svg.js';
1112

1213
let elementIdCounter = 0;
1314

@@ -218,7 +219,7 @@ class ComboMarkdownEditor {
218219
cm.replaceSelection(`\n- [ ] ${cm.getSelection()}`);
219220
cm.focus();
220221
},
221-
className: 'fa fa-square-o',
222+
icon: svg('gitea-empty-checkbox'),
222223
title: 'Add Checkbox (empty)',
223224
},
224225
'gitea-checkbox-checked': {
@@ -227,15 +228,15 @@ class ComboMarkdownEditor {
227228
cm.replaceSelection(`\n- [x] ${cm.getSelection()}`);
228229
cm.focus();
229230
},
230-
className: 'fa fa-check-square-o',
231+
icon: svg('octicon-checkbox'),
231232
title: 'Add Checkbox (checked)',
232233
},
233234
'gitea-switch-to-textarea': {
234235
action: () => {
235236
this.userPreferredEditor = 'textarea';
236237
this.switchToTextarea();
237238
},
238-
className: 'fa fa-file',
239+
icon: svg('octicon-file'),
239240
title: 'Revert to simple textarea',
240241
},
241242
'gitea-code-inline': {
@@ -249,7 +250,7 @@ class ComboMarkdownEditor {
249250
}
250251
cm.focus();
251252
},
252-
className: 'fa fa-angle-right',
253+
icon: svg('octicon-chevron-right'),
253254
title: 'Add Inline Code',
254255
}
255256
};

web_src/js/svg.js

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,30 @@ import octiconOrganization from '../../public/img/svg/octicon-organization.svg';
4444
import octiconTag from '../../public/img/svg/octicon-tag.svg';
4545
import octiconGitBranch from '../../public/img/svg/octicon-git-branch.svg';
4646
import octiconRss from '../../public/img/svg/octicon-rss.svg';
47+
import octiconCheckbox from '../../public/img/svg/octicon-checkbox.svg';
48+
import giteaEmptyCheckbox from '../../public/img/svg/gitea-empty-checkbox.svg';
4749

4850
const svgs = {
51+
'octicon-archive': octiconArchive,
4952
'octicon-blocked': octiconBlocked,
53+
'octicon-checkbox': octiconCheckbox,
5054
'octicon-check-circle-fill': octiconCheckCircleFill,
5155
'octicon-chevron-down': octiconChevronDown,
56+
'octicon-chevron-left': octiconChevronLeft,
5257
'octicon-chevron-right': octiconChevronRight,
5358
'octicon-clock': octiconClock,
5459
'octicon-copy': octiconCopy,
5560
'octicon-diff-added': octiconDiffAdded,
5661
'octicon-diff-modified': octiconDiffModified,
5762
'octicon-diff-removed': octiconDiffRemoved,
5863
'octicon-diff-renamed': octiconDiffRenamed,
64+
'gitea-double-chevron-left': giteaDoubleChevronLeft,
65+
'gitea-double-chevron-right': giteaDoubleChevronRight,
66+
'gitea-empty-checkbox': giteaEmptyCheckbox,
5967
'octicon-file': octiconFile,
6068
'octicon-file-directory-fill': octiconFileDirectoryFill,
69+
'octicon-filter': octiconFilter,
70+
'octicon-git-branch': octiconGitBranch,
6171
'octicon-git-merge': octiconGitMerge,
6272
'octicon-git-pull-request': octiconGitPullRequest,
6373
'octicon-issue-closed': octiconIssueClosed,
@@ -68,29 +78,23 @@ const svgs = {
6878
'octicon-meter': octiconMeter,
6979
'octicon-milestone': octiconMilestone,
7080
'octicon-mirror': octiconMirror,
81+
'octicon-organization': octiconOrganization,
82+
'octicon-plus': octiconPlus,
7183
'octicon-project': octiconProject,
7284
'octicon-repo': octiconRepo,
7385
'octicon-repo-forked': octiconRepoForked,
7486
'octicon-repo-template': octiconRepoTemplate,
87+
'octicon-rss': octiconRss,
88+
'octicon-search': octiconSearch,
7589
'octicon-sidebar-collapse': octiconSidebarCollapse,
7690
'octicon-sidebar-expand': octiconSidebarExpand,
7791
'octicon-skip': octiconSkip,
92+
'octicon-star': octiconStar,
7893
'octicon-sync': octiconSync,
94+
'octicon-tag': octiconTag,
7995
'octicon-triangle-down': octiconTriangleDown,
8096
'octicon-x': octiconX,
81-
'octicon-x-circle-fill': octiconXCircleFill,
82-
'octicon-filter': octiconFilter,
83-
'octicon-plus': octiconPlus,
84-
'octicon-search': octiconSearch,
85-
'octicon-archive': octiconArchive,
86-
'octicon-star': octiconStar,
87-
'gitea-double-chevron-left': giteaDoubleChevronLeft,
88-
'gitea-double-chevron-right': giteaDoubleChevronRight,
89-
'octicon-chevron-left': octiconChevronLeft,
90-
'octicon-organization': octiconOrganization,
91-
'octicon-tag': octiconTag,
92-
'octicon-git-branch': octiconGitBranch,
93-
'octicon-rss': octiconRss,
97+
'octicon-x-circle-fill': octiconXCircleFill
9498
};
9599

96100
// TODO: use a more general approach to access SVG icons.

web_src/svg/gitea-empty-checkbox.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)