Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: updated bridge page styling #1200

Merged
merged 7 commits into from
Feb 27, 2024
+285 −188
Merged

fix: updated bridge page styling #1200

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f62fdbe
wip
impelcrypto Feb 22, 2024
a22e3c0
wip
impelcrypto Feb 23, 2024
411e8d3
fix: updated bridge page styling
impelcrypto Feb 23, 2024
a1f1dce
fix: updated bridge page styling (2)
impelcrypto Feb 23, 2024
dfff212
fix: clean up
impelcrypto Feb 23, 2024
82520a6
fix: bg styling
impelcrypto Feb 27, 2024
5d1ad05
no histories to no transactions
gluneau Feb 27, 2024
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
Prev Previous commit
Next Next commit
wip
@impelcrypto
impelcrypto committed Feb 23, 2024
commit a22e3c0b818af83417318280bdbb6c30f7c6d0a3
164 changes: 88 additions & 76 deletions src/components/bridge/BridgeSelection.vue
View file
Original file line number Diff line number Diff line change
@@ -1,84 +1,96 @@
<template>
<div class="wrapper--bridge-selection">
<div class="container--selection">
<div class="column--selection">
<button :disabled="!isEnableEthBridge">
<component
:is="isEnableEthBridge ? 'router-link' : 'div'"
:to="buildEthereumBridgePageLink()"
class="button--bridge"
>
<div class="row--title">
<img class="img--logo" :src="require('src/assets/img/ethereum.png')" alt="ethereum" />
<span class="text--bridge-title">{{ $t('bridge.ethereumBridge.title') }}</span>
</div>
<div class="box--text-bridge">
<span class="text--bridge">
{{ $t('bridge.ethereumBridge.text', { l1: l1Name, l2: l2Name }) }}
</span>
</div>
</component>
</button>
<p class="text--bridge">
{{ $t('bridge.ethereumBridge.text2') }}
<a
href="https://docs.astar.network/docs/build/zkEVM/bridge-to-zkevm"
target="_blank"
rel="noopener noreferrer"
>
{{ $t('bridge.ethereumBridge.lean') }}
</a>
</p>
<div class="container--box">
<div class="container--title">
<span>Select a Bridge</span>
</div>
<div class="container--selection">
<div class="column--selection">
<button :disabled="!isEnableEthBridge">
<component
:is="isEnableEthBridge ? 'router-link' : 'div'"
:to="buildEthereumBridgePageLink()"
class="button--bridge"
>
<div class="row--title">
<img
class="img--logo"
:src="require('src/assets/img/ethereum.png')"
alt="ethereum"
/>
<span class="text--bridge-title">{{ $t('bridge.ethereumBridge.title') }}</span>
</div>
<div class="box--text-bridge">
<span class="text--bridge">
{{ $t('bridge.ethereumBridge.text', { l1: l1Name, l2: l2Name }) }}
</span>
</div>
</component>
</button>
<p class="text--bridge-details">
{{ $t('bridge.ethereumBridge.text2') }}
<a
href="https://docs.astar.network/docs/build/zkEVM/bridge-to-zkevm"
target="_blank"
rel="noopener noreferrer"
>
{{ $t('bridge.ethereumBridge.lean') }}
</a>
</p>
</div>

<div class="column--selection">
<button :disabled="!isEnableAstrBridge">
<component
:is="isEnableAstrBridge ? 'router-link' : 'div'"
:to="buildEthereumBridgePageLink()"
class="button--bridge"
>
<div class="row--title">
<img
class="img--logo"
:src="require('src/assets/img/chain/astar.png')"
alt="ethereum"
/>
<span class="text--bridge-title">{{ $t('bridge.astarBridge.title') }}</span>
</div>
<div class="box--text-bridge">
<span class="text--bridge">
{{
$t('bridge.astarBridge.text', { substrateNetwork: substrateNetwork, l2: l2Name })
}}
</span>
</div>
</component>
</button>
<p class="text--bridge">{{ $t('bridge.astarBridge.text2') }}</p>
</div>
<div class="column--selection">
<button :disabled="!isEnableAstrBridge">
<component
:is="isEnableAstrBridge ? 'router-link' : 'div'"
:to="buildEthereumBridgePageLink()"
class="button--bridge"
>
<div class="row--title">
<img
class="img--logo"
:src="require('src/assets/img/chain/astar.png')"
alt="ethereum"
/>
<span class="text--bridge-title">{{ $t('bridge.astarBridge.title') }}</span>
</div>
<div class="box--text-bridge">
<span class="text--bridge">
{{
$t('bridge.astarBridge.text', {
substrateNetwork: substrateNetwork,
l2: l2Name,
})
}}
</span>
</div>
</component>
</button>
<p class="text--bridge-details">{{ $t('bridge.astarBridge.text2') }}</p>
</div>

