diff --git a/devhub/pm-font/svg/css-icon.svg b/devhub/pm-font/svg/css-icon.svg new file mode 100644 index 0000000000..9340b84fa1 --- /dev/null +++ b/devhub/pm-font/svg/css-icon.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/devhub/pm-font/svg/fields-icon.svg b/devhub/pm-font/svg/fields-icon.svg new file mode 100644 index 0000000000..82fab2fd2a --- /dev/null +++ b/devhub/pm-font/svg/fields-icon.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/devhub/pm-font/svg/layout-icon.svg b/devhub/pm-font/svg/layout-icon.svg new file mode 100644 index 0000000000..8e1e8ceef2 --- /dev/null +++ b/devhub/pm-font/svg/layout-icon.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/fonts/pm-font/index.html b/resources/fonts/pm-font/index.html index 572bd628f1..a4bd0e91cc 100644 --- a/resources/fonts/pm-font/index.html +++ b/resources/fonts/pm-font/index.html @@ -103,7 +103,7 @@
-

ProcessMaker Icons4.11.0+beta-2

+

ProcessMaker Icons4.11.2-RC1

Icons generated with svgtofont. For add new icons, please check the README file
@@ -115,7 +115,7 @@

ProcessMaker Icons4.11.0+beta-2

diff --git a/resources/fonts/pm-font/processmaker-font.css b/resources/fonts/pm-font/processmaker-font.css index cd5a759de0..25ae184c19 100644 --- a/resources/fonts/pm-font/processmaker-font.css +++ b/resources/fonts/pm-font/processmaker-font.css @@ -1,11 +1,11 @@ @font-face { font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1723741916029'); /* IE9*/ - src: url('processmaker-font.eot?t=1723741916029#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1723741916029") format("woff2"), - url("processmaker-font.woff?t=1723741916029") format("woff"), - url('processmaker-font.ttf?t=1723741916029') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1723741916029#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1726428928126'); /* IE9*/ + src: url('processmaker-font.eot?t=1726428928126#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1726428928126") format("woff2"), + url("processmaker-font.woff?t=1726428928126") format("woff"), + url('processmaker-font.ttf?t=1726428928126') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1726428928126#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -35,16 +35,19 @@ .fp-brush-icon:before { content: "\ea11"; } .fp-close:before { content: "\ea12"; } .fp-copy:before { content: "\ea13"; } -.fp-desktop:before { content: "\ea14"; } -.fp-eye:before { content: "\ea15"; } -.fp-fullscreen:before { content: "\ea16"; } -.fp-github:before { content: "\ea17"; } -.fp-map:before { content: "\ea18"; } -.fp-mobile:before { content: "\ea19"; } -.fp-pdf:before { content: "\ea1a"; } -.fp-plus:before { content: "\ea1b"; } -.fp-slack-notification:before { content: "\ea1c"; } -.fp-slack:before { content: "\ea1d"; } -.fp-slideshow:before { content: "\ea1e"; } -.fp-table:before { content: "\ea1f"; } +.fp-css-icon:before { content: "\ea14"; } +.fp-desktop:before { content: "\ea15"; } +.fp-eye:before { content: "\ea16"; } +.fp-fields-icon:before { content: "\ea17"; } +.fp-fullscreen:before { content: "\ea18"; } +.fp-github:before { content: "\ea19"; } +.fp-layout-icon:before { content: "\ea1a"; } +.fp-map:before { content: "\ea1b"; } +.fp-mobile:before { content: "\ea1c"; } +.fp-pdf:before { content: "\ea1d"; } +.fp-plus:before { content: "\ea1e"; } +.fp-slack-notification:before { content: "\ea1f"; } +.fp-slack:before { content: "\ea20"; } +.fp-slideshow:before { content: "\ea21"; } +.fp-table:before { content: "\ea22"; } diff --git a/resources/fonts/pm-font/processmaker-font.eot b/resources/fonts/pm-font/processmaker-font.eot index ca3ab51ca6..528775450a 100644 Binary files a/resources/fonts/pm-font/processmaker-font.eot and b/resources/fonts/pm-font/processmaker-font.eot differ diff --git a/resources/fonts/pm-font/processmaker-font.less b/resources/fonts/pm-font/processmaker-font.less index 44c4df44d3..5d96da6e6d 100644 --- a/resources/fonts/pm-font/processmaker-font.less +++ b/resources/fonts/pm-font/processmaker-font.less @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1723741916029'); /* IE9*/ - src: url('processmaker-font.eot?t=1723741916029#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1723741916029") format("woff2"), - url("processmaker-font.woff?t=1723741916029") format("woff"), - url('processmaker-font.ttf?t=1723741916029') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1723741916029#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1726428928126'); /* IE9*/ + src: url('processmaker-font.eot?t=1726428928126#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1726428928126") format("woff2"), + url("processmaker-font.woff?t=1726428928126") format("woff"), + url('processmaker-font.ttf?t=1726428928126') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1726428928126#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -33,15 +33,18 @@ .fp-brush-icon:before { content: "\ea11"; } .fp-close:before { content: "\ea12"; } .fp-copy:before { content: "\ea13"; } -.fp-desktop:before { content: "\ea14"; } -.fp-eye:before { content: "\ea15"; } -.fp-fullscreen:before { content: "\ea16"; } -.fp-github:before { content: "\ea17"; } -.fp-map:before { content: "\ea18"; } -.fp-mobile:before { content: "\ea19"; } -.fp-pdf:before { content: "\ea1a"; } -.fp-plus:before { content: "\ea1b"; } -.fp-slack-notification:before { content: "\ea1c"; } -.fp-slack:before { content: "\ea1d"; } -.fp-slideshow:before { content: "\ea1e"; } -.fp-table:before { content: "\ea1f"; } +.fp-css-icon:before { content: "\ea14"; } +.fp-desktop:before { content: "\ea15"; } +.fp-eye:before { content: "\ea16"; } +.fp-fields-icon:before { content: "\ea17"; } +.fp-fullscreen:before { content: "\ea18"; } +.fp-github:before { content: "\ea19"; } +.fp-layout-icon:before { content: "\ea1a"; } +.fp-map:before { content: "\ea1b"; } +.fp-mobile:before { content: "\ea1c"; } +.fp-pdf:before { content: "\ea1d"; } +.fp-plus:before { content: "\ea1e"; } +.fp-slack-notification:before { content: "\ea1f"; } +.fp-slack:before { content: "\ea20"; } +.fp-slideshow:before { content: "\ea21"; } +.fp-table:before { content: "\ea22"; } diff --git a/resources/fonts/pm-font/processmaker-font.module.less b/resources/fonts/pm-font/processmaker-font.module.less index ba234f2992..614e85618e 100644 --- a/resources/fonts/pm-font/processmaker-font.module.less +++ b/resources/fonts/pm-font/processmaker-font.module.less @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1723741916029'); /* IE9*/ - src: url('processmaker-font.eot?t=1723741916029#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1723741916029") format("woff2"), - url("processmaker-font.woff?t=1723741916029") format("woff"), - url('processmaker-font.ttf?t=1723741916029') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1723741916029#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1726428928126'); /* IE9*/ + src: url('processmaker-font.eot?t=1726428928126#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1726428928126") format("woff2"), + url("processmaker-font.woff?t=1726428928126") format("woff"), + url('processmaker-font.ttf?t=1726428928126') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1726428928126#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -34,17 +34,20 @@ .fp-brush-icon:before { content: "\ea11"; } .fp-close:before { content: "\ea12"; } .fp-copy:before { content: "\ea13"; } -.fp-desktop:before { content: "\ea14"; } -.fp-eye:before { content: "\ea15"; } -.fp-fullscreen:before { content: "\ea16"; } -.fp-github:before { content: "\ea17"; } -.fp-map:before { content: "\ea18"; } -.fp-mobile:before { content: "\ea19"; } -.fp-pdf:before { content: "\ea1a"; } -.fp-plus:before { content: "\ea1b"; } -.fp-slack-notification:before { content: "\ea1c"; } -.fp-slack:before { content: "\ea1d"; } -.fp-slideshow:before { content: "\ea1e"; } -.fp-table:before { content: "\ea1f"; } +.fp-css-icon:before { content: "\ea14"; } +.fp-desktop:before { content: "\ea15"; } +.fp-eye:before { content: "\ea16"; } +.fp-fields-icon:before { content: "\ea17"; } +.fp-fullscreen:before { content: "\ea18"; } +.fp-github:before { content: "\ea19"; } +.fp-layout-icon:before { content: "\ea1a"; } +.fp-map:before { content: "\ea1b"; } +.fp-mobile:before { content: "\ea1c"; } +.fp-pdf:before { content: "\ea1d"; } +.fp-plus:before { content: "\ea1e"; } +.fp-slack-notification:before { content: "\ea1f"; } +.fp-slack:before { content: "\ea20"; } +.fp-slideshow:before { content: "\ea21"; } +.fp-table:before { content: "\ea22"; } } \ No newline at end of file diff --git a/resources/fonts/pm-font/processmaker-font.scss b/resources/fonts/pm-font/processmaker-font.scss index 04efef9f5c..d64a5aa408 100644 --- a/resources/fonts/pm-font/processmaker-font.scss +++ b/resources/fonts/pm-font/processmaker-font.scss @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1723741916029'); /* IE9*/ - src: url('processmaker-font.eot?t=1723741916029#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1723741916029") format("woff2"), - url("processmaker-font.woff?t=1723741916029") format("woff"), - url('processmaker-font.ttf?t=1723741916029') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1723741916029#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1726428928126'); /* IE9*/ + src: url('processmaker-font.eot?t=1726428928126#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1726428928126") format("woff2"), + url("processmaker-font.woff?t=1726428928126") format("woff"), + url('processmaker-font.ttf?t=1726428928126') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1726428928126#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -33,18 +33,21 @@ .fp-brush-icon:before { content: "\ea11"; } .fp-close:before { content: "\ea12"; } .fp-copy:before { content: "\ea13"; } -.fp-desktop:before { content: "\ea14"; } -.fp-eye:before { content: "\ea15"; } -.fp-fullscreen:before { content: "\ea16"; } -.fp-github:before { content: "\ea17"; } -.fp-map:before { content: "\ea18"; } -.fp-mobile:before { content: "\ea19"; } -.fp-pdf:before { content: "\ea1a"; } -.fp-plus:before { content: "\ea1b"; } -.fp-slack-notification:before { content: "\ea1c"; } -.fp-slack:before { content: "\ea1d"; } -.fp-slideshow:before { content: "\ea1e"; } -.fp-table:before { content: "\ea1f"; } +.fp-css-icon:before { content: "\ea14"; } +.fp-desktop:before { content: "\ea15"; } +.fp-eye:before { content: "\ea16"; } +.fp-fields-icon:before { content: "\ea17"; } +.fp-fullscreen:before { content: "\ea18"; } +.fp-github:before { content: "\ea19"; } +.fp-layout-icon:before { content: "\ea1a"; } +.fp-map:before { content: "\ea1b"; } +.fp-mobile:before { content: "\ea1c"; } +.fp-pdf:before { content: "\ea1d"; } +.fp-plus:before { content: "\ea1e"; } +.fp-slack-notification:before { content: "\ea1f"; } +.fp-slack:before { content: "\ea20"; } +.fp-slideshow:before { content: "\ea21"; } +.fp-table:before { content: "\ea22"; } $fp-bpmn-action-by-email: "\ea01"; $fp-bpmn-data-connector: "\ea02"; @@ -65,16 +68,19 @@ $fp-bpmn-text-annotation: "\ea10"; $fp-brush-icon: "\ea11"; $fp-close: "\ea12"; $fp-copy: "\ea13"; -$fp-desktop: "\ea14"; -$fp-eye: "\ea15"; -$fp-fullscreen: "\ea16"; -$fp-github: "\ea17"; -$fp-map: "\ea18"; -$fp-mobile: "\ea19"; -$fp-pdf: "\ea1a"; -$fp-plus: "\ea1b"; -$fp-slack-notification: "\ea1c"; -$fp-slack: "\ea1d"; -$fp-slideshow: "\ea1e"; -$fp-table: "\ea1f"; +$fp-css-icon: "\ea14"; +$fp-desktop: "\ea15"; +$fp-eye: "\ea16"; +$fp-fields-icon: "\ea17"; +$fp-fullscreen: "\ea18"; +$fp-github: "\ea19"; +$fp-layout-icon: "\ea1a"; +$fp-map: "\ea1b"; +$fp-mobile: "\ea1c"; +$fp-pdf: "\ea1d"; +$fp-plus: "\ea1e"; +$fp-slack-notification: "\ea1f"; +$fp-slack: "\ea20"; +$fp-slideshow: "\ea21"; +$fp-table: "\ea22"; diff --git a/resources/fonts/pm-font/processmaker-font.styl b/resources/fonts/pm-font/processmaker-font.styl index 44c4df44d3..5d96da6e6d 100644 --- a/resources/fonts/pm-font/processmaker-font.styl +++ b/resources/fonts/pm-font/processmaker-font.styl @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1723741916029'); /* IE9*/ - src: url('processmaker-font.eot?t=1723741916029#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1723741916029") format("woff2"), - url("processmaker-font.woff?t=1723741916029") format("woff"), - url('processmaker-font.ttf?t=1723741916029') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1723741916029#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1726428928126'); /* IE9*/ + src: url('processmaker-font.eot?t=1726428928126#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1726428928126") format("woff2"), + url("processmaker-font.woff?t=1726428928126") format("woff"), + url('processmaker-font.ttf?t=1726428928126') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1726428928126#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -33,15 +33,18 @@ .fp-brush-icon:before { content: "\ea11"; } .fp-close:before { content: "\ea12"; } .fp-copy:before { content: "\ea13"; } -.fp-desktop:before { content: "\ea14"; } -.fp-eye:before { content: "\ea15"; } -.fp-fullscreen:before { content: "\ea16"; } -.fp-github:before { content: "\ea17"; } -.fp-map:before { content: "\ea18"; } -.fp-mobile:before { content: "\ea19"; } -.fp-pdf:before { content: "\ea1a"; } -.fp-plus:before { content: "\ea1b"; } -.fp-slack-notification:before { content: "\ea1c"; } -.fp-slack:before { content: "\ea1d"; } -.fp-slideshow:before { content: "\ea1e"; } -.fp-table:before { content: "\ea1f"; } +.fp-css-icon:before { content: "\ea14"; } +.fp-desktop:before { content: "\ea15"; } +.fp-eye:before { content: "\ea16"; } +.fp-fields-icon:before { content: "\ea17"; } +.fp-fullscreen:before { content: "\ea18"; } +.fp-github:before { content: "\ea19"; } +.fp-layout-icon:before { content: "\ea1a"; } +.fp-map:before { content: "\ea1b"; } +.fp-mobile:before { content: "\ea1c"; } +.fp-pdf:before { content: "\ea1d"; } +.fp-plus:before { content: "\ea1e"; } +.fp-slack-notification:before { content: "\ea1f"; } +.fp-slack:before { content: "\ea20"; } +.fp-slideshow:before { content: "\ea21"; } +.fp-table:before { content: "\ea22"; } diff --git a/resources/fonts/pm-font/processmaker-font.svg b/resources/fonts/pm-font/processmaker-font.svg index ebbfeecb95..386421f007 100644 --- a/resources/fonts/pm-font/processmaker-font.svg +++ b/resources/fonts/pm-font/processmaker-font.svg @@ -64,41 +64,50 @@ - + + + diff --git a/resources/fonts/pm-font/processmaker-font.symbol.svg b/resources/fonts/pm-font/processmaker-font.symbol.svg index 5361f2306f..3bd908799b 100644 --- a/resources/fonts/pm-font/processmaker-font.symbol.svg +++ b/resources/fonts/pm-font/processmaker-font.symbol.svg @@ -79,17 +79,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/fonts/pm-font/processmaker-font.ttf b/resources/fonts/pm-font/processmaker-font.ttf index 4771ce7f30..28c5fa9f9a 100644 Binary files a/resources/fonts/pm-font/processmaker-font.ttf and b/resources/fonts/pm-font/processmaker-font.ttf differ diff --git a/resources/fonts/pm-font/processmaker-font.woff b/resources/fonts/pm-font/processmaker-font.woff index 82e88be2a7..d986ea99ea 100644 Binary files a/resources/fonts/pm-font/processmaker-font.woff and b/resources/fonts/pm-font/processmaker-font.woff differ diff --git a/resources/fonts/pm-font/processmaker-font.woff2 b/resources/fonts/pm-font/processmaker-font.woff2 index 3f0769b4bc..18661a8b7d 100644 Binary files a/resources/fonts/pm-font/processmaker-font.woff2 and b/resources/fonts/pm-font/processmaker-font.woff2 differ diff --git a/resources/fonts/pm-font/symbol.html b/resources/fonts/pm-font/symbol.html index 9897203a0f..91a19e3b08 100644 --- a/resources/fonts/pm-font/symbol.html +++ b/resources/fonts/pm-font/symbol.html @@ -101,7 +101,7 @@

-

ProcessMaker Icons4.11.0+beta-2

+

ProcessMaker Icons4.11.2-RC1

Icons generated with svgtofont. For add new icons, please check the README file
@@ -247,6 +247,13 @@

fp-close

fp-copy

+
  • + +

    fp-css-icon

    +
    • +

  • fp-desktop

    fp-eye

    • +
  • + +

    fp-fields-icon

    +
    • +

  • fp-fullscreen

    fp-github

    • +
  • + +

    fp-layout-icon

    +
    • +
  • -

    ProcessMaker Icons4.11.0+beta-2

    +

    ProcessMaker Icons4.11.2-RC1

    Icons generated with svgtofont. For add new icons, please check the README file
    @@ -134,7 +134,7 @@

    ProcessMaker Icons4.11.0+beta-2

      -

    • bpmn-action-by-email

      

    • bpmn-data-connector

      

    • bpmn-data-object

      

    • bpmn-data-store

      

    • bpmn-docusign

      

    • bpmn-end-event

      

    • bpmn-flowgenie

      

    • bpmn-gateway

      

    • bpmn-generic-gateway

      

    • bpmn-idp

      

    • bpmn-intermediate-event

      

    • bpmn-pool

      

    • bpmn-send-email

      

    • bpmn-start-event

      

    • bpmn-task

      

    • bpmn-text-annotation

      

    • brush-icon

      

    • close

      

    • copy

      

    • desktop

      

    • eye

      

    • fullscreen

      

    • github

      

    • map

      

    • mobile

      

    • pdf

      

    • plus

      

    • slack-notification

      

    • slack

      

    • slideshow

      

    • table

      
      • +

    • bpmn-action-by-email

      

    • bpmn-data-connector

      

    • bpmn-data-object

      

    • bpmn-data-store

      

    • bpmn-docusign

      

    • bpmn-end-event

      

    • bpmn-flowgenie

      

    • bpmn-gateway

      

    • bpmn-generic-gateway

      

    • bpmn-idp

      

    • bpmn-intermediate-event

      

    • bpmn-pool

      

    • bpmn-send-email

      

    • bpmn-start-event

      

    • bpmn-task

      

    • bpmn-text-annotation

      

    • brush-icon

      

    • close

      

    • copy

      

    • css-icon

      

    • desktop

      

    • eye

      

    • fields-icon

      

    • fullscreen

      

    • github

      

    • layout-icon

      

    • map

      

    • mobile

      

    • pdf

      

    • plus

      

    • slack-notification

      

    • slack

      

    • slideshow

      

    • table

      

    diff --git a/resources/sass/app.scss b/resources/sass/app.scss index efc6dc60d8..78805bc012 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -1107,4 +1107,16 @@ nav { } .carousel-indicators .active { background-color: #9c9c9c; +} + + +// Screen Builder Template Card Styling +.screenbuilder-template-card .card-body { + padding: 0px !important; +} + +.apply-options-container .custom-control-label { + display: flex; + align-items: flex-end; + margin-bottom: 2px; } \ No newline at end of file