Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:
- name: Build Docker images
env:
GENERATE_SOURCEMAP: ''
run: docker-compose -f docker-compose.build.yml build
run: docker compose -f docker-compose.build.yml build
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Push images to GitHub Container Registry
run: docker-compose -f docker-compose.build.yml push
run: docker compose -f docker-compose.build.yml push
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:
- name: Build Docker images
env:
GENERATE_SOURCEMAP: false
run: docker-compose -f docker-compose.build.yml build
run: docker compose -f docker-compose.build.yml build
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Push images to GitHub Container Registry
run: docker-compose -f docker-compose.build.yml push
run: docker compose -f docker-compose.build.yml push
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
env:
TAG: latest
GENERATE_SOURCEMAP: false
run: docker-compose -f docker-compose.build.yml build
run: docker compose -f docker-compose.build.yml build
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opex",
"version": "v1.0.9-beta.18",
"version": "v1.0.11-beta.19",
"homepage": "",
"private": true,
"dependencies": {
Expand Down
10 changes: 5 additions & 5 deletions public/assets/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
"commission": "Commission",
"nextStep": "Next Step",
"prevStep": "Prev Step",
"next": "next",
"all": "all",
"prev": "prev",
"next": "Next",
"all": "ALL",
"prev": "Prev",
"ask": "ask",
"bid": "bid",
"to": "to",
Expand Down Expand Up @@ -252,8 +252,8 @@
"depositTx" : "Deposit History",
"destAddress" : "Dest Address",
"txType" : "Transaction Type",
"coin": "Coins",
"category": "Categories",
"coin": "Coin",
"category": "Category",
"size": "Number",
"period" : "Period",
"assetBlock" : "Reservation",
Expand Down
70 changes: 63 additions & 7 deletions src/assets/fontIcon/opex-icon/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
{
"uid": "1dq4tek4k8ea7zlj4kc3w83itnutaxg5",
"css": "cancel",
"css": "cancel-1",
"code": 262,
"src": "typicons"
},
Expand Down Expand Up @@ -74,13 +74,13 @@
},
{
"uid": "d9be617b7f2fe7843118ca2d3a1b8cca",
"css": "down-open-1",
"css": "down-open-2",
"code": 273,
"src": "mfglabs"
},
{
"uid": "440e148d0e21100118eae7036bcd2067",
"css": "up-open-1",
"css": "up-open-2",
"code": 274,
"src": "mfglabs"
},
Expand Down Expand Up @@ -436,7 +436,7 @@
},
{
"uid": "7e4164950ffa4990961958b2d6318658",
"css": "info-circled",
"css": "info-circled-1",
"code": 340,
"src": "entypo"
},
Expand Down Expand Up @@ -726,7 +726,7 @@
},
{
"uid": "616b755d0f4c7d2dc7a1dcc2e5427039",
"css": "down-open-2",
"css": "down-open-1",
"code": 389,
"src": "elusive"
},
Expand Down Expand Up @@ -927,7 +927,7 @@
{
"uid": "dc7cd709066fc723e342c5e8a5dc45dd",
"css": "cicle-plus-01",
"code": 521,
"code": 59426,
"src": "custom_icons",
"selected": true,
"svg": {
Expand All @@ -941,7 +941,7 @@
{
"uid": "f022243a5960b8c63529a647d92d78bf",
"css": "exchange-arrow",
"code": 528,
"code": 59427,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -975,6 +975,62 @@
"css": "up",
"code": 532,
"src": "mfglabs"
},
{
"uid": "da33a9f92d491a8737c0709560c93a2e",
"css": "sheets",
"code": 59428,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M534.7 0C527.4 0 520.2 1.5 513.5 4.4L37.2 210.7C14.7 220.4 0 242.7 0 267.2S14.7 314.1 37.2 323.8L513.5 530.2C527 536.1 542.4 536.1 556 530.2L1032.2 323.8C1054.8 313.9 1069.3 291.8 1069.3 267.2 1069.3 242.5 1054.7 220.4 1032.1 210.7L555.9 4.4C549.1 1.5 541.8 0 534.7 0ZM1021.1 449.9C1012.5 449.1 1003.3 450.3 994.4 454.1L962.3 468V468.1L534.7 653.5 74.4 454.3C39.3 439.2 0 465 0 503.3 0 524.5 12.6 543.6 32.1 552.1L513.3 760.6C526.9 766.5 542.3 766.5 555.9 760.6L1037.1 552.1C1056.6 543.6 1069.2 524.5 1069.2 503.2 1069.2 474.3 1047.2 452.6 1021.1 449.9ZM1021.1 684.8C1012.5 684 1003.3 685.2 994.4 689L962.3 703V703.2L534.7 888.4 74.4 689.3C39.3 674.1 0 699.9 0 738.3 0 759.5 12.6 778.8 32.1 787.3L513.3 995.6C526.9 1001.6 542.3 1001.6 555.9 995.6L1037.1 787.3C1056.6 778.8 1069.2 759.5 1069.2 738.2 1069.2 709.2 1047.2 687.5 1021.1 684.8Z",
"width": 1069
},
"search": [
"sheets"
]
},
{
"uid": "8b6cfe05dc281216c0a864790806e744",
"css": "home",
"code": 2096,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M964.3 517.1C953.9 544.6 928.3 562.5 899 562.5H875V906.3C875 923.5 861 937.5 843.8 937.5H656.3V718.8C656.3 632.6 586.1 562.5 500 562.5S343.8 632.6 343.8 718.8V937.5H156.3C139 937.5 125 923.5 125 906.3V562.5H101.1C71.8 562.5 46.1 544.8 35.9 517.1 25.5 489.5 33.1 459.3 55.3 439.9L420.3 94.2C465.1 51.9 535.3 51.9 580 94.2L945.9 440.6C966.9 459.3 974.5 489.5 964.3 517.1Z",
"width": 1000
},
"search": [
"home-house-svgrepo-com"
]
},
{
"uid": "14ce40ea79b48b43fc394311b4779570",
"css": "home-house-svgrepo-com",
"code": 59428,
"src": "custom_icons",
"selected": false,
"svg": {
"path": "M38.6 20.7C38.2 21.8 37.1 22.5 36 22.5H35V36.3C35 36.9 34.4 37.5 33.8 37.5H26.3V28.8C26.3 25.3 23.4 22.5 20 22.5S13.8 25.3 13.8 28.8V37.5H6.3C5.6 37.5 5 36.9 5 36.3V22.5H4C2.9 22.5 1.8 21.8 1.4 20.7 1 19.6 1.3 18.4 2.2 17.6L16.8 3.8C18.6 2.1 21.4 2.1 23.2 3.8L37.8 17.6C38.7 18.4 39 19.6 38.6 20.7Z",
"width": 1000
},
"search": [
"home-house-svgrepo-com"
]
},
{
"uid": "2832f83cb0fa22a8fbc4e73b04d6abc9",
"css": "home-house-svgrepo-com",
"code": 59429,
"src": "custom_icons",
"selected": false,
"svg": {
"path": "M38.6 20.7C38.2 21.8 37.1 22.5 36 22.5H35V36.3C35 36.9 34.4 37.5 33.8 37.5H26.3V28.8C26.3 25.3 23.4 22.5 20 22.5S13.8 25.3 13.8 28.8V37.5H6.3C5.6 37.5 5 36.9 5 36.3V22.5H4C2.9 22.5 1.8 21.8 1.4 20.7 1 19.6 1.3 18.4 2.2 17.6L16.8 3.8C18.6 2.1 21.4 2.1 23.2 3.8L37.8 17.6C38.7 18.4 39 19.6 38.6 20.7Z",
"width": 1000
},
"search": [
"home-house-svgrepo-com"
]
}
]
}
16 changes: 9 additions & 7 deletions src/assets/fontIcon/opex-icon/css/opex-icon-codes.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
.icon-plus:before { content: '\0103'; } /* 'ă' */
.icon-star:before { content: '\0104'; } /* 'Ą' */
.icon-star-filled:before { content: '\0105'; } /* 'ą' */
.icon-cancel:before { content: '\0106'; } /* 'Ć' */
.icon-cancel-1:before { content: '\0106'; } /* 'Ć' */
.icon-eye:before { content: '\0107'; } /* 'ć' */
.icon-sun-filled:before { content: '\0108'; } /* 'Ĉ' */
.icon-sun:before { content: '\0109'; } /* 'ĉ' */
.icon-infinity:before { content: '\0110'; } /* 'Đ' */
.icon-down-open-1:before { content: '\0111'; } /* 'đ' */
.icon-up-open-1:before { content: '\0112'; } /* 'Ē' */
.icon-down-open-2:before { content: '\0111'; } /* 'đ' */
.icon-up-open-2:before { content: '\0112'; } /* 'Ē' */
.icon-envelope-open:before { content: '\0113'; } /* 'ē' */
.icon-star-1:before { content: '\0120'; } /* 'Ġ' */
.icon-chat:before { content: '\0121'; } /* 'ġ' */
Expand Down Expand Up @@ -40,7 +40,7 @@
.icon-calendar-empty:before { content: '\0146'; } /* 'ņ' */
.icon-calendar-2:before { content: '\0147'; } /* 'Ň' */
.icon-calendar-3:before { content: '\0148'; } /* 'ň' */
.icon-info-circled:before { content: '\0154'; } /* 'Ŕ' */
.icon-info-circled-1:before { content: '\0154'; } /* 'Ŕ' */
.icon-help-circled:before { content: '\0156'; } /* 'Ŗ' */
.icon-help-circled-1:before { content: '\0157'; } /* 'ŗ' */
.icon-help-circled-2:before { content: '\0158'; } /* 'Ř' */
Expand All @@ -57,7 +57,7 @@
.icon-eq:before { content: '\0182'; } /* 'Ƃ' */
.icon-resize-vertical:before { content: '\0183'; } /* 'ƃ' */
.icon-resize-vertical-1:before { content: '\0184'; } /* 'Ƅ' */
.icon-down-open-2:before { content: '\0185'; } /* 'ƅ' */
.icon-down-open-1:before { content: '\0185'; } /* 'ƅ' */
.icon-braille:before { content: '\0186'; } /* 'Ɔ' */
.icon-left-open:before { content: '\0187'; } /* 'Ƈ' */
.icon-right-open:before { content: '\0188'; } /* 'ƈ' */
Expand All @@ -74,12 +74,11 @@
.icon-trash:before { content: '\0206'; } /* 'Ȇ' */
.icon-trash-1:before { content: '\0207'; } /* 'ȇ' */
.icon-trash-2:before { content: '\0208'; } /* 'Ȉ' */
.icon-cicle-plus-01:before { content: '\0209'; } /* 'ȉ' */
.icon-exchange-arrow:before { content: '\0210'; } /* 'Ȑ' */
.icon-down:before { content: '\0211'; } /* 'ȑ' */
.icon-left:before { content: '\0212'; } /* 'Ȓ' */
.icon-right:before { content: '\0213'; } /* 'ȓ' */
.icon-up:before { content: '\0214'; } /* 'Ȕ' */
.icon-home:before { content: '\0830'; } /* '࠰' */
.icon-market:before { content: '\e800'; } /* '' */
.icon-cancel-circled2:before { content: '\e801'; } /* '' */
.icon-settings:before { content: '\e802'; } /* '' */
Expand Down Expand Up @@ -114,3 +113,6 @@
.icon-op-03:before { content: '\e81f'; } /* '' */
.icon-row:before { content: '\e820'; } /* '' */
.icon-grid:before { content: '\e821'; } /* '' */
.icon-cicle-plus-01:before { content: '\e822'; } /* '' */
.icon-exchange-arrow:before { content: '\e823'; } /* '' */
.icon-sheets:before { content: '\e824'; } /* '' */
28 changes: 15 additions & 13 deletions src/assets/fontIcon/opex-icon/css/opex-icon-embedded.css

