Skip to content

Commit 195b1b5

Browse files
committed
build: add octicons to core for git extension
1 parent 2876834 commit 195b1b5

File tree

9 files changed

+213
-432
lines changed

9 files changed

+213
-432
lines changed

src/extensions/default/Git/main.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ define(function (require, exports, module) {
3232

3333
// Load CSS
3434
ExtensionUtils.loadStyleSheet(module, "styles/brackets-git.less");
35-
ExtensionUtils.loadStyleSheet(module, "styles/fonts/octicon.less");
3635

3736
AppInit.appReady(function () {
3837
Main.init().then((enabled)=>{

src/extensions/default/Git/src/Branch.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ define(function (require, exports) {
458458
var MAX_LEN = 18;
459459

460460
const tooltip = StringUtils.format(Strings.ON_BRANCH, branchName);
461-
const html = `<i class='octicon octicon-git-branch'></i> ${
461+
const html = `<i class="fas fa-code-branch"></i> ${
462462
branchName.length > MAX_LEN ? branchName.substring(0, MAX_LEN) + "\u2026" : branchName
463463
}`;
464464
$gitBranchName
@@ -491,7 +491,7 @@ define(function (require, exports) {
491491
// Add branch name to project tree
492492
const $html = $(`<div id='git-branch-dropdown-toggle' class='btn-alt-quiet'>
493493
<span id='git-branch'>
494-
<i class='octicon octicon-git-branch'></i>
494+
<i class="fas fa-code-branch"></i>
495495
</span>
496496
<span class="dropdown-arrow"></span>
497497
</div>`);

src/extensions/default/Git/styles/brackets-git.less

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
/* adjust margins to keep position #project-title position stable after extension is loaded */
5252
overflow: hidden;
5353
white-space: nowrap;
54-
padding: 1px 5px;
54+
padding: 2px 5px;
5555
margin-left: -5px;
5656
.dropdown-arrow {
5757
display: inline-block;
@@ -68,9 +68,8 @@
6868
overflow: hidden;
6969
text-overflow: ellipsis;
7070
flex: 1 1 0;
71-
.octicon {
72-
line-height: unset;
73-
font-size: small;
71+
.fas {
72+
font-size: 10px;
7473
}
7574
}
7675

Binary file not shown.

src/extensions/default/Git/styles/fonts/octicons-regular-webfont.svg

Lines changed: 0 additions & 215 deletions
This file was deleted.
Binary file not shown.

src/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,7 @@
712712
<link rel="stylesheet" type="text/css" href="thirdparty/fontawesome/css/all.min.css">
713713
<link rel="stylesheet" type="text/css" href="thirdparty/devicon/devicon.min.css">
714714
<link rel="stylesheet" type="text/css" href="thirdparty/file-icons/ffont.css">
715+
<link rel="stylesheet" type="text/css" href="thirdparty/octicon/octicon-woff-only.css">
715716
<link rel="stylesheet/less" type="text/css" href="styles/brackets.less"> <!--will be replaced in prod/staging with brackets-all.css by release:staging and prod command-->
716717

717718
<!-- Pre-load third party scripts that cannot be async loaded. Defer loading of all below scripts

0 commit comments

Comments
 (0)