Skip to content

Commit 644e5b4

Browse files
code-asherkylecarbs
authored andcommitted
Fix some styling issues
1 parent beca8b7 commit 644e5b4

File tree

3 files changed

+39
-34
lines changed

3 files changed

+39
-34
lines changed

packages/protocol/src/browser/modules/fs.ts

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -694,10 +694,7 @@ class Stats implements fs.Stats {
694694
this.birthtime = new Date(stats.birthtime);
695695
}
696696

697-
public get dev(): number {
698-
return this.stats.dev;
699-
}
700-
697+
public get dev(): number { return this.stats.dev; }
701698
public get ino(): number { return this.stats.ino; }
702699
public get mode(): number { return this.stats.mode; }
703700
public get nlink(): number { return this.stats.nlink; }
@@ -711,34 +708,13 @@ class Stats implements fs.Stats {
711708
public get mtimeMs(): number { return this.stats.mtimeMs; }
712709
public get ctimeMs(): number { return this.stats.ctimeMs; }
713710
public get birthtimeMs(): number { return this.stats.birthtimeMs; }
714-
715-
public isFile(): boolean {
716-
return this.stats._isFile;
717-
}
718-
719-
public isDirectory(): boolean {
720-
return this.stats._isDirectory;
721-
}
722-
723-
public isBlockDevice(): boolean {
724-
return this.stats._isBlockDevice;
725-
}
726-
727-
public isCharacterDevice(): boolean {
728-
return this.stats._isCharacterDevice;
729-
}
730-
731-
public isSymbolicLink(): boolean {
732-
return this.stats._isSymbolicLink;
733-
}
734-
735-
public isFIFO(): boolean {
736-
return this.stats._isFIFO;
737-
}
738-
739-
public isSocket(): boolean {
740-
return this.stats._isSocket;
741-
}
711+
public isFile(): boolean { return this.stats._isFile; }
712+
public isDirectory(): boolean { return this.stats._isDirectory; }
713+
public isBlockDevice(): boolean { return this.stats._isBlockDevice; }
714+
public isCharacterDevice(): boolean { return this.stats._isCharacterDevice; }
715+
public isSymbolicLink(): boolean { return this.stats._isSymbolicLink; }
716+
public isFIFO(): boolean { return this.stats._isFIFO; }
717+
public isSocket(): boolean { return this.stats._isSocket; }
742718

743719
public toObject(): object {
744720
return JSON.parse(JSON.stringify(this));

packages/vscode/src/vscode.scss

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,20 @@
55
margin-bottom: 0;
66
}
77

8+
.monaco-icon-label > .monaco-icon-label-description-container {
9+
margin-right: auto;
10+
}
11+
12+
.monaco-icon-label > .decorations-wrapper {
13+
display: flex;
14+
flex-direction: row;
15+
padding-right: 12px;
16+
}
17+
18+
.monaco-icon-label::after {
19+
margin-left: initial;
20+
}
21+
822
// Using @supports to keep the Firefox fixes completely separate from vscode's
923
// CSS that is tailored for Chrome.
1024
@supports (-moz-appearance:none) {
@@ -13,4 +27,17 @@
1327
max-width: 100%;
1428
width: auto;
1529
}
30+
31+
.monaco-shell .screen-reader-detected-explanation .buttons a,
32+
.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink,
33+
.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-button {
34+
max-width: -moz-fit-content;
35+
}
36+
37+
.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fit,
38+
.explorer-viewlet .panel-header .count,
39+
.extensions-viewlet > .extensions .extension > .details > .header-container > .header > .version,
40+
.debug-viewlet .debug-call-stack .stack-frame .label {
41+
min-width: -moz-fit-content;
42+
}
1643
}

scripts/webpack.general.config.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = (options = {}) => ({
2222
loader: "ignore-loader",
2323
}],
2424
}, {
25-
test: /electron-browser.+\.html$/,
25+
test: /electron-browser.+\.html$|code\/electron-browser\/.+\.css/,
2626
use: [{
2727
loader: "ignore-loader",
2828
}],
@@ -35,7 +35,9 @@ module.exports = (options = {}) => ({
3535
}],
3636
test: /(^.?|\.[^d]|[^.]d|[^.][^d])\.tsx?$/,
3737
}, {
38-
exclude: /test/,
38+
// The CSS in code/electron-browser is supposed to be served in separate
39+
// pages so including it interferes with styles in vscode.
40+
exclude: /test|code\/electron-browser\/.+\.css/,
3941
test: /\.s?css$/,
4042
// This is required otherwise it'll fail to resolve CSS in common.
4143
include: root,

0 commit comments

Comments
 (0)