Large diffs are not rendered by default.

16 changes: 9 additions & 7 deletions src/assets/fontIcon/opex-icon/css/opex-icon-ie7-codes.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
.icon-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ă '); }
.icon-star { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ą '); }
.icon-star-filled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ą '); }
.icon-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ć '); }
.icon-cancel-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ć '); }
.icon-eye { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ć '); }
.icon-sun-filled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ĉ '); }
.icon-sun { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ĉ '); }
.icon-infinity { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Đ '); }
.icon-down-open-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'đ '); }
.icon-up-open-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ē '); }
.icon-down-open-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'đ '); }
.icon-up-open-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ē '); }
.icon-envelope-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ē '); }
.icon-star-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ġ '); }
.icon-chat { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ġ '); }
Expand Down Expand Up @@ -40,7 +40,7 @@
.icon-calendar-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ņ '); }
.icon-calendar-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ň '); }
.icon-calendar-3 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ň '); }
.icon-info-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ŕ '); }
.icon-info-circled-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ŕ '); }
.icon-help-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ŗ '); }
.icon-help-circled-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ŗ '); }
.icon-help-circled-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ř '); }
Expand All @@ -57,7 +57,7 @@
.icon-eq { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ƃ '); }
.icon-resize-vertical { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ƃ '); }
.icon-resize-vertical-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ƅ '); }
.icon-down-open-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ƅ '); }
.icon-down-open-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ƅ '); }
.icon-braille { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ɔ '); }
.icon-left-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ƈ '); }
.icon-right-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ƈ '); }
Expand All @@ -74,12 +74,11 @@
.icon-trash { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ȇ '); }
.icon-trash-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ȇ '); }
.icon-trash-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ȉ '); }
.icon-cicle-plus-01 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ȉ '); }
.icon-exchange-arrow { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ȑ '); }
.icon-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ȑ '); }
.icon-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ȓ '); }
.icon-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ȓ '); }
.icon-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ȕ '); }
.icon-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '࠰ '); }
.icon-market { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cancel-circled2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-settings { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand Down Expand Up @@ -114,3 +113,6 @@
.icon-op-03 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-row { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-grid { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cicle-plus-01 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-exchange-arrow { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-sheets { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Loading