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.

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

#529 | Redesign - Base styling #538

Merged
merged 6 commits into from
Feb 21, 2024
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
11 changes: 9 additions & 2 deletions quasar.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module.exports = function(/* ctx */) {
],

// https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css
css: ['fonts/silka/silka.css', 'app.sass'],
css: ['fonts/silka/silka.css', 'app.scss'],

// https://github.com/quasarframework/quasar/tree/dev/extras
extras: [
Expand Down Expand Up @@ -98,7 +98,14 @@ module.exports = function(/* ctx */) {
framework: {
iconSet: 'material-icons', // Quasar icon set
lang: 'en-US', // Quasar language pack
config: {},
config: {
brand: {
// brand colors
primary: '#8B3F98',
secondary: '#348DCC',
accent: '#73C58F',
},
},

// Possible values for "importStrategy":
// * 'auto' - (DEFAULT) Auto-import needed Quasar components & directives
Expand Down
Binary file removed src/assets/2799006.jpg
Binary file not shown.
12 changes: 0 additions & 12 deletions src/assets/background.svg

This file was deleted.

3 changes: 0 additions & 3 deletions src/components/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ export default {
</template>

<style lang="scss">
body.body--light .c-footer {
color: $white
}
.c-footer {
margin: 8px auto 24px;
padding: 0 16px;
Expand Down
1 change: 1 addition & 0 deletions src/components/Health/Endpoints.vue
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ export default {
border-radius: 6px
box-shadow: 0 1px 5px rgb(0 0 0 / 20%), 0 2px 2px rgb(0 0 0 / 14%), 0 3px 1px -2px rgb(0 0 0 / 12%)
.tableWrapper
max-width: 100vw
min-width: 50vw
max-width: 100vw
border-radius: 6px
Expand Down
2 changes: 1 addition & 1 deletion src/components/MethodField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default {
margin: auto;
}
.c-method-icon {
background: $purpleBright;
background: var(--q-primary);
display: flex;
align-items: center;
justify-content: center;
Expand Down
2 changes: 1 addition & 1 deletion src/components/TransactionField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default {
color: {
type: String,
required: false,
default: 'secondary',
default: 'primary',
},
truncate: {
type: Number,
Expand Down
6 changes: 3 additions & 3 deletions src/components/TransactionTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ export default {
{{ col.label }}
<template v-if="col.name === 'date'">
<q-icon
class="info-icon"
class="info-icon q-ml-xs"
name="fas fa-info-circle"
@click="toggleDateFormat"
>
Expand All @@ -302,7 +302,7 @@ export default {
</q-icon>
</template>
<template v-if="col.name === 'method'">
<q-icon class="info-icon" name="fas fa-info-circle" />
<q-icon class="info-icon" name="fas fa-info-circle q-ml-xs" />
<q-tooltip anchor="bottom middle" self="top middle" max-width="10rem">
{{ $t('components.executed_based_on_decoded_data') }}
</q-tooltip>
Expand All @@ -322,7 +322,7 @@ export default {
color="negative"
/>
<TransactionField
:color="(props.row.status !== '0x1') ? 'negative' : 'secondary'"
:color="(props.row.status !== '0x1') ? 'negative' : 'primary'"
:transaction-hash="props.row.hash"
:truncate="(props.row.status !== '0x1') ? 15 : 18"
/>
Expand Down
5 changes: 2 additions & 3 deletions src/components/header/AppHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ export default defineComponent({
padding: 0 16px;
width: 100%;
box-shadow:
0 4px 5px rgba(0, 0, 0, 0.2),
0 3px 5px rgba(0, 0, 0, 0.2),
0 2px 2px rgba(0, 0, 0, 0.14),
0 3px 1px -2px rgba(0, 0, 0, 0.12);

Expand Down Expand Up @@ -575,15 +575,14 @@ export default defineComponent({
border-radius: 4px;

&:hover,
&:focus,
&:active {
@media screen and (min-width: $breakpoint-lg-min) {
background-color: var(--highlight-color);
}

& > #{$this}__menu-item-icon:not(#{$this}__menu-item-icon--chevron) {
filter: grayscale(0);
color: $secondary;
color: $primary;
}
}

Expand Down
3 changes: 0 additions & 3 deletions src/css/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,3 @@
}
}


// components
@import 'components/notification'
Loading
Loading