Skip to content

Commit a61748a

Browse files
committed
Merge branch 'develop' into canary
2 parents 3035fbe + d6b20b4 commit a61748a

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

Dockerfile

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Build stage
22
ARG TAG
3-
FROM cs50/cli:${TAG} as builder
3+
FROM cs50/cli:${TAG} AS builder
44
ARG DEBIAN_FRONTEND=noninteractive
55

66

@@ -91,6 +91,13 @@ RUN npm install --global @vscode/vsce yarn && \
9191
mv style50-0.0.1.vsix /opt/cs50/extensions && \
9292
cd /tmp && \
9393
rm --force --recursive style50.vsix && \
94+
git clone https://github.com/cs50/design50.vsix.git && \
95+
cd design50.vsix && \
96+
npm install && \
97+
vsce package && \
98+
mv design50-1.0.0.vsix /opt/cs50/extensions && \
99+
cd /tmp && \
100+
rm --force --recursive design50.vsix && \
94101
npm uninstall --global vsce yarn
95102

96103

devcontainer.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"extensions": [
1313
"/opt/cs50/extensions/explain50-1.0.0.vsix",
1414
"/opt/cs50/extensions/cs50-0.0.1.vsix",
15+
"/opt/cs50/extensions/design50-1.0.0.vsix",
1516
"/opt/cs50/extensions/ddb50-2.0.0.vsix",
1617
"/opt/cs50/extensions/phpliteadmin-0.0.1.vsix",
1718
"/opt/cs50/extensions/style50-0.0.1.vsix",
@@ -69,10 +70,11 @@
6970
"editor.formatOnSave": false,
7071
"editor.guides.indentation": false,
7172
"editor.hover.enabled": false,
72-
"editor.lightbulb.enabled": false,
73+
"editor.lightbulb.enabled": "off",
7374
"editor.matchBrackets": "never",
75+
"editor.mouseWheelZoom": true,
7476
"editor.minimap.enabled": false,
75-
"editor.occurrencesHighlight": false,
77+
"editor.occurrencesHighlight": "off",
7678
"editor.parameterHints.enabled": false,
7779
"editor.quickSuggestions": {
7880
"other": "off",
@@ -95,6 +97,7 @@
9597
},
9698
"editor.suggestOnTriggerCharacters": false,
9799
"extensions.ignoreRecommendations": true,
100+
"explorer.autoOpenDroppedFile": false,
98101
"explorer.compactFolders": false,
99102
"extension-uninstaller.uninstall": [
100103
"Codeium.codeium",

0 commit comments

Comments
 (0)