Skip to content

Commit

Permalink
chore: Sky rebranding-related UI adjustments (#619)
Browse files Browse the repository at this point in the history
  • Loading branch information
DaeunYoon authored Sep 5, 2024
1 parent 468ce99 commit 20a99bc
Show file tree
Hide file tree
Showing 25 changed files with 272 additions and 183 deletions.
7 changes: 0 additions & 7 deletions frontend/assets/icons/discourse.svg

This file was deleted.

11 changes: 11 additions & 0 deletions frontend/assets/icons/logo-mono.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
84 changes: 83 additions & 1 deletion frontend/assets/icons/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/assets/images/background-image-dark.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/assets/images/background-image.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
198 changes: 99 additions & 99 deletions frontend/assets/styles/ant-design-dark.less
Original file line number Diff line number Diff line change
@@ -1,101 +1,101 @@
.dark {
@import '~ant-design-vue/lib/style/components';

@main: #222629;
@main-dark: #191c1e;
@main-light: #2e3338;
@text: #ddd;
@text-light: #fff;
@text-dark: #222;
@text-disabled: #999;

@primary: #1aab9b;
@info: #4ac8d2;
@success: #06d6a0;
@error: #ef476f;
@warn: #e55934;

@primary-color: @primary;
@processing-color: @info;
@info-color: @info;
@success-color: @success;
@error-color: @error;
@highlight-color: @error;
@warning-color: @warn;
@text-color: @text;
@text-color-dark: @text-dark;
@disabled-color: @text-disabled;
@text-color-secondary: @text-disabled;
@heading-color: @text-light;
@heading-color-dark: @text-dark;
@link-color: lighten(@primary, 10%);

@body-background: @main;
@component-background: @main-light;
@dropdown-selected-color: @text-color;
@item-active-bg: darken(@primary, 20%);
@item-hover-bg: darken(@primary, 20%);
@menu-highlight-color: @text;
@table-row-hover-bg: darken(@primary, 10%);

@descriptions-bg: @main-light;
@menu-bg: transparent;

@border-color-base: @main-dark;
@border-color-split: lighten(@main-light, 2%);

@background-color-light: @main-light;
@background-color-base: @main-light;

@checkbox-check-color: @main-light;

@layout-header-background: @main-dark;
@layout-body-background: @main;

// Alert
@alert-success-border-color: @success;
@alert-success-bg-color: darken(@success, 20%);
@alert-success-icon-color: @success;

@alert-info-border-color: @info;
@alert-info-bg-color: darken(@info, 30%);
@alert-info-icon-color: @info;

@alert-warning-border-color: @warn;
@alert-warning-bg-color: darken(@warn, 20%);
@alert-warning-icon-color: @warn;

@alert-error-border-color: @error;
@alert-error-bg-color: darken(@error, 20%);
@alert-error-icon-color: @error;

// Popover
@popover-bg: @component-background;

// fix certain styles in dark mode
.ant-alert.ant-alert-no-icon {
padding: 8px 15px;
}

.ant-popover-arrow {
border-color: @popover-bg !important;
}

.ant-modal-body {
padding: 0;
}

.ant-progress-circle-trail {
stroke: lighten(@main-light, 10%) !important;
}

.ant-radio-group {
display: flex;
}

.ant-alert-description {
display: block;
}

color-scheme: dark;
@import '~ant-design-vue/lib/style/components';

@main: #222629;
@main-dark: #191c1e;
@main-light: #2e3338;
@text: #ddd;
@text-light: #fff;
@text-dark: #222;
@text-disabled: #999;

@primary: #4331E9;
@info: #4ac8d2;
@success: #06d6a0;
@error: #ef476f;
@warn: #e55934;

@primary-color: @primary;
@processing-color: @info;
@info-color: @info;
@success-color: @success;
@error-color: @error;
@highlight-color: @error;
@warning-color: @warn;
@text-color: @text;
@text-color-dark: @text-dark;
@disabled-color: @text-disabled;
@text-color-secondary: @text-disabled;
@heading-color: @text-light;
@heading-color-dark: @text-dark;
@link-color: lighten(@primary, 10%);

@body-background: @main;
@component-background: @main-light;
@dropdown-selected-color: @text-color;
@item-active-bg: darken(@primary, 20%);
@item-hover-bg: darken(@primary, 20%);
@menu-highlight-color: @text;
@table-row-hover-bg: darken(@primary, 10%);

@descriptions-bg: @main-light;
@menu-bg: transparent;

@border-color-base: @main-dark;
@border-color-split: lighten(@main-light, 2%);

@background-color-light: @main-light;
@background-color-base: @main-light;

@checkbox-check-color: @main-light;

@layout-header-background: @main-dark;
@layout-body-background: @main;

// Alert
@alert-success-border-color: @success;
@alert-success-bg-color: darken(@success, 20%);
@alert-success-icon-color: @success;

@alert-info-border-color: @info;
@alert-info-bg-color: darken(@info, 30%);
@alert-info-icon-color: @info;

@alert-warning-border-color: @warn;
@alert-warning-bg-color: darken(@warn, 20%);
@alert-warning-icon-color: @warn;

@alert-error-border-color: @error;
@alert-error-bg-color: darken(@error, 20%);
@alert-error-icon-color: @error;

// Popover
@popover-bg: @component-background;

// fix certain styles in dark mode
.ant-alert.ant-alert-no-icon {
padding: 8px 15px;
}

.ant-popover-arrow {
border-color: @popover-bg !important;
}

.ant-modal-body {
padding: 0;
}

.ant-progress-circle-trail {
stroke: lighten(@main-light, 10%) !important;
}

.ant-radio-group {
display: flex;
}

.ant-alert-description {
display: block;
}

color-scheme: dark;
}
2 changes: 1 addition & 1 deletion frontend/assets/styles/ant-design.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '~ant-design-vue/dist/antd.less';

@primary-color: #1aab9b;
@primary-color: #4331E9;
@modal-body-padding: 0px;
@dropdown-selected-color: @text-color;
@border-width-base: 2px;
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/common/inputs/LinkButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default Vue.extend({

<style scoped>
.Primary {
@apply bg-primary-light border-2 border-primary hover:text-primary text-gray-700;
@apply bg-primary-light border-2 border-primary hover:text-white text-gray-700;
}
.Secondary {
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/common/inputs/Select.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<slot name="text-prefix" />
<span class="hidden md:block">
<slot v-if="selectLink" name="title">
<nuxt-link :to="selectLink" class="text-gray-700 hover:text-gray-600">
<nuxt-link :to="selectLink" class="text-white hover:text-primary-light">
{{ selectTitle }}
</nuxt-link>
</slot>
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/common/inputs/SelectOption.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div
v-if="!option.href"
:key="option.value"
class="w-full flex hover:bg-primary px-4 py-2 cursor-pointer items-center"
class="w-full flex hover:bg-primary px-4 py-2 cursor-pointer items-center hover:text-white"
:class="option.classes"
@click="$emit('input', option.value)"
>
Expand Down
20 changes: 10 additions & 10 deletions frontend/components/common/other/ComingSoon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,12 @@
<div class="text-2xl text-gray-600">Last updated on {{ lastUpdatedDate }}</div>
</div>
</div>
<div
class="absolute inset-0 select-none bg-center bg-cover filter dark:invert"
:style="{ backgroundImage: `url(${backgroundImage})` }"
/>
<div class="absolute inset-0 select-none bg-center bg-cover filter ComingSoonBackground" />
</div>
</template>

<script lang="ts">
import Vue from 'vue';
import backgroundImage from '~/assets/images/background-image.jpg';
export default Vue.extend({
name: 'ComingSoon',
Expand All @@ -27,11 +23,6 @@ export default Vue.extend({
required: true,
},
},
data() {
return {
backgroundImage,
};
},
computed: {
lastUpdatedDate(): string {
const date = new Date(this.lastUpdated);
Expand All @@ -45,3 +36,12 @@ export default Vue.extend({
},
});
</script>

<style scoped>
.ComingSoonBackground {
background-image: url('~/assets/images/background-image.jpg');
}
.dark .ComingSoonBackground {
background-image: url('~/assets/images/background-image-dark.jpg');
}
</style>
2 changes: 1 addition & 1 deletion frontend/components/dashboard/CollateralTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export default Vue.extend({
}
.CollateralTable >>> .ant-table-tbody td,
.CollateralTable >>> .ant-table-thead th {
@apply border-b-2 border-r-2 border-gray-300 dark:border-gray-600;
@apply border-r-2 border-gray-300 dark:border-gray-600;
}
.CollateralTable >>> .ant-table-tbody td:first-child,
Expand Down
Loading

0 comments on commit 20a99bc

Please sign in to comment.