hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

Browse source
This commit is contained in:
AnandaTon 2023-07-19 15:30:16 +07:00
commit 6b80d6804f
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/05_placement/components/OrderPlacement/step/step01.vue
View file

@ -1,7 +1,6 @@
<template> <template>
<div> <div style="max-height: 68vh; overflow-y: scroll;">
<div class="q-pa-md" style="max-height: 68vh; overflow-y: scroll"> <q-form ref="myForm" class="q-pa-md">
<q-form ref="myForm">
<div class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md"> <div class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md">
<div class="col-xs-12 col-md-6"> <div class="col-xs-12 col-md-6">
<selector <selector
@ -381,7 +380,6 @@
<q-tooltip>ต่อไป</q-tooltip> <q-tooltip>ต่อไป</q-tooltip>
</q-btn> --> </q-btn> -->
</div> </div>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref } from "vue"; import { ref } from "vue";

14
src/views/MainLayout.vue
View file

@ -1005,10 +1005,14 @@ if (keycloak.tokenParsed != null) {
.q-field--outlined .q-icon { .q-field--outlined .q-icon {
color: #7474747f; color: #7474747f;
} }
.q-card__actions .q-btn--rectangle {
padding: 0 14px !important;
}
/* custom scrollbar */ /* custom scrollbar */
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 20px; width: 12px;
height: 20px; height: 12px;
} }
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
@ -1018,7 +1022,7 @@ if (keycloak.tokenParsed != null) {
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
background-color: #d6dee1; background-color: #d6dee1;
border-radius: 20px; border-radius: 20px;
border: 6px solid transparent; border: 3px solid transparent;
background-clip: content-box; background-clip: content-box;
} }
@ -1026,7 +1030,5 @@ if (keycloak.tokenParsed != null) {
background-color: #a8bbbf; background-color: #a8bbbf;
} }
.q-card__actions .q-btn--rectangle {
padding: 0 14px !important;
}
</style> </style>