-
Notifications
You must be signed in to change notification settings - Fork 42
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
Fix/change UI setting qall #4192
Merged
Merged
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
084ea2b
設定画面(通話)の項目の順番変更、文章の一部修正、ラジオボタンのレイアウト変更
damin3A3 00a4c44
設定画面(通話)のレイアウト、見た目微調整
damin3A3 cd8048e
設定画面(通話)のレイアウト変更
damin3A3 267ee07
文字関連の変更を一度消した
damin3A3 77a781f
変更を戻した
damin3A3 0a6646c
コードの細かい修正
damin3A3 fce2b7c
Merge branch 'master' into fix/change_UI_Setting_Qall
damin3A3 424b9c6
Merge branch 'master' into fix/change_UI_Setting_Qall
damin3A3 b42c4f0
指摘をいただいたところの修正
damin3A3 6227ea4
prettierでのフォーマット修正
damin3A3 fd7e59d
タグの修正
damin3A3 2d0d30a
行間調整
damin3A3 4f77a77
コードのフォーマットの修正
damin3A3 56f7f20
ラジオボタンの変更を元に戻した
damin3A3 394a67b
スライダの背景色を消去した
damin3A3 1846ee5
Merge branch 'master' into fix/change_UI_Setting_Qall
damin3A3 3f0aa29
ラベルの色の修正
damin3A3 70cf5ff
vue-slider-componentを使用した(色未修正)
damin3A3 b473e77
フォーマット修正
damin3A3 2fa1e4a
データ型の統一
damin3A3 3c61a3a
フォーマット再修正
damin3A3 5c9b05c
データ型の修正を試みた
damin3A3 4689e71
スライダの色を調整した
damin3A3 1942bf9
スライダーのクリック範囲を広くした
damin3A3 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
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 |
---|---|---|
@@ -1,12 +1,13 @@ | ||
<template> | ||
<div :class="$style.container"> | ||
<form-input | ||
<a-slider | ||
v-model.number="value" | ||
:class="$style.range" | ||
type="range" | ||
:min="min" | ||
:step="step" | ||
:max="max" | ||
:disabled="disabled" | ||
:tooltip="'none'" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
:interval="interval" | ||
Comment on lines
+3
to
+10
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
/> | ||
<semi-fixed-size-text | ||
align="right" | ||
|
@@ -18,18 +19,24 @@ | |
|
||
<script lang="ts" setup> | ||
import { computed } from 'vue' | ||
import FormInput from '/@/components/UI/FormInput.vue' | ||
import { useModelValueSyncer } from '/@/composables/useModelSyncer' | ||
import SemiFixedSizeText from './SemiFixedSizeText.vue' | ||
import ASlider from '/@/components/UI/ASlider.vue' | ||
|
||
const props = defineProps<{ | ||
modelValue: number | ||
maxText: string | ||
min?: string | ||
max?: string | ||
step?: string | ||
format: (v: number) => string | ||
}>() | ||
const props = withDefaults( | ||
defineProps<{ | ||
modelValue: number | ||
maxText: string | ||
min?: number | ||
max?: number | ||
disabled?: boolean | ||
interval?: number | ||
format: (v: number) => string | ||
}>(), | ||
{ | ||
disabled: false | ||
} | ||
) | ||
|
||
const emit = defineEmits<{ | ||
(e: 'update:modelValue', v: number): void | ||
|
@@ -47,6 +54,15 @@ const showValue = computed(() => props.format(value.value)) | |
} | ||
.range { | ||
flex: 1 1; | ||
margin-right: 4px; | ||
margin-right: 16px; | ||
:global { | ||
$dotBgColor: $theme-accent-primary-background; | ||
$dotShadow: none; | ||
|
||
$bgColor: rgba(107, 125, 138, 0.5); // $theme-ui-secondary-default; | ||
$themeColor: $theme-accent-primary-background; | ||
|
||
@import 'vue-slider-component/lib/theme/default.scss'; | ||
} | ||
} | ||
</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
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.
NatsukiくんのPRでFormRadioコンポーネント自体を変えてもらってるので、ここらへんはもしかしたらまたちょっと変えてもらうかもです
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.
ありがとうございます!
一旦変えずに今後の指示を待ちます。