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

Tailwind css added #1996

Merged
merged 18 commits into from
Mar 13, 2024
Merged

Tailwind css added #1996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a392443
Added tailwindcss
Aunshon Sep 14, 2023
86468ee
Added tailwindcss
Aunshon Sep 14, 2023
f247db9
Fix broken design after adding tailwindcss
Aunshon Sep 14, 2023
c7ed80b
Enable autoprefixer
Aunshon Sep 14, 2023
b7e46af
Fix broken style of admin notice
Aunshon Sep 14, 2023
cbeea05
Fix whats new icon style
Aunshon Sep 14, 2023
851ba25
Merge branch 'develop' into chore/tailwind-css-added
Aunshon Sep 27, 2023
937102c
Merge branch 'develop' into chore/tailwind-css-added
Aunshon Oct 2, 2023
db6a56d
Fix broken design
Aunshon Oct 19, 2023
4f8e6ca
Merge branch 'develop' into chore/tailwind-css-added
Aunshon Nov 8, 2023
3a3f69c
Fix tailwind broken design
Aunshon Nov 21, 2023
7e5be99
Fix tailwind broken design
Aunshon Nov 21, 2023
25fae4f
Fix tailwind broken design
Aunshon Nov 22, 2023
0b1c9eb
Update tailwind.config.js
shohag121 Dec 29, 2023
be2d6d1
Update: tailwind css configuration.
Aunshon Jan 4, 2024
e7b4f4d
Merge branch 'develop' into chore/tailwind-css-added
Aunshon Feb 28, 2024
2b9aa5c
Fix: tailwind css override issues in checkbox and vendor add payment …
Aunshon Feb 28, 2024
d6b57e6
Fix broken design
Aunshon Oct 19, 2023
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
1 change: 1 addition & 0 deletions assets/src/less/admin.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
background-color: #ff5a40;
border-radius: 53px;
border: 2px solid #fff;
box-sizing: content-box;
}

&:hover {
Expand Down
2 changes: 2 additions & 0 deletions bin/clean-useless-files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ const targetFiles = [
'assets/js/setup.js',
'assets/js/setup-no-wc-style.js',
'assets/js/style.js',
'assets/js/dokan-tailwind.js',

'assets/js/dokan-promo-notice.js.LICENSE.txt',
'assets/js/vue-admin.js.LICENSE.txt',
'assets/js/vue-bootstrap.js.LICENSE.txt',
Expand Down
6 changes: 5 additions & 1 deletion includes/Assets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ public function get_styles() {
],
'dokan-vue-admin' => [
'src' => DOKAN_PLUGIN_ASSEST . '/css/vue-admin.css',
'deps' => [ 'dokan-vue-vendor', 'dokan-vue-bootstrap' ],
'deps' => [ 'dokan-vue-vendor', 'dokan-vue-bootstrap', 'dokan-tailwind' ],
'version' => filemtime( DOKAN_DIR . '/assets/css/vue-admin.css' ),
],
'dokan-vue-frontend' => [
Expand Down Expand Up @@ -348,6 +348,10 @@ public function get_styles() {
'src' => DOKAN_PLUGIN_ASSEST . '/css/dokan-admin-product-style.css',
'version' => filemtime( DOKAN_DIR . '/assets/css/dokan-admin-product-style.css' ),
],
'dokan-tailwind' => [
'src' => DOKAN_PLUGIN_ASSEST . '/css/dokan-tailwind.css',
'version' => filemtime( DOKAN_DIR . '/assets/css/dokan-tailwind.css' ),
],
];

return $styles;
Expand Down
21 changes: 0 additions & 21 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"mini-css-extract-plugin": "^2.7.6",
"papaparse": "^5.4.1",
"replace-in-file": "^6.3.5",
"tailwindcss": "^3.3.3",
"vue": "^2.7.14",
"vue-chartjs": "^3.5.1",
"vue-color": "^2.8.1",
Expand Down
6 changes: 6 additions & 0 deletions postcss.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
}
}
40 changes: 20 additions & 20 deletions src/admin/components/AddReverseWithdraw.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
@close='closeModal'
>
<div slot='body' class='dokan-rw-body'>
<div class='dokan-rw-section'>
<div class='dokan-rw-section-heading'>
<h3>{{ __('Select vendor', 'dokan-lite') }}</h3>
<div class='dokan-rw-section mb-4'>
<div class='dokan-rw-section-heading mb-[-0.5rem]'>
<h3 class='font-bold text-[1.3em]'>{{ __('Select vendor', 'dokan-lite') }}</h3>
</div>
<div class='dokan-rw-section-body'>
<div class="form-group dokan-rw-multiselect">
Expand All @@ -33,9 +33,9 @@
</div>
</div>

<div class='dokan-rw-section'>
<div class='dokan-rw-section-heading'>
<h3>{{ __('Transaction Type', 'dokan-lite') }}</h3>
<div class='dokan-rw-section mb-4'>
<div class='dokan-rw-section-heading mb-1'>
<h3 class='font-bold text-[1.3em]'>{{ __('Transaction Type', 'dokan-lite') }}</h3>
</div>
<div class='dokan-rw-section-body'>
<dokan-radio-group
Expand All @@ -47,9 +47,9 @@
</div>
</div>