<div class="column--selection">
<button>
<a
:href="cbridgeAppLink"
target="_blank"
rel="noopener noreferrer"
class="button--bridge"
>
<div class="row--title">
<img
class="img--logo"
:src="require('src/assets/img/cbridge_logo.svg')"
alt="ethereum"
/>
<span class="text--bridge-title">{{ $t('bridge.celetBridge.title') }}</span>
</div>
<span class="text--bridge">{{
$t('bridge.celetBridge.text', { cbridgeNetworkName: cbridgeNetworkName })
}}</span>
</a>
</button>
<div class="column--selection">
<button>
<a
:href="cbridgeAppLink"
target="_blank"
rel="noopener noreferrer"
class="button--bridge"
>
<div class="row--title">
<img
class="img--logo"
:src="require('src/assets/img/cbridge_logo.svg')"
alt="ethereum"
/>
<span class="text--bridge-title">{{ $t('bridge.celetBridge.title') }}</span>
</div>
<span class="text--bridge">{{
$t('bridge.celetBridge.text', { cbridgeNetworkName: cbridgeNetworkName })
}}</span>
</a>
</button>
</div>
</div>
</div>
</div>
78 changes: 52 additions & 26 deletions src/components/bridge/styles/bridge-selection.scss
View file
Original file line number Diff line number Diff line change
@@ -15,35 +15,48 @@
}
}

.container--title {
margin-bottom: 50px;
font-weight: 800;
font-size: 24px;
}

.container--box {
@media (min-width: $xl) {
position: absolute;
right: -40px;
top: -36px;
height: calc(100vh - 136px);
padding-right: 168px;
padding-left: 48px;
padding-top: 58px;
}
}

.container--selection {
display: flex;
flex-direction: column;
row-gap: 24px;
background-color: red;
@media (min-width: $lg) {
flex-direction: row;
column-gap: 16px;
}
@media (min-width: $xl) {
flex-direction: row;
column-gap: 56px;
position: absolute;
// padding-bottom: -120px;
right: -40px;
top: -36px;
// height: 100%;
height: calc(100vh - 136px);
column-gap: 8px;
}
}

.column--selection {
width: 260px;
@media (min-width: $lg) {
width: 254px;
}
@media (min-width: $xl) {
width: 300px;
}
width: 232px;
// background-color: blue;
// width: 260px;
// @media (min-width: $lg) {
// width: 254px;
// }
// @media (min-width: $xl) {
// width: 300px;
// }
}

.button--bridge {
@@ -52,19 +65,13 @@
align-items: center;
justify-content: center;
border-radius: 16px;
box-shadow: 0px 0px 8px 1px rgba(0, 0, 0, 0.1);
box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.08);
cursor: pointer;
transition: all 0.3s ease 0s;
row-gap: 24px;
padding: 16px;
height: 260px;
height: 232px;
margin-bottom: 12px;
@media (min-width: $lg) {
height: 254px;
}
@media (min-width: $xl) {
height: 300px;
}
}

.column--selection button:not([disabled]) .button--bridge:hover {
@@ -121,12 +128,25 @@
row-gap: 16px;
}

.text--bridge-details {
font-weight: 600;
font-size: 14px;
color: #596381;
// color: red;
a {
color: $astar-blue;
&:hover {
color: lighten($astar-blue-dark, 10%);
}
}
}

.body--dark {
.text--bridge-title,
.text--bridge {
color: $gray-1;
}
.text--bridge {
.text--bridge-details {
a {
color: $astar-blue-dark;
&:hover {
@@ -135,8 +155,14 @@
}
}
.button--bridge {
border: 1px solid $gray-4;
background-color: $navy-2;
border: 1px solid $navy-3;
background-color: $navy-1;
box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.8);
}

.container--box {
background-color: $navy-1;
box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.8);
}

.column--selection button:not([disabled]) .button--bridge:hover {