Skip to content

Commit

Permalink
Merge pull request #9222 from kodadot/beta
Browse files Browse the repository at this point in the history
release update
  • Loading branch information
yangwao authored Feb 1, 2024
2 parents f285088 + 20772fd commit 25c73e3
Show file tree
Hide file tree
Showing 146 changed files with 5,341 additions and 3,814 deletions.
2 changes: 1 addition & 1 deletion .github/actions/pnpm-install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ runs:
- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: '18.13'
node-version: 20

- uses: pnpm/action-setup@v2
name: Install pnpm
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.libs-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: Build libs/ui package

on:
push:
branches: [ main, beta, production, nuxt ]
branches: [main, beta, production, nuxt]
paths:
- 'libs/ui/**'
pull_request:
branches: [ main, beta, production, nuxt ]
branches: [main, beta, production, nuxt]
paths:
- 'libs/ui/**'

Expand All @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: Install dependencies
uses: ./.github/actions/pnpm-install
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
name: Playwright Tests
on:
push:
branches: [ main, beta, production, nuxt ]
branches: [main, beta, production, nuxt]
pull_request:
branches: [ main, beta, production, nuxt ]
branches: [main, beta, production, nuxt]
jobs:
test:
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 20

- name: Install dependencies
uses: ./.github/actions/pnpm-install
- name: Install dependencies
uses: ./.github/actions/pnpm-install

- name: Run Build
run: pnpm generate

- name: Install Playwright Browsers
run: pnpm exec playwright install --with-deps chromium
- name: Run Build
run: pnpm generate

- name: Run Playwright tests
run: pnpm exec playwright test
- uses: actions/upload-artifact@v3
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30
- name: Install Playwright Browsers
run: pnpm exec playwright install --with-deps chromium

- name: Run Playwright tests
run: pnpm exec playwright test
- uses: actions/upload-artifact@v3
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30
2 changes: 1 addition & 1 deletion .github/workflows/reviewdog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: ./.github/actions/pnpm-install

- name: Run eslint with reviewdog
uses: reviewdog/action-eslint@v1.16.0
uses: reviewdog/action-eslint@v1.22.0
with:
level: error
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Dockerfile
FROM node:18
FROM node:20

# Set the same pnpm version as the version in the package.json
ENV PNPM_VERSION 8.6.0
Expand Down
128 changes: 123 additions & 5 deletions assets/styles/components/_carousel-arrows.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@


.arrow {
$side-y: 32px;
$side-x: 55px;

&-small-size {
$side-y: 20px;
$side-x: 32px;
}

width: $side-x;
height: $side-x;
@apply absolute -translate-y-2/4 cursor-pointer top-2/4;
Expand Down Expand Up @@ -112,3 +109,124 @@
display: none;
}
}



// We have to duplicate this block to use variables properly unless upgrade to sass 3.x version
// red: https://stackoverflow.com/questions/12365703/scss-variable-scope

.arrow-small-size {
$side-y-small: 20px;
$side-x-small: 32px;
&.arrow {

width: $side-x-small;
height: $side-x-small;

@apply absolute -translate-y-2/4 cursor-pointer top-2/4;
-webkit-transform: translateY(-50%);

&-left {
left: -30px;

border-bottom: solid $side-y-small transparent;
border-top: solid $side-y-small transparent;
@include ktheme() {
border-right: solid $side-x-small theme('black');
}
&::after {
content: '';
width: 0;
height: 0;

position: absolute;
border-bottom: solid $side-y-small - 2 transparent;
border-top: solid $side-y-small - 2 transparent;
@include ktheme() {
border-right: solid $side-x-small - 2 theme('white');
}
top: -($side-y-small - 2);
right: -($side-x-small - 1);
transition-duration: 0.2s;
}

&::before {
content: '';
width: 0;
height: 0;

position: absolute;
border-bottom: solid $side-y-small transparent;
border-top: solid $side-y-small transparent;
@include ktheme() {
border-right: solid $side-x-small theme('black');
}

top: -($side-y-small - 6);
right: -($side-x-small + 4);
}
}

&-right {
left: auto;
right: -30px;

border-bottom: solid $side-y-small transparent;
border-top: solid $side-y-small transparent;
@include ktheme() {
border-left: solid $side-x-small theme('black');
}
&::after {
content: '';
width: 0;
height: 0;

position: absolute;
border-bottom: solid $side-y-small - 2 transparent;
border-top: solid $side-y-small - 2 transparent;
@include ktheme() {
border-left: solid $side-x-small - 2 theme('white');
}
top: -($side-y-small - 2);
left: -($side-x-small - 1);
transition-duration: 0.2s;
}

&::before {
content: '';
width: 0;
height: 0;

position: absolute;
border-bottom: solid $side-y-small transparent;
border-top: solid $side-y-small transparent;
@include ktheme() {
border-left: solid $side-x-small theme('black');
}
top: -($side-y-small - 6);
left: -($side-x-small - 4);
}
}

&:hover {
&.arrow-left::after {
@include ktheme() {
border-right: solid $side-x-small - 2 theme('k-accentlight');
}
}

&.arrow-right::after {
@include ktheme() {
border-left: solid $side-x-small - 2 theme('k-accentlight');
}
}
}

@media screen and (max-width: 640px) {
display: none;
}
}

}


36 changes: 2 additions & 34 deletions assets/styles/components/_carousel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,40 +45,8 @@
}
}

.carousel-info {
padding: 16px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;

&-name {
width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

&-collection {
display: flex;
justify-content: space-between;
align-items: center;
&-name {
@include ktheme() {
color: theme('k-grey');
}
}
}

&-arrow {
@include ktheme() {
color: theme('text-color');
}
font-family: 'Fira Code', monospace;
}
}

.navigation-wrapper {
position: relative;
.carousel-info-arrow {
font-family: 'Fira Code', monospace;
}

.dots {
Expand Down
8 changes: 1 addition & 7 deletions assets/styles/components/_collection-card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,7 @@
}
}
&__name {
padding-left: 32px;
padding-right: 20px;
text-overflow: ellipsis;
font-weight: 700;
font-size: 1rem;
overflow: hidden;
white-space: nowrap;
@apply text-ellipsis font-bold text-base overflow-hidden whitespace-nowrap pl-8 pr-5;
line-height: $header-height;
&:hover {
@include ktheme() {
Expand Down
13 changes: 1 addition & 12 deletions assets/styles/components/_search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@

.search-bar-collection-search {
@apply z-[2] absolute h-6 gap-[0.35rem] left-10 top-2 cursor-default;

span {
@apply h-5 px-4 py-0 rounded-[4rem];

Expand Down Expand Up @@ -186,17 +186,6 @@
padding: 10px $desktop-padding-x;
}

.main-title {
font-weight: 700;
}

.name {
max-width: 34ch;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.secondary-info {
@include mobile {
flex-direction: column !important;
Expand Down
Loading

0 comments on commit 25c73e3

Please sign in to comment.