Skip to content

Commit

Permalink
Merge branch 'main' into update_plugin_webview
Browse files Browse the repository at this point in the history
  • Loading branch information
shatakshiiii committed Feb 14, 2025
2 parents 05efc5e + 3f38395 commit 58406a3
Show file tree
Hide file tree
Showing 49 changed files with 1,890 additions and 1,276 deletions.
3 changes: 3 additions & 0 deletions .config/dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ lssh
lxml
markdownlint
maxlength
microdnf
mkdocs
mocharc
mochawesome
Expand All @@ -166,6 +167,7 @@ mycollection
mymodule
mynamespace
myuser
nqry
ncurc
neovim
netcommon
Expand All @@ -188,6 +190,7 @@ pgrep
piptools
pipx
pkgcache
PKGMGR
pkill
podman
precheck
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@ packages/ansible-language-server/test/fixtures/diagnostics/invalid_yaml.yml
docs/als/settings.md
.eslintcache
test/units/lightspeed/utils/samples/collections/ansible_collections/community/broken_MANIFEST/MANIFEST.json
.ansible
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ exclude: >
minimum_pre_commit_version: 4.0.0 # Related to https://github.com/ekalinin/nodeenv/issues/369
repos:
- repo: https://github.com/streetsidesoftware/cspell-cli
rev: v8.17.0
rev: v8.17.2
hooks:
- id: cspell
args:
- --config=cspell.config.yaml
# name: Spell check with cspell
- repo: https://github.com/codespell-project/codespell
rev: v2.3.0
rev: v2.4.1
hooks:
- id: codespell
pass_filenames: false # we want to use its own config
Expand All @@ -48,7 +48,7 @@ repos:
- -e
- SC1091
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.8.6
rev: v0.9.4
hooks:
- id: ruff
args:
Expand All @@ -58,7 +58,7 @@ repos:
- id: ruff-format # must be after ruff
types_or: [python, pyi]
- repo: https://github.com/psf/black # must be after ruff
rev: 24.10.0
rev: 25.1.0
hooks:
- id: black
- repo: local
Expand Down Expand Up @@ -189,7 +189,7 @@ repos:
docs/als/settings.md
)$
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.43.0
rev: v0.44.0
hooks:
- id: markdownlint
exclude: >
Expand Down
4 changes: 2 additions & 2 deletions .sonarcloud.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
sonar.cpd.exclusions=\
src/features/lightspeed/playbookGeneration.ts, \
src/features/lightspeed/roleGeneration.ts, \
src/features/contentCreator/createSampleExecutionEnvPage.ts, \
src/webview/apps/contentCreator/createSampleExecutionEnvPageApp.ts, \
src/features/contentCreator/createExecutionEnvPage.ts, \
src/webview/apps/contentCreator/createExecutionEnvPageApp.ts, \
src/features/contentCreator/createDevcontainerPage.ts, \
src/webview/apps/contentCreator/createDevcontainerPageApp.ts, \
src/features/contentCreator/addPluginPage.ts, \
Expand Down
4 changes: 2 additions & 2 deletions .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
!media/contentCreator/createAnsibleCollectionPageStyle.css
!media/contentCreator/createAnsibleProjectPageStyle.css
!media/contentCreator/createDevfilePageStyle.css
!media/contentCreator/createSampleExecutionEnvPageStyle.css
!media/contentCreator/createExecutionEnvPageStyle.css
!media/contentCreator/createDevcontainerPageStyle.css
!media/contentCreator/addPluginPageStyle.css
!media/contentCreator/welcomePageStyle.css
Expand All @@ -47,7 +47,7 @@
!out/client/webview/apps/contentCreator/createAnsibleCollectionPageApp.js
!out/client/webview/apps/contentCreator/createAnsibleProjectPageApp.js
!out/client/webview/apps/contentCreator/createDevfilePageApp.js
!out/client/webview/apps/contentCreator/createSampleExecutionEnvPageApp.js
!out/client/webview/apps/contentCreator/createExecutionEnvPageApp.js
!out/client/webview/apps/contentCreator/createDevcontainerPageApp.js
!out/client/webview/apps/contentCreator/addPluginPageApp.js
!out/client/webview/apps/quickLinks/quickLinksApp.js
Expand Down
2 changes: 1 addition & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ignore:
- src/webview/apps/contentCreator/createAnsibleCollectionPageApp.ts
- src/webview/apps/contentCreator/createAnsibleProjectPageApp.ts
- src/webview/apps/contentCreator/createDevfilePageApp.ts
- src/webview/apps/contentCreator/createSampleExecutionEnvPageApp.ts
- src/webview/apps/contentCreator/createExecutionEnvPageApp.ts
- src/webview/apps/contentCreator/createDevcontainerPageApp.ts
- src/webview/apps/contentCreator/addPluginPageApp.ts
- src/webview/apps/welcomePage/welcomePageApp.ts
Expand Down
147 changes: 147 additions & 0 deletions media/contentCreator/createExecutionEnvPageStyle.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
@import url(../baseStyles/baseFormStyle.css);

