-
Notifications
You must be signed in to change notification settings - Fork 309
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
ショートカットキー割り当てダイアログのリデザイン #2348
Merged
Merged
ショートカットキー割り当てダイアログのリデザイン #2348
Changes from 22 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
958c212
BaseIconButtonコンポーネントを追加
takusea 47e5db4
デザインを新しいものに変更
takusea 2033db3
未設定にするボタンを削除
takusea dd0e3c9
文言の揺れを統一
takusea cb71428
リファクタリング
takusea be7f11f
readonly時にdisabledになるように修正
takusea 671a9b8
BaseIconButtonのStoryファイルを追加
takusea a10129a
アニメーションを削除
takusea cfa2dd5
真偽値が間違っていたのを修正
takusea 9cd40bc
Revert "未設定にするボタンを削除"
takusea 5fd40d9
ラベルの表記を修正
takusea 6512b4e
テーブル寄りのデザインに変更
takusea d0d2bcd
disabledのStoryを追加
takusea 442605e
スクロールバーのz-indexを変数に括りだし
takusea 9b50216
未使用の記述を削除
takusea 12d0113
テーブル行の高さを縮める
takusea 25252de
Merge branch 'main' into redesign-hotkey-dialog
takusea 66c7ed0
SCSSの色調整をcolor.adjustを用いた記述に変更
takusea fe9aad8
[update snapshots]
takusea 08df2b9
BaseIconButtonのスナップショットを追加
takusea 740fe18
検索をケースインセンシティブに変更
takusea 825bd0e
disabled時のopacityを0.4に変更
takusea 57351c5
Merge branch 'main' into redesign-hotkey-dialog
Hiroshiba 24ce87e
スナップショットアップデートのために一度削除 [update snapshots]
Hiroshiba c48fe61
(スナップショットを更新)
github-actions[bot] 6a2a7cb
テスト用空commit
Hiroshiba File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
import type { Meta, StoryObj } from "@storybook/vue3"; | ||
|
||
import { TooltipProvider } from "radix-vue"; | ||
import BaseIconButton from "./BaseIconButton.vue"; | ||
|
||
const meta: Meta<typeof BaseIconButton> = { | ||
component: BaseIconButton, | ||
render: (args) => ({ | ||
components: { BaseIconButton, TooltipProvider }, | ||
setup() { | ||
return { args }; | ||
}, | ||
template: ` | ||
<TooltipProvider> | ||
<BaseIconButton v-bind="args" /> | ||
</TooltipProvider>`, | ||
}), | ||
}; | ||
|
||
export default meta; | ||
type Story = StoryObj<typeof BaseIconButton>; | ||
|
||
export const Default: Story = { | ||
args: { | ||
label: "Default", | ||
icon: "settings", | ||
}, | ||
}; | ||
|
||
export const Disabled: Story = { | ||
args: { | ||
label: "Disabled", | ||
icon: "settings", | ||
disabled: true, | ||
}, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
<template> | ||
<BaseTooltip :label> | ||
<button | ||
class="button" | ||
:disabled | ||
@click="(payload) => $emit('click', payload)" | ||
> | ||
<!-- 暫定でq-iconを使用 --> | ||
<QIcon v-if="icon" :name="icon" size="sm" /> | ||
</button> | ||
</BaseTooltip> | ||
</template> | ||
|
||
<script setup lang="ts"> | ||
import BaseTooltip from "./BaseTooltip.vue"; | ||
|
||
defineProps<{ | ||
icon: string; | ||
label: string; | ||
disabled?: boolean; | ||
}>(); | ||
|
||
defineEmits<{ | ||
(e: "click", payload: MouseEvent): void; | ||
}>(); | ||
</script> | ||
|
||
<style scoped lang="scss"> | ||
@use "@/styles/v2/variables" as vars; | ||
@use "@/styles/v2/mixin" as mixin; | ||
@use "@/styles/v2/colors" as colors; | ||
|
||
.button { | ||
border: none; | ||
display: flex; | ||
justify-content: center; | ||
align-items: center; | ||
height: vars.$size-control; | ||
width: vars.$size-control; | ||
border-radius: vars.$radius-1; | ||
color: colors.$display; | ||
background-color: colors.$clear; | ||
cursor: pointer; | ||
|
||
&:focus-visible { | ||
@include mixin.on-focus; | ||
} | ||
|
||
&:hover:not(:disabled) { | ||
background-color: colors.$clear-hovered; | ||
} | ||
|
||
&:active:not(:disabled) { | ||
background-color: colors.$clear-pressed; | ||
} | ||
|
||
&:disabled { | ||
// Quasar側のopacity: 0.6 !important;を上書きするためimportantを付与 | ||
opacity: 0.4 !important; | ||
} | ||
} | ||
</style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Storybookでdisable状態の作っても良いかもですね!