Browse Source

Merge pull request #4052 from nocodb/fix/input-styles

pull/4053/head
Braks 2 years ago committed by GitHub
parent
commit
fb101db0ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      packages/nc-gui/components/cell/Duration.vue
  2. 2
      packages/nc-gui/components/cell/Percent.vue
  3. 2
      packages/nc-gui/components/cell/Text.vue
  4. 6
      packages/nc-gui/components/smartsheet/Form.vue
  5. 8
      packages/nc-gui/pages/[projectType]/form/[viewId]/index/survey.vue

2
packages/nc-gui/components/cell/Duration.vue

@ -76,7 +76,7 @@ const submitDuration = () => {
ref="durationInput" ref="durationInput"
v-model="localState" v-model="localState"
class="w-full !border-none p-0" class="w-full !border-none p-0"
:class="{ '!p-2': editEnabled }" :class="{ '!px-2': editEnabled }"
:placeholder="durationPlaceholder" :placeholder="durationPlaceholder"
@blur="submitDuration" @blur="submitDuration"
@keypress="checkDurationFormat($event)" @keypress="checkDurationFormat($event)"

2
packages/nc-gui/components/cell/Percent.vue

@ -19,7 +19,7 @@ const vModel = useVModel(props, 'modelValue', emits)
v-if="editEnabled" v-if="editEnabled"
v-model="vModel" v-model="vModel"
class="w-full !border-none text-base" class="w-full !border-none text-base"
:class="{ '!p-2': editEnabled }" :class="{ '!px-2': editEnabled }"
type="number" type="number"
/> />
<span v-else>{{ vModel }}</span> <span v-else>{{ vModel }}</span>

2
packages/nc-gui/components/cell/Text.vue

@ -23,7 +23,7 @@ const focus: VNodeRef = (el) => (el as HTMLInputElement)?.focus()
:ref="focus" :ref="focus"
v-model="vModel" v-model="vModel"
class="h-full w-full outline-none bg-transparent" class="h-full w-full outline-none bg-transparent"
:class="{ '!p-2': editEnabled }" :class="{ '!px-2': editEnabled }"
@blur="editEnabled = false" @blur="editEnabled = false"
/> />

6
packages/nc-gui/components/smartsheet/Form.vue

@ -780,7 +780,11 @@ watch(view, (nextView) => {
} }
.nc-input { .nc-input {
@apply w-full !bg-white rounded px-2 py-2 min-h-[40px] mt-2 mb-2 flex items-center border-solid border-1 border-primary; @apply appearance-none w-full !bg-white rounded px-2 py-2 my-2 border-solid border-1 border-primary border-opacity-50;
:deep(input) {
@apply !px-1;
}
} }
.form-meta-input::placeholder { .form-meta-input::placeholder {

8
packages/nc-gui/pages/[projectType]/form/[viewId]/index/survey.vue

@ -434,4 +434,12 @@ onMounted(() => {
@apply mr-2; @apply mr-2;
} }
} }
.nc-input {
@apply appearance-none w-full !bg-white rounded px-2 py-2 my-2 border-solid border-1 border-primary border-opacity-50;
input {
@apply !py-1 !px-1;
}
}
</style> </style>

Loading…
Cancel
Save