Browse Source

feat: Manrope font integrated

pull/6455/head
Muhammed Mustafa 1 year ago
parent
commit
844f89c683
  1. 21
      packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
  2. 4
      packages/nc-gui/components/nc/Button.vue
  3. 5
      packages/nc-gui/components/nc/MenuItem.vue
  4. 1
      packages/nc-gui/components/smartsheet/topbar/SelectMode.vue

21
packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue

@ -82,27 +82,32 @@ onMounted(() => {
<NcMenuItem data-testid="nc-sidebar-user-logout" @click="logout"> <NcMenuItem data-testid="nc-sidebar-user-logout" @click="logout">
<GeneralLoader v-if="isLoggingOut" class="!ml-0.5 !mr-0.5 !max-h-4.5 !-mt-0.5" /> <GeneralLoader v-if="isLoggingOut" class="!ml-0.5 !mr-0.5 !max-h-4.5 !-mt-0.5" />
<GeneralIcon v-else icon="signout" class="menu-icon" /> <GeneralIcon v-else icon="signout" class="menu-icon" />
Log Out <span class="menu-btn"> Log Out </span>
</NcMenuItem> </NcMenuItem>
<NcDivider /> <NcDivider />
<a href="https://docs.nocodb.com" target="_blank" class="!underline-transparent"> <a href="https://docs.nocodb.com" target="_blank" class="!underline-transparent">
<NcMenuItem> <NcMenuItem>
<GeneralIcon icon="help" class="menu-icon" /> <GeneralIcon icon="help" class="menu-icon mt-0.5" />
Help Center <span class="menu-btn"> Help Center </span>
</NcMenuItem> </NcMenuItem>
</a> </a>
<NcDivider /> <NcDivider />
<a href="https://discord.gg/5RgZmkW" target="_blank" class="!underline-transparent"> <a href="https://discord.gg/5RgZmkW" target="_blank" class="!underline-transparent">
<NcMenuItem class="social-icon-wrapper"> <NcMenuItem class="social-icon-wrapper">
<GeneralIcon class="social-icon" icon="discord" />Join our Discord <GeneralIcon class="social-icon" icon="discord" />
<span class="menu-btn"> Join our Discord </span>
</NcMenuItem> </NcMenuItem>
</a> </a>
<a href="https://www.reddit.com/r/NocoDB" target="_blank" class="!underline-transparent"> <a href="https://www.reddit.com/r/NocoDB" target="_blank" class="!underline-transparent">
<NcMenuItem class="social-icon-wrapper"> <GeneralIcon class="social-icon" icon="reddit" />/r/NocoDB </NcMenuItem> <NcMenuItem class="social-icon-wrapper">
<GeneralIcon class="social-icon" icon="reddit" />
<span class="menu-btn"> /r/NocoDB </span>
</NcMenuItem>
</a> </a>
<a href="https://twitter.com/nocodb" target="_blank" class="!underline-transparent"> <a href="https://twitter.com/nocodb" target="_blank" class="!underline-transparent">
<NcMenuItem class="social-icon-wrapper group"> <NcMenuItem class="social-icon-wrapper group">
<GeneralIcon class="text-gray-500 group-hover:text-gray-800" icon="twitter" />Twitter <GeneralIcon class="text-gray-500 group-hover:text-gray-800" icon="twitter" />
<span class="menu-btn"> Twitter </span>
</NcMenuItem> </NcMenuItem>
</a> </a>
<template v-if="!appInfo.ee"> <template v-if="!appInfo.ee">
@ -160,6 +165,9 @@ onMounted(() => {
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.menu-btn {
line-height: 1.5;
}
.menu-icon { .menu-icon {
@apply !min-h-4.5; @apply !min-h-4.5;
line-height: 1rem; line-height: 1rem;
@ -171,6 +179,7 @@ onMounted(() => {
} }
.social-icon { .social-icon {
@apply my-0.5;
// Make icon black and white // Make icon black and white
filter: grayscale(100%); filter: grayscale(100%);

4
packages/nc-gui/components/nc/Button.vue

@ -127,6 +127,10 @@ useEventListener(NcButton, 'mousedown', () => {
} }
.nc-button { .nc-button {
// Not Icon
:not(.nc-icon):not(.material-symbols) {
line-height: 0.95;
}
> .ant-btn-loading-icon { > .ant-btn-loading-icon {
display: none !important; display: none !important;
} }

5
packages/nc-gui/components/nc/MenuItem.vue

@ -16,6 +16,11 @@
} }
.nc-menu-item > .ant-dropdown-menu-title-content { .nc-menu-item > .ant-dropdown-menu-title-content {
// Not Icon
:not(.nc-icon):not(.material-symbols) {
line-height: 0.95;
}
@apply flex flex-row items-center; @apply flex flex-row items-center;
} }

1
packages/nc-gui/components/smartsheet/topbar/SelectMode.vue

@ -53,6 +53,7 @@ const { onViewsTabChange } = useViewsStore()
word-break: 'keep-all'; word-break: 'keep-all';
white-space: 'nowrap'; white-space: 'nowrap';
display: 'inline'; display: 'inline';
line-height: 0.95;
} }
.active { .active {

Loading…
Cancel
Save