.container {
display: flex;
flex-direction: column;
font-size: 1em;
}

.element {
margin-bottom: 14px;
}

vscode-textfield {
margin-bottom: 6px;
width: 100%;
}

vscode-textarea {
margin-top: 6px;
margin-bottom: 6px;
}

vscode-form-group {
width: 100%;
margin: 0;
}

.checkbox-div {
display: flex;
/* Use flexbox */
flex-direction: column;
/* Arrange child elements vertically */
margin-top: 22px;
margin-bottom: 10px;
width: 100%;
}

.overwriteCheckbox-div {
display: flex;
/* Use flexbox */
flex-direction: column;
/* Arrange child elements vertically */
margin-top: 22px;
margin-bottom: 20px;
width: 100%;
}

.suggestedCollections-div {
display: flex;
/* Use flexbox */
flex-direction: column;
/* Arrange child elements vertically */
margin-top: 18px;
margin-bottom: 20px;
width: 100%;
}

.checkbox-container {
display: flex;
flex-wrap: wrap;
gap: 5px;
/* Space between columns */
justify-content: flex-start;
/* Aligns the columns to the left */
}

#suggestedCollections-checkboxes {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 5px;
width: 100%;
}

.verbose-div {
display: flex;
/* Use flexbox */
flex-direction: row;
/* Arrange child elements vertically */
margin-top: 12px;
margin-bottom: 15px;
width: 100%;
}

vscode-single-select {
width: 500px;
}

.full-destination-path {
display: flex;
/* Use flexbox */
flex-direction: row;
/* Arrange child elements vertically */
color: var(--vscode-descriptionForeground);
}

.group-buttons {
display: flex;
/* Use flexbox */
flex-direction: row;
/* Arrange child elements vertically */
}

.p-collection-name {
font-style: italic;
}

vscode-button {
margin: 0px 3px;
}

vscode-checkbox i {
color: var(--vscode-descriptionForeground);
font-size: small;
width: 100%;
}

vscode-divider {
width: 100%;
}

#vscode-logs-label {
padding: 0;
align-self: flex-start;
margin-left: 5px;
}

#ade-docs-link {
margin-left: 30px;
font-style: italic;
}

.dropdown-container {
box-sizing: border-box;
display: flex;
flex-flow: column nowrap;
align-items: flex-start;
justify-content: flex-start;
}

.dropdown-container label {
display: block;
color: var(--vscode-foreground);
cursor: pointer;
font-size: var(--vscode-font-size);
line-height: normal;
margin-bottom: 2px;
}
86 changes: 0 additions & 86 deletions media/contentCreator/createSampleExecutionEnvPageStyle.css

This file was deleted.

19 changes: 0 additions & 19 deletions media/roleGeneration/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -248,25 +248,6 @@ a:active {
background-color: var(--input-background);
}

/*
.dropdown-container {
box-sizing: border-box;
display: flex;
flex-flow: column nowrap;
align-items: flex-start;
justify-content: flex-start;
}
.dropdown-container label {
display: block;
color: var(--vscode-foreground);
cursor: pointer;
font-size: var(--vscode-font-size);
line-height: normal;
margin-bottom: 2px;
}
*/

.codicon.codicon-warning {
margin: 10px;
color: red;
Expand Down
1 change: 0 additions & 1 deletion media/welcomePage/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@ ul#walkthrough-list {
}

ul#walkthrough-list button {
/* border: 1px solid var(--vscode-contrastBorder); */
background: var(--vscode-welcomePage-tileBackground);
border: none;
color: inherit;
Expand Down
Loading

0 comments on commit 58406a3

Please sign in to comment.