Skip to content
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.

Sign up for GitHub

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 layout for component | JIRA: PT-97 #50

Merged
merged 4 commits into from
Jun 1, 2022
Merged

fix layout for component | JIRA: PT-97 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4be3ba0
fix layout
Jun 1, 2022
983bf88
fix layout
Jun 1, 2022
6ad7411
fix layout for component | JIRA: PT-97
Jun 1, 2022
4081699
fix layout
Jun 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/layouts/default-layout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</div>
<router-view v-slot="{ Component }">
<div class="h-19 bg-primary-blue px-4 sm:px-7.5 md:px-8">
<component :is="Component" />
<component :is="Component" class="pb-2.5" />
</div>
</router-view>
</div>
Expand Down
83 changes: 43 additions & 40 deletions src/modules/cards/views/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<template>
<div class="h-full w-full p-6">
<div class="w-full">
<div class="container mx-auto py-4">
<div class="grid lg:grid-cols-12 md:grid-cols-6 sm:grid-cols-3 gap-6">
<div class="col-span-3">
<el-card class="box-card relative flex flex-col px-2">
<el-card class="relative flex flex-col px-2">
<div class="flex flex-wrap">
<div class="basis-0 grow">
<div class="card-header">
Expand All @@ -27,7 +27,7 @@
</el-card>
</div>
<div class="col-span-3">
<el-card class="box-card relative flex flex-col px-2">
<el-card class="relative flex flex-col px-2">
<div class="flex flex-wrap">
<div class="basis-0 grow">
<div class="card-header">
Expand All @@ -36,7 +36,7 @@
<span class="text-lg text-indigo-900 font-bold mb-0">2,356</span>
</div>
<font-awesome-icon
class="text-center inline-flex items-center justify-center rounded-full p-3.5 text-white bg-gradient-to-r from-orange-500 to-orange-200"
class="text-center inline-flex items-center justify-center rounded-full p-3 text-white bg-gradient-to-r from-orange-500 to-orange-200"
:icon="['fas', 'chart-pie']"
size="lg"
/>
Expand All @@ -51,7 +51,7 @@
</el-card>
</div>
<div class="col-span-3">
<el-card class="box-card relative flex flex-col px-2">
<el-card class="relative flex flex-col px-2">
<div class="flex flex-wrap">
<div class="basis-0 grow">
<div class="card-header">
Expand All @@ -75,7 +75,7 @@
</el-card>
</div>
<div class="col-span-3">
<el-card class="box-card relative flex flex-col px-2">
<el-card class="relative flex flex-col px-2">
<div class="flex flex-wrap">
<div class="basis-0 grow">
<div class="card-header">
Expand Down Expand Up @@ -104,7 +104,7 @@
<div class="container mx-auto py-4">
<div class="grid lg:grid-cols-12 md:grid-cols-4 sm:grid-cols-4 gap-8">
<div class="col-span-4">
<el-card class="box-card" :body-style="{ padding: '0px' }">
<el-card class="" :body-style="{ padding: '0px' }">
<img alt="..." src="@/assets/images/window-purple-image.jpg" />
<div class="text-slate-400 p-4 border border-white hover:border-b-slate-200">
Cras justo odio
Expand Down Expand Up @@ -132,7 +132,7 @@
</el-card>

<div class="pt-8">
<el-card class="box-card">
<el-card class="">
<div class="card-header py-2">
<h5 class="text-xl font-medium text-blue-800">Card title</h5>
</div>
Expand All @@ -150,10 +150,7 @@
</div>

<div class="pt-8">
<el-card
class="box-card text-center"
:body-style="{ padding: '0px', position: 'relative' }"
>
<el-card class="text-center" :body-style="{ padding: '0px', position: 'relative' }">
<img alt="..." src="@/assets/images/throne.jpg" />
<div class="justify-center">
<el-link :underline="false" class="card-avatar-profile">
Expand All @@ -169,12 +166,12 @@
<div class="text-center border-0 pt-8 md:py-4 pb-0 card-header">
<div class="flex justify-between">
<div class="ml-4 z-0">
<el-button class="bg-cyan-400 text-white shadow-lg" size="small"
>Connect</el-button
>
<el-button class="shadow-lg w-16" size="small" type="info">Connect</el-button>
</div>
<div class="mr-4 z-0">
<el-button class="shadow-lg" size="small" type="info">Message</el-button>
<el-button class="shadow-lg w-16" size="small" type="default"
>Message</el-button
>
</div>
</div>
</div>
Expand Down Expand Up @@ -224,7 +221,7 @@
</div>

