Skip to content

Commit

Permalink
Merge branch '29871-implement-ux-design-for-enhanced-file-field' of g…
Browse files Browse the repository at this point in the history
…ithub.com:dotCMS/core into 29871-implement-ux-design-for-enhanced-file-field
  • Loading branch information
nicobytes committed Sep 18, 2024
2 parents 1fd3ddb + 69b4fea commit 2f37be4
Show file tree
Hide file tree
Showing 97 changed files with 3,674 additions and 784 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/issue_comp_next-release-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ jobs:
let issueNumber;
const issue = context.payload.issue;
if (!issue && '${{ inputs.issue_number }}'.trim() === '') {
core.warn('Issue number is not provided');
core.warning('Issue number is not provided');
process.exit(0);
}
let label = context.payload.label;
if (!label) {
if (!'${{ inputs.label }}') {
core.warn('Label is missing, exiting');
core.warning('Label is missing, exiting');
process.exit(0);
}
label = '${{ inputs.label }}';
Expand All @@ -52,7 +52,7 @@ jobs:
}
if (label !== '${{ env.QA_NOT_NEEDED_LABEL }}') {
core.warn('Label is not [${{ env.QA_NOT_NEEDED_LABEL }}], exiting');
core.warning('Label is not [${{ env.QA_NOT_NEEDED_LABEL }}], exiting');
process.exit(0);
}
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
}
if (!issue) {
core.warn('Issue [${{ inputs.issue_number }}] not found');
core.warning('Issue [${{ inputs.issue_number }}] not found');
process.exit(0);
}
}
Expand All @@ -92,14 +92,14 @@ jobs:
const dropAndLearnText = 'Drop Everything & Learn'.toLowerCase();
if (issue.title.toLowerCase().includes(dropAndLearnText)) {
core.warn(`Issue does have "${dropAndLearnText}" text in title, exiting`);
core.warning(`Issue does have "${dropAndLearnText}" text in title, exiting`);
process.exit(0);
}
const typeCicdLabel = 'Type : CI/CD';
const foundLabel = issue.labels.find(label => label.name === typeCicdLabel);
if (foundLabel) {
core.warn(`Issue does have "${typeCicdLabel}" label , exiting`);
core.warning(`Issue does have "${typeCicdLabel}" label , exiting`);
process.exit(0);
}
Expand Down
6 changes: 6 additions & 0 deletions bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1579,6 +1579,12 @@
<version>3.5.3</version>
</dependency>

<dependency>
<groupId>com.microsoft.playwright</groupId>
<artifactId>playwright</artifactId>
<version>1.46.0</version>
</dependency>

<!-- Graalvm Js Engine -->
<dependency>
<groupId>org.graalvm.sdk</groupId>
Expand Down
9 changes: 7 additions & 2 deletions core-web/apps/dotcms-ui/proxy-dev.conf.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,18 @@ export default [
'/dotcms-block-editor',
'/dotcms-binary-field-builder',
'/categoriesServlet',
'/JSONTags'
'/JSONTags',
'/api/vtl',
'/tinymce'
],
target: 'http://localhost:8080',
secure: false,
logLevel: 'debug',
pathRewrite: {
'^/assets': '/dotAdmin/assets'
'^/assets/manifest.json': '/dotAdmin/assets/manifest.json',
'^/assets/monaco-editor/min': '/dotAdmin/assets/monaco-editor/min',
'^/assets': '/dotAdmin',
'^/tinymce': '/dotAdmin/tinymce'
}
}
];
34 changes: 0 additions & 34 deletions core-web/apps/dotcms-ui/proxy.conf.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ $nav-size: 80px;
}

& > .fa {
font-size: 1.25em;
font-size: $font-size-sm;
margin-bottom: 8px;
}

Expand Down
2 changes: 1 addition & 1 deletion core-web/libs/dot-rules/src/lib/styles/rule-engine.scss
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ $finder-s-input: ".ui.input input";

.cw-filter-links {
padding: $spacing-1;
font-size: 0.8em;
font-size: $font-size-sm;
color: $foreground-disabled;

span:first-child {
Expand Down
18 changes: 12 additions & 6 deletions core-web/libs/dotcms-scss/jsp/css/document.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2f37be4

Please sign in to comment.