Skip to content

Commit

Permalink
feat: ERP deveopment environment icon
Browse files Browse the repository at this point in the history
  • Loading branch information
vukbgit committed Jan 20, 2022
1 parent d97f633 commit 53e3c1f
Show file tree
Hide file tree
Showing 14 changed files with 85 additions and 55 deletions.
36 changes: 25 additions & 11 deletions installation/public/share/simplex/Erp/Fontello/config.json
Original file line number Diff line number Diff line change
@@ -1,70 +1,84 @@
{
"name": "",
"css_prefix_text": "icon-",
"css_prefix_text": "icon-erp-",
"css_use_suffix": false,
"hinting": true,
"units_per_em": 1000,
"ascent": 850,
"glyphs": [
{
"uid": "74b2f1d1ee541715b3f389f7cdf63d1c",
"css": "erp-sign-out",
"css": "sign-out",
"code": 357,
"src": "websymbols"
},
{
"uid": "56a21935a5d4d79b2e91ec00f760b369",
"css": "erp-sort",
"css": "sort",
"code": 358,
"src": "fontawesome"
},
{
"uid": "94103e1b3f1e8cf514178ec5912b4469",
"css": "erp-triangle-down",
"css": "triangle-down",
"code": 359,
"src": "fontawesome"
},
{
"uid": "65b3ce930627cabfb6ac81ac60ec5ae4",
"css": "erp-triangle-up",
"css": "triangle-up",
"code": 360,
"src": "fontawesome"
},
{
"uid": "a66e72da83c98248ae3ef43808efc452",
"css": "erp-plus-circle",
"css": "plus-circle",
"code": 361,
"src": "websymbols"
},
{
"uid": "994eaa764b3f30721f3839c64c390ce3",
"css": "erp-minus-circle",
"css": "minus-circle",
"code": 362,
"src": "websymbols"
},
{
"uid": "3fce1eca43f917c8f23e532749abae5d",
"css": "erp-user",
"css": "user",
"code": 62142,
"src": "fontawesome"
},
{
"uid": "750058837a91edae64b03d60fc7e81a7",
"css": "erp-ellipsis-vert",
"css": "ellipsis-vert",
"code": 364,
"src": "fontawesome"
},
{
"uid": "8beac4a5fd5bed9f82ca7a96cc8ba218",
"css": "erp-password",
"css": "password",
"code": 365,
"src": "entypo"
},
{
"uid": "3e02a8849305ac80a0e36302f461f265",
"css": "erp-help",
"css": "help",
"code": 366,
"src": "mfglabs"
},
{
"uid": "3f1bd8658c49470602f9a59da3cb97be",
"css": "development",
"code": 367,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M951.6 68.6H48.4C21.7 68.6 0 90.3 0 117V683.6C0 710.4 21.7 732.1 48.4 732.1H386.2V841.8H254.8C230.1 841.8 210 861.9 210 886.6S230.1 931.4 254.8 931.4H745.2C769.9 931.4 790 911.3 790 886.6S769.9 841.8 745.2 841.8H613.8V732.1H951.6C978.3 732.1 1000 710.4 1000 683.6V117C1000 90.3 978.3 68.6 951.6 68.6ZM927.4 659.4H72.6V141.3H927.4V659.4ZM229 427.7L381.8 498.7C385.7 500.6 389.9 501.5 394.3 501.5 399.9 501.5 405.5 499.9 410.3 496.8 418.8 491.3 424 482 424 471.8V471C424 459.5 417.2 449 406.8 444.1L311.3 399.7 406.8 355.3C417.2 350.5 424 339.9 424 328.4V327.6C424 317.4 418.8 308.1 410.3 302.6 405.5 299.6 400 298 394.3 298 390 298 385.6 298.9 381.8 300.7L229 371.7C218.6 376.6 211.9 387.2 211.9 398.7V400.8C211.9 412.3 218.6 422.8 229 427.7ZM425.3 572.4C430.9 580 439.9 584.6 449.3 584.6H450.1C463 584.6 474.4 576.3 478.3 563.9L579 252.2C581.8 243.2 580.2 233.2 574.7 225.6 569.1 218 560.1 213.4 550.7 213.4H549.9C537 213.4 525.6 221.7 521.7 234L421 545.8C418.2 554.8 419.8 564.8 425.3 572.4ZM576 328.4C576 339.9 582.8 350.5 593.2 355.3L688.7 399.7 593.2 444.1C582.8 448.9 576 459.5 576 471V471.8C576 482 581.1 491.3 589.7 496.8 594.5 499.9 600 501.5 605.7 501.5 610.1 501.5 614.3 500.6 618.2 498.7L771 427.7C781.4 422.8 788.1 412.3 788.1 400.8V398.6C788.1 387.2 781.4 376.6 771 371.7L618.2 300.7C614.4 298.9 610.1 298 605.8 298 600 298 594.5 299.6 589.8 302.6 581.2 308.1 576 317.4 576 327.6V328.4L576 328.4Z",
"width": 1000
},
"search": [
"development"
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
.icon-erp-ellipsis-vert:before { content: '\016c'; } /* 'Ŭ' */
.icon-erp-password:before { content: '\016d'; } /* 'ŭ' */
.icon-erp-help:before { content: '\016e'; } /* 'Ů' */
.icon-erp-development:before { content: '\016f'; } /* 'ů' */
.icon-erp-user:before { content: '\f2be'; } /* '' */

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
.icon-erp-ellipsis-vert { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ŭ '); }
.icon-erp-password { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ŭ '); }
.icon-erp-help { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ů '); }
.icon-erp-development { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ů '); }
.icon-erp-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[class^="icon-"], [class*=" icon-"] {
[class^="icon-erp-"], [class*=" icon-erp-"] {
font-family: 'fontello';
font-style: normal;
font-weight: normal;
Expand All @@ -19,4 +19,5 @@
.icon-erp-ellipsis-vert { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ŭ '); }
.icon-erp-password { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ŭ '); }
.icon-erp-help { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ů '); }
.icon-erp-development { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ů '); }
.icon-erp-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
17 changes: 9 additions & 8 deletions installation/public/share/simplex/Erp/Fontello/css/fontello.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: 'fontello';
src: url('../font/fontello.eot?13190926');
src: url('../font/fontello.eot?13190926#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?13190926') format('woff2'),
url('../font/fontello.woff?13190926') format('woff'),
url('../font/fontello.ttf?13190926') format('truetype'),
url('../font/fontello.svg?13190926#fontello') format('svg');
src: url('../font/fontello.eot?20625204');
src: url('../font/fontello.eot?20625204#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?20625204') format('woff2'),
url('../font/fontello.woff?20625204') format('woff'),
url('../font/fontello.ttf?20625204') format('truetype'),
url('../font/fontello.svg?20625204#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
Expand All @@ -15,11 +15,11 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
src: url('../font/fontello.svg?13190926#fontello') format('svg');
src: url('../font/fontello.svg?20625204#fontello') format('svg');
}
}
*/
[class^="icon-"]:before, [class*=" icon-"]:before {
[class^="icon-erp-"]:before, [class*=" icon-erp-"]:before {
font-family: "fontello";
font-style: normal;
font-weight: normal;
Expand Down Expand Up @@ -63,4 +63,5 @@
.icon-erp-ellipsis-vert:before { content: '\016c'; } /* 'Ŭ' */
.icon-erp-password:before { content: '\016d'; } /* 'ŭ' */
.icon-erp-help:before { content: '\016e'; } /* 'Ů' */
.icon-erp-development:before { content: '\016f'; } /* 'ů' */
.icon-erp-user:before { content: '\f2be'; } /* '' */
13 changes: 8 additions & 5 deletions installation/public/share/simplex/Erp/Fontello/demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@
}
@font-face {
font-family: 'fontello';
src: url('./font/fontello.eot?79986345');
src: url('./font/fontello.eot?79986345#iefix') format('embedded-opentype'),
url('./font/fontello.woff?79986345') format('woff'),
url('./font/fontello.ttf?79986345') format('truetype'),
url('./font/fontello.svg?79986345#fontello') format('svg');
src: url('./font/fontello.eot?92604453');
src: url('./font/fontello.eot?92604453#iefix') format('embedded-opentype'),
url('./font/fontello.woff?92604453') format('woff'),
url('./font/fontello.ttf?92604453') format('truetype'),
url('./font/fontello.svg?92604453#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down Expand Up @@ -242,6 +242,9 @@ <h1>fontello <small>font demo</small></h1>
<div class="span3" title="Code: 0x016e">
<i class="demo-icon icon-erp-help">&#x016e;</i> <span class="i-name">icon-erp-help</span><span class="i-code">0x016e</span>
</div>
<div class="span3" title="Code: 0x016f">
<i class="demo-icon icon-erp-development">&#x016f;</i> <span class="i-name">icon-erp-development</span><span class="i-code">0x016f</span>
</div>
<div class="span3" title="Code: 0xf2be">
<i class="demo-icon icon-erp-user">&#xf2be;</i> <span class="i-name">icon-erp-user</span><span class="i-code">0xf2be</span>
</div>
Expand Down
Binary file modified installation/public/share/simplex/Erp/Fontello/font/fontello.eot
Binary file not shown.
24 changes: 13 additions & 11 deletions installation/public/share/simplex/Erp/Fontello/font/fontello.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installation/public/share/simplex/Erp/Fontello/font/fontello.ttf
Binary file not shown.
Binary file modified installation/public/share/simplex/Erp/Fontello/font/fontello.woff
Binary file not shown.
Binary file modified installation/public/share/simplex/Erp/Fontello/font/fontello.woff2
Binary file not shown.
3 changes: 3 additions & 0 deletions src/Erp/sass/erp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,6 @@ fieldset {
padding-left:5px
}
}
.icon-erp-development {
font-size: 2rem;
}
27 changes: 15 additions & 12 deletions src/Erp/templates/frame.twig
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,23 @@
{% endif %}
{% endblock %}
</div>
<div class="d-flex flex-grow-1 justify-content-end align-items-center">
{% if constant('ENVIRONMENT') == 'development' %}
<div class="mr-3 icon-erp-development text-warning"></div>
{% endif %}
{% if hideUser == false %}
<div class="flex-grow-1 text-right">
<span>{{ userData.username }}</span>
<i class="icon-erp-user"></i>
</div>
<ul class="navbar-nav ml-auto px-3">
<li class="nav-item text-nowrap">
<a class="nav-link" href="{{ routeParameters.authentication.urls.signOut }}">
{{ 'Sign out'|trans }}
<i class="icon-erp-sign-out"></i>
</a>
</li>
</ul>
<div>{{ userData.username }}</div>
<i class="icon-erp-user"></i>
<ul class="navbar-nav px-3">
<li class="nav-item text-nowrap">
<a class="nav-link" href="{{ routeParameters.authentication.urls.signOut }}">
{{ 'Sign out'|trans }}
<i class="icon-erp-sign-out"></i>
</a>
</li>
</ul>
{% endif %}
</div>
</nav>

<div class="container-fluid">
Expand Down

0 comments on commit 53e3c1f

Please sign in to comment.