<div class="col-span-4">
<el-card class="box-card">
<el-card class="">
<template #header>
<div class="card-header">
<h5 class="text-xl font-medium text-blue-800">Card title</h5>
Expand Down Expand Up @@ -256,24 +253,24 @@
<el-link
:underline="false"
href="#index"
class="text-base font-bold hover:text-blue"
class="text-normal font-semibold hover:text-blue"
>John Snow</el-link
>
</h4>
<p class="text-base text-slate-500 mb-0">King of the north</p>
<p class="text-sm text-slate-500 mb-0">King of the north</p>
<span class="text-green-500 mr-1">●</span>
<small>Active</small>
</div>
<div class="py-8">
<el-button type="primary" size="small">Add</el-button>
<el-button type="primary" size="small" class="w-10">Add</el-button>
</div>
</div>
</div>
</el-card>
</div>

<div class="pt-8">
<el-card class="box-card text-center">
<el-card class="text-center">
<el-link :underline="false">
<el-avatar :size="150" src="@/assets/images/tyrion_lannister.jpg" />
</el-link>
Expand All @@ -285,22 +282,25 @@
</div>
<div class="flex flex-wrap items-center justify-center p-4 gap-3">
<div>
<el-button type="primary" circle class="p-3 py-5">
<el-button
circle
class="px-1 py-4.5 bg-[#3b5999] border-[#3b5999] active:bg-[#2d4474] active:border-[#2d4474] text-white"
>
<font-awesome-icon :icon="['fab', 'facebook']" size="lg" />
</el-button>
</div>
<div>
<el-button
circle
class="p-3 py-5 bg-[#1da1f2] border-[#1da1f2] active:bg-[#33aaf3] active:border-[#33aaf3] text-white"
class="px-1 py-4.5 bg-[#1da1f2] border-[#1da1f2] active:bg-[#33aaf3] active:border-[#33aaf3] text-white"
>
<font-awesome-icon :icon="['fab', 'twitter']" size="lg" />
</el-button>
</div>
<div>
<el-button
circle
class="p-3 py-5 bg-[#ea4c89] border-[#ea4c89] active:bg-[#ec5d94] active:border-[#ec5d94] text-white"
class="px-1 py-4.5 bg-[#ea4c89] border-[#ea4c89] active:bg-[#ec5d94] active:border-[#ec5d94] text-white"
>
<font-awesome-icon :icon="['fab', 'dribbble']" size="lg" />
</el-button>
Expand All @@ -310,29 +310,28 @@
</div>

<div class="pt-8">
<el-card class="box-card" :body-style="{ padding: '0px' }">
<el-card class="" :body-style="{ padding: '0px' }">
<img alt="..." src="@/assets/images/man_draw.jpg" />
<div class="p-4">
<div class="py-4 px-6">
<div class="text-xl font-semibold py-2 text-indigo-900">Get started with Argon</div>
<div class="font-thin text-xs text-slate-500">
by <el-link class="font-thin text-xs" :underline="false">John Snow</el-link> on
Oct 29th at 10:23 AM
<div class="font-normal text-80 text-slate-500">
by John Snow on Oct 29th at 10:23 AM
</div>
<p class="mt-4 text-slate-500 py-4">
<p class="mt-4 text-slate-500 py-3.5">
Argon is a great free UI package based on Bootstrap 4 that includes the most
important components and features.
</p>
<el-button
class="el-button--secondary text-sky-700 px-0 text-base font-semibold py-4"
plain
><span class="text-indigo-900">View article</span></el-button
>
<a href="#!" class="px-0 py-8">
<span class="text-primary-blue hover:text-indigo-800 text-sm font-semibold"
>View article</span
>
</a>
</div>
</el-card>
</div>

