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

[UI] Smoother the icon animation on collapsing sidebar #5634

Closed
wants to merge 2 commits into from
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import * as monaco from 'monaco-editor'
import { format } from 'sql-formatter'
import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'
import { editorProps } from './type'
import { editorProps } from './types'
import { useEditorStore } from '@/pinia/editor'
import { ref, toRaw, watch, onBeforeUnmount, onMounted } from 'vue'

Expand Down
40 changes: 21 additions & 19 deletions kyuubi-server/web-ui/src/layout/components/aside/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<header>
<img v-if="!isCollapse" src="@/assets/kyuubi-logo.svg" />
<img v-else class="collapsed-logo" src="@/assets/kyuubi.png" />
<pre v-if="!isCollapse">{{ version }}</pre>
<span v-if="!isCollapse">{{ version }}</span>
</header>
<c-menu :is-collapse="isCollapse" :active-path="activePath" :menus="menus" />
</template>
Expand All @@ -42,37 +42,39 @@
</script>

<style lang="scss" scoped>
$height: 64px;
header {
width: 100%;
position: absolute;
top: 0;
left: 0;
height: 64px;
padding-left: 16px;
line-height: 64px;
height: $height;
line-height: $height;
padding: 0 16px;
display: flex;
align-items: flex-end;
justify-content: space-between;
box-sizing: border-box;
img {
display: inline-block;
width: 140px;
height: 50px;
top: -10px;
position: relative;
vertical-align: middle;
&.collapsed-logo {
width: 40px;
height: 40px;
position: relative;
top: -4px;
left: -4px;
}
}
pre {
span {
position: relative;
top: 17px;
font-size: 10px;
display: inline-block;
width: 100px;
margin-top: 20px;
text-align: center;
font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
color: rgba(255, 255, 255, 0.87);
}
.collapsed-logo {
width: 40px;
height: 40px;
margin-top: 30px;
}
}
.el-menu {
margin-top: 64px;
margin-top: $height;
}
</style>
1 change: 0 additions & 1 deletion kyuubi-server/web-ui/src/views/swagger/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<template>
<main>
Swagger
<div id="swagger-ui" class="swagger-ui"> </div>
</main>
</template>
Expand Down
Loading