Skip to content

Commit

Permalink
Merge branch 'develop' into fix-317
Browse files Browse the repository at this point in the history
  • Loading branch information
devchenyan authored Mar 13, 2024
2 parents 5b9ad71 + f94bb2a commit 7e1f402
Show file tree
Hide file tree
Showing 45 changed files with 1,291 additions and 347 deletions.
2 changes: 1 addition & 1 deletion .ckb-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.113.1
v0.114.0
2 changes: 2 additions & 0 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:

runs-on: ${{ matrix.os }}

environment: Release

name: ${{ matrix.os }}(Node.js ${{ matrix.node }})

steps:
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/package_for_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: Package Neuron for Test

on:
issue_comment:
types: [created, edited]
types: [created]
push:

jobs:
packaging:
if: ${{ (github.event_name == 'issue_comment' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/package')) || github.event_name == 'push' }}
if: ${{ (github.event_name == 'issue_comment' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/package') && contains(fromJSON('["OWNER", "COLLABORATOR"]'), github.event.comment.author_association)) || github.event_name == 'push' }}

strategy:
matrix:
Expand All @@ -20,6 +20,10 @@ jobs:

runs-on: ${{ matrix.os }}

permissions:
contents: read
pull-requests: read

name: ${{ matrix.os }}(Node.js ${{ matrix.node }})

env:
Expand Down Expand Up @@ -208,6 +212,9 @@ jobs:
needs: [packaging]
name: Append links to the Pull Request
runs-on: ubuntu-latest
permissions:
pull-requests: write
contents: write
steps:
- name: Comment by push event
if: ${{ github.event_name == 'push' }}
Expand All @@ -230,6 +237,8 @@ jobs:
if: ${{ always() && needs.packaging.result == 'failure' }}
name: Append failed comment to the comment
runs-on: ubuntu-latest
permissions:
pull-requests: write
steps:
- name: Comment by pull request comment event when package failed
if: ${{ github.event_name == 'issue_comment' }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/update_ckb_client_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ jobs:
default:
name: Update CKB client versions
runs-on: ubuntu-latest
environment: neuron-bot
permissions:
pull-requests: write # open PR
contents: write # update version files
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/update_neuron_compatible.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jobs:
update-neuron-compatible:
name: Update Neuron compatibility table
runs-on: ubuntu-latest
environment: neuron-bot
permissions:
pull-requests: write # open PR
contents: write # update version files
Expand Down
4 changes: 4 additions & 0 deletions compatible.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"fullVersions": [
"0.114",
"0.113",
"0.112",
"0.111",
Expand All @@ -19,6 +20,7 @@
"compatible": {
"0.111": {
"full": [
"0.114",
"0.113",
"0.112",
"0.111",
Expand All @@ -32,6 +34,7 @@
},
"0.110": {
"full": [
"0.114",
"0.113",
"0.112",
"0.111",
Expand Down Expand Up @@ -61,6 +64,7 @@
},
"0.112": {
"full": [
"0.114",
"0.113",
"0.112",
"0.111",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,272 @@
.cellInfoDialog {
min-width: 650px;
}

.title {
display: flex;
align-items: center;
gap: 4px;
font-size: 14px;

.outPoint {
display: flex;
padding: 5px 8px;
justify-content: center;
align-items: center;
gap: 8px;
border-radius: 16px;
border: 1px solid var(--divide-line-color);
background: var(--input-disabled-color);
font-weight: 400;
color: var(--main-text-color);

.hash {
font-family: 'JetBrains Mono';
}

& > svg {
path {
fill: var(--secondary-text-color);
}
}
}
}

.head {
display: flex;
gap: 4px;
align-items: center;
margin-bottom: 12px;

& > svg {
transform: rotate(-90deg);
path {
fill: var(--border-color);
}
}

[data-type='hash'] {
color: var(--third-text-color);
font-family: 'JetBrains Mono';
}

.liveIcon {
width: 8px;
height: 8px;
border-radius: 8px;
background-color: var(--primary-color);
}
}

.tabsClassName {
.tabsWrapClassName {
position: relative;
display: flex;
margin-bottom: 16px;
border-bottom: 1px solid var(--divide-line-color);

.tabsColumnClassName {
position: relative;
padding: 10px 20px;
font-size: 14px;
font-weight: 500;
color: var(--tabs-default-color);
background-color: transparent;
border: none;
margin-right: 10px;

&:hover {
font-weight: bold;
color: var(--tabs-active);
}

&.active {
color: var(--tabs-active);
border-bottom: 2px solid var(--tabs-active);
}
}
}
}

.scriptTable {
border-collapse: separate;
border-spacing: 0px;
width: 100%;
color: var(--main-text-color);

td {
padding: 8px;
border: 1px solid var(--divide-line-color);
text-align: center;
}

thead {
td {
border-bottom: 0;
&:nth-child(1) {
border-top-left-radius: 8px;
border-right: 0;
}
&:nth-last-child(1) {
border-top-right-radius: 8px;
}
}
}

tbody {
tr {
&:not(:nth-last-child(1)) {
td {
border-bottom: 0;
}
}
&:nth-last-child(1) {
td {
&:nth-child(1) {
border-bottom-left-radius: 8px;
}
&:nth-last-child(1) {
border-bottom-right-radius: 8px;
}
}
}
}
td {
&:not(:nth-last-child(1)) {
border-right: 0;
}
}
}
}

.content {
position: relative;

.switchFormat {
position: absolute;
right: 0;
top: 10px;
color: var(--main-text-color);
display: flex;
align-items: center;
}
}

.preStyle {
border: 1px solid var(--lock-info-title-border);
border-radius: 12px;
padding: 16px;
overflow-y: auto;
margin: 0;
color: var(--main-text-color);
font-family: 'JetBrains Mono';
display: block;
width: calc(100% - 32px);

&::selection {
background-color: var(--primary-color);
color: var(--primary-text-color);
}
}

.capacityUsed {
padding: 0 16px 16px;
.slider {
width: 616px;
height: 16px;
border-radius: 8px;
border: 1px solid var(--divide-line-color);
background-color: var(--secondary-background-color);
position: relative;

& > div {
position: absolute;
left: -1px;
top: -1px;
height: 100%;
border-radius: 8px;
border: 1px solid var(--primary-color);
background-color: var(--primary-color);
}
}
.capacityDetail {
color: var(--main-text-color);
font-style: normal;
font-weight: 400;
line-height: normal;
margin-top: 12px;
}
}

.dataAction {
position: fixed;
width: 496px;
border-radius: 8px;
background: var(--secondary-background-color);
box-shadow: 0px 2px 10px 0px var(--main-shadow-color);

.dataView {
color: var(--main-text-color);
font-weight: 500;
padding: 12px;
border-bottom: 1px solid var(--divide-line-color);
display: flex;
align-items: center;

.formatTypeBtn {
border: none;
cursor: pointer;
background-color: transparent;

&:hover,
&[data-activity='true'] {
color: var(--primary-color);
}

&[data-open='true'] {
& > svg {
transform: rotate(180deg);
}
}

& > svg {
margin-left: 4px;
path {
fill: var(--primary-color);
}
}
}

.dropdown {
position: relative;
margin-left: 12px;
.formatTypes {
position: absolute;
top: 100%;
left: 0;
background-color: var(--secondary-background-color);
border-radius: 4px;
box-shadow: 0px 2px 10px 0px var(--main-shadow-color);
display: flex;
flex-direction: column;
padding: 12px 8px;
margin: 0;
gap: 16px;
white-space: nowrap;
z-index: 10;
}
}
}

.dataFormat {
padding: 12px;
word-wrap: break-word;
}
}

.copyAddress {
margin-left: 4px;
position: relative;
top: 4px;
cursor: pointer;
}
Loading

1 comment on commit 7e1f402

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Packaging for test is done in 8262107705

Please sign in to comment.