<div class="pt-8">
<el-card class="box-card" :body-style="{ padding: '0px' }">
<el-card class="" :body-style="{ padding: '0px' }">
<div class="text-white p-4 bg-gradient-to-r from-slate-800 to-indigo-900">
<div class="py-3">
<span class="text-xl font-medium">Testimonial</span>
Expand All @@ -357,7 +356,7 @@
<div class="col-span-4">
<el-card
:body-style="{ padding: '0px' }"
class="box-card text-center bg-gradient-to-r from-emerald-500 to-emerald-300"
class="text-center bg-gradient-to-r from-emerald-500 to-emerald-300"
>
<template #header>
<div class="card-header">
Expand Down Expand Up @@ -435,7 +434,7 @@
</el-card>

<div class="pt-8">
<el-card class="box-card items-center">
<el-card class="items-center">
<template #header>
<div class="card-header flex justify-between py-2">
<h5 class="text-xl font-medium text-blue-800">Card title</h5>
Expand All @@ -458,7 +457,7 @@
</div>

<div class="pt-8">
<el-card class="box-card" :body-style="{ padding: '0px', position: 'relative' }">
<el-card class="" :body-style="{ padding: '0px', position: 'relative' }">
<img class="" alt="..." src="@/assets/images/window-purple-image.jpg" />
<div
class="absolute text-white p-3 inset-y-0 left-0 flex items-center justify-center"
Expand All @@ -482,7 +481,7 @@
</div>

<div class="pt-8">
<el-card :body-style="{ padding: '0px' }" class="box-card text-center">
<el-card :body-style="{ padding: '0px' }" class="text-center">
<template #header>
<div class="card-header">
<h5 class="font-bold text-indigo-500 py-4">BRAVO PACK</h5>
Expand Down Expand Up @@ -589,6 +588,10 @@ export default defineComponent({
</script>

<style scoped>
:deep(.card-avatar-profile.el-link) .el-link--inner {
@apply absolute;
}

.el-button {
@apply font-semibold !important;
}
Expand Down
30 changes: 16 additions & 14 deletions src/modules/icons/views/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
<template>
<div class="card-typography w-full md:w-full lg:w-2/3 mx-auto">
<div class="card-header p-5">
<h3 class="text-lg">Icons</h3>
</div>
<div class="p-5">
<div class="grid md:grid-cols-2 md:gap-x-7 lg:grid-cols-4 lg:gap-x-7">
<div class="w-full overflow-hidden p-0.5" v-for="(icon, key) in icons" :key="key">
<el-button>
<el-icon>
<component :is="icon.icon" />
</el-icon>
<span>{{ icon.name }}</span>
</el-button>
<div class="w-full md:w-full lg:w-2/3 mx-auto">
<div class="card-typography">
<div class="card-header p-5">
<h3 class="text-lg">Icons</h3>
</div>
<div class="p-5">
<div class="grid md:grid-cols-2 md:gap-x-7 lg:grid-cols-4 lg:gap-x-7">
<div class="w-full overflow-hidden p-0.5" v-for="(icon, key) in icons" :key="key">
<el-button>
<el-icon>
<component :is="icon.icon" />
</el-icon>
<span>{{ icon.name }}</span>
</el-button>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -767,7 +769,7 @@ body {
@apply text-2xl text-primary-blue inline-block #{!important};
}
.card-typography {
@apply bg-white break-words mt-5 mb-7 shadow rounded-lg flex flex-col;
@apply bg-white break-words mt-2 mb-7 shadow rounded-lg flex flex-col;
}
.card-header {
@apply p-5 border-b border-primary-white;
Expand Down
2 changes: 1 addition & 1 deletion src/modules/notification/views/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ export default defineComponent({

<style lang="scss" scoped>
.card-typography {
@apply bg-white break-words mt-5 mb-7 shadow rounded-lg flex flex-col;
@apply bg-white break-words mt-2.5 mb-7 shadow rounded-lg flex flex-col;
}
.card-header {
@apply p-5 border-b border-primary-white;
Expand Down