<div class='dokan-rw-section' v-if="'manual_product' === transectionType">
<div class='dokan-rw-section-heading'>
<h3>{{ __('Select Product', 'dokan-lite') }}</h3>
<div class='dokan-rw-section mb-4' v-if="'manual_product' === transectionType">
<div class='dokan-rw-section-heading mb-[-0.5rem]'>
<h3 class='font-bold text-[1.3em]'>{{ __('Select Product', 'dokan-lite') }}</h3>
</div>
<div class='dokan-rw-section-body'>
<div class="form-group dokan-rw-multiselect">
Expand All @@ -73,9 +73,9 @@
</div>
</div>

<div class='dokan-rw-section' v-if="'manual_order' === transectionType">
<div class='dokan-rw-section-heading'>
<h3>{{ __('Select Order', 'dokan-lite') }}</h3>
<div class='dokan-rw-section mb-4' v-if="'manual_order' === transectionType">
<div class='dokan-rw-section-heading mb-1'>
<h3 class='font-bold text-[1.3em]'>{{ __('Select Order', 'dokan-lite') }}</h3>
</div>
<div class='dokan-rw-section-body'>
<div class="form-group dokan-rw-multiselect">
Expand All @@ -99,9 +99,9 @@
</div>
</div>

<div class='dokan-rw-section'>
<div class='dokan-rw-section-heading'>
<h3>{{ __('Withdrawal Balance Type', 'dokan-lite') }}</h3>
<div class='dokan-rw-section mb-4'>
<div class='dokan-rw-section-heading mb-1'>
<h3 class='font-bold text-[1.3em]'>{{ __('Withdrawal Balance Type', 'dokan-lite') }}</h3>
<i
class="dashicons dashicons-editor-help tips"
:title="__( 'Adjust Balance by Creating a New Reverse Withdrawal Entry', 'dokan-lite' )"
Expand All @@ -118,9 +118,9 @@
</div>
</div>

<div class='dokan-rw-section'>
<div class='dokan-rw-section-heading'>
<h3>{{ __('Reverse Withdrawal Amount', 'dokan-lite') }}</h3>
<div class='dokan-rw-section mb-4'>
<div class='dokan-rw-section-heading mb-1'>
<h3 class='font-bold text-[1.3em]'>{{ __('Reverse Withdrawal Amount', 'dokan-lite') }}</h3>
</div>
<div class='dokan-rw-section-body'>
<div class="dokan-rw-input">
Expand All @@ -136,8 +136,8 @@
</div>

<div class='dokan-rw-section'>
<div class='dokan-rw-section-heading'>
<h3>{{ __('Notes', 'dokan-lite') }}</h3>
<div class='dokan-rw-section-heading mb-1'>
<h3 class='font-bold text-[1.3em]'>{{ __('Notes', 'dokan-lite') }}</h3>
</div>
<div class='dokan-rw-section-body'>
<div class="dokan-rw-note-area">
Expand Down
2 changes: 1 addition & 1 deletion src/admin/components/AdminNotice.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="notice dokan-admin-notices-wrap">
<div class="dokan-admin-notices" v-if="notices && notices.length">
<transition-group :name="transitionName" tag="div" class="dokan-notice-slides">
<transition-group :name="transitionName" tag="div" class="dokan-notice-slides leading-[1.5em] box-content">
<template v-for="(notice, index) in notices">
<div class="dokan-admin-notice" :key="index" v-show="(index + 1) === current_notice" :class="`dokan-${notice.type}`" @mouseenter="stopAutoSlide" @mouseleave="startAutoSlide">
<div class="notice-content" :style="! notice.title || ! notice.actions || ! notice.description ? 'align-items: center' : 'align-items: start'">
Expand Down
6 changes: 3 additions & 3 deletions src/admin/components/CardFunFact.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="dokan-card-fun-fact">
<div class="dokan-card-fun-fact mr-[20px] last:mr-0 mt-[20px]">
<div class="card-fun-fact__icon">
<span class="fa-stack fa-2x">
<i class="fas fa-circle fa-stack-2x" v-bind:style="{ color: circle_background }"></i>
Expand Down Expand Up @@ -86,8 +86,8 @@ export default {
transition: height 1000ms;
display: flex;
align-items: center;
flex-basis: 20%;
margin: 10px;
width: calc(25% - 15px);
//margin: 10px;

.rounded-icon {
background-color: #ccc;
Expand Down
5 changes: 2 additions & 3 deletions src/admin/components/Fields.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@
</fieldset>
<div class="field scl_fields" :class="fieldData.enable_status && 'off' === socialChecked ? 'scl_fields_disable' : ''">
<div class="scl_header">
<div class="scl_contents">
<div class="scl_contents ">
<div class="scl_icon">
<img :src="fieldData.icon_url" :alt="fieldData.label" />
</div>
Expand Down Expand Up @@ -1082,6 +1082,7 @@

a {
display: inline-block;
text-decoration: underline;

&:hover {
box-shadow: 0 0 0 1px transparent;
Expand Down Expand Up @@ -1128,7 +1129,6 @@
color: #000;
cursor: inherit;
margin: 9px 0 9px 15px;
border: 1px solid rgba(0, 0, 0, 0.10);
display: inline-block;
font-size: 12px;
font-style: normal;
Expand Down Expand Up @@ -1323,7 +1323,6 @@
justify-content: space-between;

.scl_contents {
flex: 2;
display: flex;
align-items: center;

Expand Down
2 changes: 1 addition & 1 deletion src/admin/components/Modal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export default {
.modal-body {
min-height: 100px;
padding: 15px;
overflow-y: scroll;
overflow-y: auto;
}

footer {
Expand Down
Loading
Loading