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

Suite #342

Merged
merged 10 commits into from
Dec 11, 2023
Merged

Suite #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9cfbd28
feat: creating deposit Offers (#332)
aeddaqqa Nov 3, 2023
fec428f
Create Deposits fixes (#334)
aeddaqqa Nov 6, 2023
33121ad
fix check of displaying create offer form (#335)
aeddaqqa Nov 7, 2023
3f73d40
Bug fixes (#333)
Ayagoumi Nov 7, 2023
d17c845
Refactor font styling to use mixins scss file (#173)
aeddaqqa Nov 8, 2023
7347f63
improvement for create offer form (#336)
aeddaqqa Nov 20, 2023
7c86f2d
Fix add validator (#337)
Ayagoumi Nov 28, 2023
94a5952
several fixes for deposit offer (#339)
aeddaqqa Nov 30, 2023
281a241
fix vesting period label (#341)
aeddaqqa Dec 1, 2023
7406386
Fix(add validator): duration calculation & update for when the wallet…
Ayagoumi Dec 4, 2023
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
Binary file added bun.lockb
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion caminojs
Open in desktop
Submodule caminojs updated 11 files
+16 −1 dist/apis/platformvm/adddepositoffertx.d.ts
+1 −1 dist/apis/platformvm/adddepositoffertx.d.ts.map
+49 −4 dist/apis/platformvm/adddepositoffertx.js
+1 −1 dist/apis/platformvm/api.d.ts
+1 −1 dist/apis/platformvm/api.d.ts.map
+3 −3 dist/apis/platformvm/api.js
+1 −1 dist/apis/platformvm/builder.d.ts
+1 −1 dist/apis/platformvm/builder.d.ts.map
+3 −3 dist/apis/platformvm/builder.js
+1 −1 dist/apis/platformvm/depositTx.d.ts.map
+6 −2 dist/apis/platformvm/depositTx.js
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
"weekstart": "1.0.1"
},
"dependencies": {
"@c4tplatform/signavaultjs": "^1.0.11",
"@c4tplatform/signavaultjs": "^1.1",
"@cypress/xpath": "^2.0.3",
"vue": "^2.6.11",
"vue-cli-plugin-vuetify": "^2.0.3",
Expand Down
6 changes: 3 additions & 3 deletions src/components/Access/AccountsFound.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,18 @@ export default class AccountsFound extends Vue {

.savedAccounts {
margin: 0;
font-family: ClashDisplay;
font-family: var(--primary-font);
font-weight: 500;
line-height: 1.5;
font-size: 1rem;
@include mixins.typography-body-2;
margin-bottom: 0.5rem;
}

.v-icon {
color: var(--primary-color);
width: 20px;
height: 20px;
font-size: 22px;
@include mixins.typography-subtitle-1;
}

.goTo {
Expand Down
6 changes: 5 additions & 1 deletion src/components/CamBtn.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ import Spinner from '@/components/misc/Spinner.vue'
components: { Spinner },
})
export default class CamBtn extends Vue {
@Prop({ default: 'primary' }) readonly variant!: 'primary' | 'transparent' | 'negative'
@Prop({ default: 'primary' }) readonly variant!:
| 'primary'
| 'transparent'
| 'negative'
| 'accent'
@Prop({ default: false }) readonly disabled!: boolean
@Prop({ default: false }) readonly loading!: boolean
@Prop({ default: () => {} }) readonly onClick!: Function
Expand Down
12 changes: 9 additions & 3 deletions src/components/CamInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</template>

<script lang="ts">
import { Vue, Component, Prop } from 'vue-property-decorator'
import { Component, Prop, Vue } from 'vue-property-decorator'

@Component
export default class CamInput extends Vue {
Expand All @@ -43,8 +43,14 @@ export default class CamInput extends Vue {
}
}
</script>

<style scoped>
<style scoped lang="scss">
.v-application .error {
background-color: transparent !important;
border: 1px solid var(--camino-slate-slate-600);
&:disabled {
border: 1px solid var(--camino-slate-slate-600) !important;
}
}
.cam-input {
display: flex;
flex-direction: column;
Expand Down
15 changes: 6 additions & 9 deletions src/components/CreateWalletWorkflow/CreateWallet.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ export default class CreateWallet extends Vue {
h1 {
margin-top: variables.$vertical-padding;
text-align: left;
font-size: variables.$m-size;
@include mixins.typography-subtitle-1;
font-weight: 400;
}
}
Expand All @@ -269,7 +269,7 @@ export default class CreateWallet extends Vue {

> * {
margin: 4px;
font-size: 0.8rem;
@include mixins.typography-caption;
}

p {
Expand All @@ -291,7 +291,7 @@ export default class CreateWallet extends Vue {

.key_disp {
margin: 30px auto;
font-size: 12px;
@include mixins.typography-caption;
}

a {
Expand Down Expand Up @@ -373,9 +373,7 @@ a {
header {
h1 {
margin-top: 10px;
font-size: variables.$xl-size;
line-height: 1.25em;
font-weight: 400;
@include mixins.typography-headline-1;
}

p {
Expand All @@ -388,8 +386,7 @@ a {

span {
display: block;
font-size: variables.$s-size;
font-weight: 700;
@include mixins.typography-caption;
text-transform: uppercase;

&.label {
Expand Down Expand Up @@ -504,7 +501,7 @@ a {

header {
h1 {
font-size: variables.$xl-size-mobile;
@include mixins.typography-headline-4;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/Navbar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ button {
}
.buts_right {
button {
font-size: 11px;
@include mixins.typography-caption;
}
}
}
Expand Down
13 changes: 7 additions & 6 deletions src/components/NetworkSettings/CustomPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ export default class CustomPage extends Vue {
</script>
<style scoped lang="scss">
@use '../../styles/abstracts/variables';
@use '../../styles/abstracts/mixins';

.custom_network {
padding: 0px 15px;
Expand All @@ -219,7 +220,7 @@ export default class CustomPage extends Vue {
}

button {
font-size: 12px;
@include mixins.typography-caption;
padding: 3px 14px;
border-radius: var(--border-radius-sm);
}
Expand All @@ -228,7 +229,7 @@ export default class CustomPage extends Vue {
form {
margin-top: 12px;
label {
font-size: 12px;
@include mixins.typography-caption;
}
> div {
display: flex;
Expand All @@ -243,19 +244,19 @@ select {
background-color: var(--bg-light);
border-radius: var(--border-radius-sm);
padding: 6px 6px;
font-size: 13px;
@include mixins.typography-caption;
outline: none;
}
button {
margin-top: 10px;
width: 100%;
font-size: 12px;
@include mixins.typography-caption;
border-radius: var(--border-radius-sm);
}

.v-btn {
text-transform: none;
font-size: 12px !important;
@include mixins.typography-caption;
color: var(--bg) !important;
}

Expand All @@ -274,7 +275,7 @@ button {
}

.form_error {
font-size: 12px;
@include mixins.typography-caption;
color: #e03737;
}
</style>
11 changes: 6 additions & 5 deletions src/components/NetworkSettings/EditPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ export default class EditPage extends Vue {
</script>
<style scoped lang="scss">
@use '../../styles/abstracts/variables';
@use '../../styles/abstracts/mixins';

.custom_network {
padding: 0px 15px;
Expand All @@ -184,7 +185,7 @@ export default class EditPage extends Vue {
}

button {
font-size: 12px;
@include mixins.typography-caption;
padding: 3px 14px;
border-radius: var(--border-radius-sm);
}
Expand All @@ -193,7 +194,7 @@ export default class EditPage extends Vue {
form {
margin-top: 12px;
label {
font-size: 12px;
@include mixins.typography-caption;
}
> div {
display: flex;
Expand All @@ -208,7 +209,7 @@ select {
color: var(--primary-color);
border-radius: var(--border-radius-sm);
padding: 6px 6px;
font-size: 13px;
@include mixins.typography-caption;
outline: none;
width: 100%;
}
Expand All @@ -217,7 +218,7 @@ button {
width: 100%;
background-color: variables.$primary-color;
color: #fff;
font-size: 12px;
@include mixins.typography-caption;
padding: 3px 14px;
border-radius: var(--border-radius-sm);
}
Expand All @@ -241,7 +242,7 @@ button {
}

.form_error {
font-size: 12px;
@include mixins.typography-caption;
color: #e03737;
}
</style>
2 changes: 1 addition & 1 deletion src/components/NetworkSettings/NetworkMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ export default class NetworkMenu extends Vue {
}

button {
font-size: 12px;
@include mixins.typography-caption;
padding: 3px 14px;
border-radius: var(--border-radius-sm);
}
Expand Down
7 changes: 4 additions & 3 deletions src/components/NetworkSettings/NetworkRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,9 @@ export default class NetworkRow extends Vue {
</script>
<style scoped lang="scss">
@use '../../styles/abstracts/variables';
@use '../../styles/abstracts/mixins';
.stat_col {
font-size: 14px;
@include mixins.typography-caption;
color: var(--primary-color);
text-align: right;
word-break: keep-all !important;
Expand Down Expand Up @@ -153,7 +154,7 @@ img {
.editBut {
color: var(--primary-color);
opacity: 0.4;
font-size: 11px;
@include mixins.typography-caption;
/*position: absolute;*/
/*top: 12px;*/
/*right: 0px;*/
Expand All @@ -174,7 +175,7 @@ img {
.url,
.credentials {
color: variables.$primary-color-light;
font-size: 12px;
@include mixins.typography-caption;
word-break: break-all;
}

Expand Down
6 changes: 3 additions & 3 deletions src/components/NftCards/URL_NFT.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ img {
.type {
display: block;
margin: 0px auto !important;
font-size: 12px;
@include mixins.typography-caption;
background-color: var(--primary-color-light);
color: var(--bg) !important;
width: max-content;
Expand All @@ -114,7 +114,7 @@ img {
.unknown {
padding: 10px;
p {
font-size: 0.8rem;
@include mixins.typography-caption;
color: #999;
margin: 0;
}
Expand All @@ -128,7 +128,7 @@ img {
color: var(--primary-color-light);
background-color: var(--bg-light);
text-decoration: none;
font-size: 0.9rem;
@include mixins.typography-caption;
margin: 0px auto;

&:hover {
Expand Down
6 changes: 3 additions & 3 deletions src/components/Notifications.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ export default {
},
}
</script>
<style scoped>
<style scoped lang="scss">
@use '../styles/abstracts/mixins';
.notifications {
pointer-events: none;
position: fixed;
Expand All @@ -43,11 +44,10 @@ export default {
box-shadow: 2px 2px 12px rgba(0, 0, 0, 0.4);
background-color: var(--bg);
max-width: 195px;
font-size: 13px !important;
@include mixins.typography-caption;
}

.notif_title {
/*font-size: 14px;*/
color: var(--bg-light);
font-weight: bold;
padding: 6px 14px;
Expand Down
6 changes: 3 additions & 3 deletions src/components/SidePanels/History/TxHistoryValueFunctional.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,18 @@ export default {
}

.action {
font-size: 12px;
@include mixins.typography-caption;
color: variables.$primary-color-light;
}
.amount {
text-align: right;
white-space: nowrap;
font-size: 15px;
@include mixins.typography-body-2;
}

@include mixins.medium-device {
.amount {
font-size: 14px;
@include mixins.typography-caption;
}
}
</style>
7 changes: 4 additions & 3 deletions src/components/SidePanels/History/ViewTypes/BaseTx.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,9 @@ export default class BaseTx extends Vue {
}
</script>
<style scoped lang="scss">
@use '../../../../styles/abstracts/mixins';
label {
font-size: 12px;
@include mixins.typography-caption;
color: var(--primary-color-light);
}
.nfts {
Expand All @@ -383,10 +384,10 @@ label {
display: flex;
flex-direction: column;
justify-content: center;
font-size: 12px;
@include mixins.typography-caption;
color: var(--primary-color-light);
overflow: hidden;
font-family: 'Inter' sans-serif;
font-family: var(--primary-font);
white-space: nowrap;

p {
Expand Down
3 changes: 2 additions & 1 deletion src/components/SidePanels/History/ViewTypes/BaseTxNFTOutput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@ export default class BaseTxNFTOutput extends Vue {
}
</script>
<style scoped lang="scss">
@use '../../../../styles/abstracts/mixins';
.amount {
text-align: right;
white-space: nowrap;
font-size: 15px;
@include mixins.typography-body-2;
color: #d04c4c;

&[profit] {
Expand Down
Loading
Loading