Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/cm/lsp/codeActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ const CODE_ACTION_ICONS: Record<string, string> = {
};

function getCodeActionIcon(kind?: CodeActionKind): string {
if (!kind) return "licons zap";
if (!kind) return "icon zap";
for (const [prefix, icon] of Object.entries(CODE_ACTION_ICONS)) {
if (kind.startsWith(prefix)) return icon;
}
return "licons zap";
return "icon zap";
}

function formatCodeActionKind(kind?: CodeActionKind): string {
Expand Down
2 changes: 1 addition & 1 deletion src/components/lspInfoDialog/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ function showLspInfoDialog() {
const $dialog = (
<div className="prompt lsp-info-dialog">
<div className="title">
<span className="licons zap" style={{ marginRight: "8px" }} />
<span className="icon zap" style={{ marginRight: "8px" }} />
Language Servers
</div>
<div className="lsp-dialog-body" />
Expand Down
11 changes: 0 additions & 11 deletions src/components/settingsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ function normalizeSettings(settings) {
return false;
}

ensureSettingInfo(setting);
return true;
});

Expand All @@ -263,16 +262,6 @@ function normalizeSettings(settings) {
};
}

function ensureSettingInfo(setting) {
if (setting.info) return;

Object.defineProperty(setting, "info", {
get() {
return strings[`info-${this.key.toLocaleLowerCase()}`];
},
});
}

function shouldEnableSearch(type, settingsCount) {
return type === "united" || (type === "separate" && settingsCount > 5);
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/terminal/terminalManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ class TerminalManager {
const terminalFile = new EditorFile(terminalName, {
type: "terminal",
content: terminalContainer,
tabIcon: "licons terminal",
tabIcon: "icon square-terminal",
pinned,
render: shouldRender,
});
Expand Down
11 changes: 10 additions & 1 deletion src/components/tile/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ header {
font-size: 0.8em;
z-index: 9999;

.file,
.icon {
height: 24px;
width: 24px;
font-size: 1em;
background-size: 22px;
flex-shrink: 0;
}

.file {
padding: 0 !important;
}
Expand Down Expand Up @@ -98,4 +107,4 @@ header {
transform: scale(0.95) translateZ(0);
}
}
}
}
2 changes: 1 addition & 1 deletion src/lib/editorFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -1528,7 +1528,7 @@ export default class EditorFile {
}

return tag("span", {
className: "licons pin",
className: "icon pin",
title: strings["unpin tab"] || "Unpin tab",
dataset: {
action: "toggle-pin",
Expand Down
4 changes: 2 additions & 2 deletions src/lib/openFolder.js
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ async function handleContextmenu(type, url, name, $target) {
const OPEN_IN_TERMINAL = [
"open-in-terminal",
strings["open in terminal"] || "Open in Terminal",
"licons terminal",
"terminal",
];
options.push(OPEN_IN_TERMINAL);
}
Expand All @@ -373,7 +373,7 @@ async function handleContextmenu(type, url, name, $target) {
const OPEN_IN_TERMINAL = [
"open-in-terminal",
strings["open in terminal"] || "Open in Terminal",
"licons terminal",
"terminal",
];
options.push(OPEN_IN_TERMINAL);
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/selectionMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default function selectionMenu() {
),
item(
() => showCodeActions(),
<span className="licons lightbulb" title="Code Actions"></span>,
<span className="icon lightbulb" title="Code Actions"></span>,
"all",
true,
),
Expand Down
2 changes: 1 addition & 1 deletion src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ function createFileMenu({ top, bottom, toggler }) {
toggle_pin_tab_text: file.pinned
? strings["unpin tab"] || "Unpin tab"
: strings["pin tab"] || "Pin tab",
toggle_pin_tab_icon: file.pinned ? "licons pin-off" : "licons pin",
toggle_pin_tab_icon: file.pinned ? "icon pin-off" : "icon pin",
// Use CodeMirror mode stored on EditorFile (set in setMode)
file_mode: isEditorFile ? file.currentMode || "" : "",
file_encoding: isEditorFile ? encoding : "",
Expand Down
9 changes: 8 additions & 1 deletion src/pages/plugin/plugin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,18 @@
font-size: 14px;
margin-bottom: 12px;

.author-name {
.meta-item {
display: inline-flex;
align-items: center;
gap: 4px;
vertical-align: middle;

.icon {
flex-shrink: 0;
}
}

.author-name {
a {
text-decoration: none;
color: inherit;
Expand Down
11 changes: 4 additions & 7 deletions src/pages/plugin/plugin.view.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default (props) => {
</div>
<div className="plugin-meta">
<span className="meta-item">
<i className="licons tag" style={{ fontSize: "12px" }}></i>
<i className="icon tag" style={{ fontSize: "12px" }}></i>
<Version
{...props}
packageUpdatedAt={packageUpdatedAt}
Expand All @@ -126,17 +126,14 @@ export default (props) => {
on:click={() => {
toast(strings["verified publisher"]);
}}
className="licons verified verified-tick"
className="icon verified verified-tick"
></i>
) : (
""
)}
</span>
<span className="meta-item">
<span
className="licons scale"
style={{ fontSize: "12px" }}
></span>
<span className="icon scale" style={{ fontSize: "12px" }}></span>
{license || "Unknown"}
</span>
</div>
Expand Down Expand Up @@ -335,7 +332,7 @@ function Buttons({
if (isPaid && !purchased && price) {
return (
<button data-type="buy" className="btn btn-install" onclick={buy}>
<i className="licons cart"></i>
<i className="icon cart"></i>
{price}
</button>
);
Expand Down
4 changes: 2 additions & 2 deletions src/pages/plugins/item.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default function Item({
{authorName}
{author_verified ? (
<i
className="licons verified"
className="icon verified"
style={{ color: "#3b82f6" }}
></i>
) : (
Expand All @@ -81,7 +81,7 @@ export default function Item({
<span className="plugin-meta-dot"></span>
<div className="plugin-stats">
<span
className="licons scale"
className="icon scale"
style={{ fontSize: "12px" }}
></span>
{license || "Unknown"}
Expand Down
Binary file modified src/res/icons/icons.ttf
Binary file not shown.
Binary file removed src/res/icons/li-icon.ttf
Binary file not shown.
Loading