Skip to content

Commit

Permalink
Merge pull request #7659 from ProcessMaker/observation/FOUR-19858
Browse files Browse the repository at this point in the history 
observation/FOUR-19858 fix create and delete modal style
  • Loading branch information
@ryancooley
ryancooley authored Nov 5, 2024
2 parents 47cac2a + e45cf63 commit e2cba8c
Show file tree
Hide file tree
Showing 23 changed files with 287 additions and 82 deletions.
2 changes: 1 addition & 1 deletion ProcessMaker/Http/Resources/V1_1/CaseResource.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function toArray($request): array
*/
private function getParticipantData(array $participants): array
{
return array_map(fn($participant) => self::$users->get($participant), $participants);
return array_map(fn ($participant) => self::$users->get($participant), $participants);
}

/**
Expand Down
1 change: 0 additions & 1 deletion ProcessMaker/ProcessTranslations/ScreenTranslation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public function applyTranslations($screen, $defaultLanguage = '')

$language = $this->getTargetLanguage($defaultLanguage);


return $this->searchTranslations($screen['screen_id'], $config, $language);
}

Expand Down
3 changes: 3 additions & 0 deletions devhub/pm-font/svg/trash.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion resources/fonts/pm-font/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ <h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
</div>
<div class="icons">
<ul>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
</ul>
</div>
<p class="links">
Expand Down
15 changes: 8 additions & 7 deletions resources/fonts/pm-font/processmaker-font.css
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730126674531'); /* IE9*/
src: url('processmaker-font.eot?t=1730126674531#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730126674531") format("woff2"),
url("processmaker-font.woff?t=1730126674531") format("woff"),
url('processmaker-font.ttf?t=1730126674531') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730126674531#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand Down Expand Up @@ -55,5 +55,6 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-unlink:before { content: "\ea28"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }

Binary file modified resources/fonts/pm-font/processmaker-font.eot
View file
Binary file not shown.
15 changes: 8 additions & 7 deletions resources/fonts/pm-font/processmaker-font.less
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730126674531'); /* IE9*/
src: url('processmaker-font.eot?t=1730126674531#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730126674531") format("woff2"),
url("processmaker-font.woff?t=1730126674531") format("woff"),
url('processmaker-font.ttf?t=1730126674531') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730126674531#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand Down Expand Up @@ -53,4 +53,5 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-unlink:before { content: "\ea28"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
15 changes: 8 additions & 7 deletions resources/fonts/pm-font/processmaker-font.module.less
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730126674531'); /* IE9*/
src: url('processmaker-font.eot?t=1730126674531#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730126674531") format("woff2"),
url("processmaker-font.woff?t=1730126674531") format("woff"),
url('processmaker-font.ttf?t=1730126674531') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730126674531#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand Down Expand Up @@ -54,6 +54,7 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-unlink:before { content: "\ea28"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }

}
18 changes: 10 additions & 8 deletions resources/fonts/pm-font/processmaker-font.scss
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730126674531'); /* IE9*/
src: url('processmaker-font.eot?t=1730126674531#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730126674531") format("woff2"),
url("processmaker-font.woff?t=1730126674531") format("woff"),
url('processmaker-font.ttf?t=1730126674531') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730126674531#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand Down Expand Up @@ -53,7 +53,8 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-unlink:before { content: "\ea28"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }

$fp-bpmn-action-by-email: "\ea01";
$fp-bpmn-data-connector: "\ea02";
Expand Down Expand Up @@ -94,5 +95,6 @@ $fp-slack-notification: "\ea24";
$fp-slack: "\ea25";
$fp-slideshow: "\ea26";
$fp-table: "\ea27";
$fp-unlink: "\ea28";
$fp-trash: "\ea28";
$fp-unlink: "\ea29";

15 changes: 8 additions & 7 deletions resources/fonts/pm-font/processmaker-font.styl
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730126674531'); /* IE9*/
src: url('processmaker-font.eot?t=1730126674531#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730126674531") format("woff2"),
url("processmaker-font.woff?t=1730126674531") format("woff"),
url('processmaker-font.ttf?t=1730126674531') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730126674531#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand Down Expand Up @@ -53,4 +53,5 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-unlink:before { content: "\ea28"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
Loading

0 comments on commit e2cba8c

Please sign in to comment.