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

Merge branch 'aom_dev'

Browse source 
# Conflicts:
#	src/modules/00_contact/views/Main.vue
#	src/views/MainLayout.vue
This commit is contained in:
kanyarat2001 2023-12-15 10:43:44 +07:00
commit 66671faf81
3 changed files with 245 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/views/MainLayout.vue
View file

@ -79,9 +79,15 @@ const onScroll = (info: any) => { scrollInfo.value = info}
<img src="@/assets/logo.png" style="height: 35px; max-width: 35px" />
</div>
<q-space></q-space>
<<<<<<< HEAD
<div class="row q-col-gutter-x-sm">
<div><q-btn flat color="white" label="หน้าแรก" @click="goHome"/></div>
<div><q-btn color="primary" label="ติดต่อเรา" @click="click()"/></div>
=======
<div>
<q-btn class="text-weight-medium" flat color="white" label="หน้าแรก" @click="goHome"/>
<q-btn color="secondary" text-color="white" label="ติดต่อเรา" @click="click()"/>
>>>>>>> aom_dev
</div>
</q-toolbar>
</q-header>
@ -100,9 +106,15 @@ const onScroll = (info: any) => { scrollInfo.value = info}
</template>
</q-input>
</div>
<<<<<<< HEAD
<div class="col-xs-10 col-md-8 row q-col-gutter-md" style=" margin-top: 80px;" v-if="currentRoute == 'home'">
<div class="col-12 row justify-center text-h6 text-dark">ระบบทรัพยากรบุคคล</div>
<div class="col-12"><q-separator color="grey-4" /></div>
=======
<div class="col-xs-10 col-md-8 row q-col-gutter-md" style=" margin-top: 80px;" v-if="currentRouteName == ''">
<div class="col-12 row justify-center text-h6 text-dark">ระบบทรัพยากรบุคคล</div>
<div class="col-12"><q-separator color="grey-4" /></div>
>>>>>>> aom_dev
<div class="col-12">
<div class="col-12 row q-col-gutter-lg">