Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
74ecdd3
Create sync.yml
ali-ramadan-7 Mar 13, 2025
f9c305a
Update sync.yml
ali-ramadan-7 Mar 13, 2025
d21cc93
Update sync.yml
ali-ramadan-7 Mar 13, 2025
a2333ef
Update sync.yml
ali-ramadan-7 Mar 13, 2025
3535b22
Update sync.yml
kareemalaa010 Mar 13, 2025
99185b0
Update sync.yml
kareemalaa010 Mar 13, 2025
70a80f7
Update sync.yml
kareemalaa010 Mar 13, 2025
e057cb9
Update sync.yml
kareemalaa010 Mar 13, 2025
fa2eca2
Update sync.yml
kareemalaa010 Mar 13, 2025
ada0539
Update sync.yml
kareemalaa010 Mar 13, 2025
88738f5
Update sync.yml
kareemalaa010 Mar 13, 2025
bfc2705
Update sync.yml
kareemalaa010 Mar 13, 2025
bb223b6
Update sync.yml
kareemalaa010 Mar 13, 2025
cde0282
Update sync.yml
kareemalaa010 Mar 13, 2025
8538b23
Update sync.yml
kareemalaa010 Mar 13, 2025
c9980df
Update sync.yml
kareemalaa010 Mar 13, 2025
5afafa3
Update sync.yml
kareemalaa010 Mar 13, 2025
af1b3d0
Update sync.yml
kareemalaa010 Mar 13, 2025
fe13b34
Update sync.yml
kareemalaa010 Mar 13, 2025
5aa79fd
test after link
Mar 13, 2025
1581e69
edit
Mar 13, 2025
25f744f
Merge main into modes_test [automated]
github-actions[bot] Mar 13, 2025
c8e31c8
Update sync.yml
kareemalaa010 Mar 13, 2025
49c0379
Update sync.yml
kareemalaa010 Mar 13, 2025
ab61bfa
Merge main into modes_test [automated]
github-actions[bot] Mar 13, 2025
6eb5f30
Merge remote-tracking branch 'upstream/main'
github-actions[bot] Mar 17, 2025
ae639bb
Merge main into modes_test [automated]
github-actions[bot] Mar 17, 2025
17cefb4
Merge remote-tracking branch 'upstream/main'
github-actions[bot] Mar 18, 2025
61fb9ef
Merge main into modes_test [automated]
github-actions[bot] Mar 18, 2025
64d3ec1
Merge branch 'main' of github.com:themiify/custom-theme-zid-fork into…
Mar 27, 2025
bb8939d
add modes of products
Mar 27, 2025
053347e
Merge branch 'modes_test' of github.com:themiify/custom-theme-zid-for…
Mar 27, 2025
d672d77
Update sync.yml
kareemalaa010 Mar 27, 2025
ef7a3f9
edit
Mar 27, 2025
e214c46
Merge branch 'modes_test' of github.com:themiify/custom-theme-zid-for…
Mar 27, 2025
19ea016
Update sync.yml
kareemalaa010 Mar 27, 2025
025e2d7
Update sync.yml
kareemalaa010 Mar 27, 2025
57ca06d
edit
Mar 27, 2025
74ab9a8
Update sync.yml
kareemalaa010 Mar 27, 2025
59ba4e9
Update sync.yml
kareemalaa010 Mar 27, 2025
d8f4a35
edit
Mar 27, 2025
e54697f
Update sync.yml
kareemalaa010 Mar 27, 2025
745cd29
Update sync.yml
kareemalaa010 Mar 27, 2025
bc9192c
Update sync.yml
kareemalaa010 Mar 27, 2025
09e6ff2
test
Mar 27, 2025
10a7baf
edit
Apr 6, 2025
b870b34
Merge branch 'modes_test' of github.com:themiify/custom-theme-zid-for…
Apr 6, 2025
361cfa5
edit fork
Apr 6, 2025
0348bd6
edit
Apr 6, 2025
3783a26
edit
Apr 6, 2025
5375bd5
Update sync.yml
ali-ramadan-7 Apr 6, 2025
e43c267
edit
Apr 6, 2025
9d97a77
Update sync.yml
kareemalaa010 Apr 6, 2025
4d82b75
Update sync.yml
kareemalaa010 Apr 6, 2025
ce277b9
Update sync.yml
kareemalaa010 Apr 6, 2025
a0e8d88
Sync with upstream main
github-actions[bot] Apr 6, 2025
2f99985
edit
Apr 6, 2025
cf380d4
Merge branch 'main' of github.com:themiify/custom-theme-zid-fork
Apr 6, 2025
5b06b1a
Sync with upstream main
github-actions[bot] Apr 6, 2025
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
67 changes: 67 additions & 0 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: Universal Branch Sync

on:
push:
branches:
- '**'
pull_request:
branches:
- '**'
schedule:
- cron: "0 0 * * *"
workflow_dispatch:
inputs:
branch:
description: 'Branch to sync (leave empty for current)'
required: false
default: ''

jobs:
sync-branches:
runs-on: ubuntu-latest
steps:
- name: ✅ Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GH_PAT }}

- name: 🔧 Configure Git
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"

- name: 🔗 Add Upstream Repository
run: |
git remote add upstream https://github.com/zidsa/custom-theme-sample.git || true
git fetch --prune upstream

- name: 🔄 Sync Main Branch Safely
run: |
git checkout main || git checkout -b main
git pull upstream main --no-rebase --no-commit || true
git push origin main

- name: 🔍 Determine Current Branch
id: branch
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_ENV

- name: 🔄 Sync Feature Branches with Main
run: |
for branch in $(git branch -r | grep -v 'origin/main' | grep -v 'HEAD' | sed 's/origin\///'); do
echo "➡️ Checking branch: $branch"
git checkout "$branch" || continue
git merge origin/main --no-commit --no-ff || true

if git diff-index --quiet HEAD; then
echo "✅ Branch '$branch' is already up-to-date."
else
echo "🚀 Updating branch '$branch'..."
git commit -m "Sync with upstream main"
git push origin "$branch"
fi
done

- name: 🧹 Post Checkout Repository
if: always()
run: echo "Post-job steps finished."
127 changes: 114 additions & 13 deletions assets/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -266,15 +266,14 @@
margin-left: -15px;
}

.products-list .prod-col, .bundle-offer-products .prod-col{
width: 20%;
padding: 15px;
.products-list{
display: grid;
gap: 10px;
grid-template-columns: repeat(4,1fr);
}

.products-list .prod-col-attr{
width: 25%;
.products-list .product-item{
width: 100%;
}

.sort-block-width {
margin-left: 30px;
}
Expand Down Expand Up @@ -538,10 +537,10 @@
padding-right: 0px;
}

.main-slider, .main-slider .slider-item {

.products-list{
grid-template-columns: repeat(2,1fr);
margin-inline: 10px;
}

.main-slider .slick-dots li button:before {
font-size: 10px;
}
Expand All @@ -562,7 +561,7 @@
}

.products-list .prod-col, .products-list .prod-col-attr{
width: 50%;
width: 100%;
}

.product-item {
Expand All @@ -585,9 +584,14 @@
width: 32px;
}

}

}

@media ( min-width: 769px ) and ( max-width: 992px){
.products-list{
grid-template-columns: repeat(3,1fr);
}
}
.btn:focus,.btn:active, .page-link:focus, .page-link:active {
outline: none !important;
box-shadow: none;
Expand Down Expand Up @@ -636,7 +640,7 @@
height: 35px;
cursor: pointer;
border-radius: 5px;
background-color: white;
background-color: transparent;
}

.rtl .add-to-wishlist {
Expand All @@ -659,3 +663,100 @@
mask-image: url('./heart-filled.svg');
background-color: var(--primary_color, #D86F6F);
}

/* product0-slider */
.custom-slider-section {
margin-bottom: 4rem;
}
.custom-product-title{
font-size: 32px;
font-weight: 600;
}
.custom-main-title {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 20px;
}

.slider-navigation {
display: flex;
gap: 10px;
}
.slider-navigation .swiper-button-prev,
.slider-navigation .swiper-button-next {
color: white;
background: var(--primary-color);
opacity: 0.8;
border-radius: 50%;
width: 53px;
height: 53px;
display: flex;
justify-content: center;
align-items: center;
z-index: 2;
position: static;
}
.slider-navigation .swiper-button-next:after,
.slider-navigation .swiper-button-prev:after {
font-size: 15px;
}
.slider-navigation .swiper-button-next.swiper-button-disabled,
.slider-navigation .swiper-button-prev.swiper-button-disabled {
opacity: 0.5;
}
.custom-slider-section .swiper-container {
overflow: hidden;
}
{# style grid #}
.show-all-btn {
width: 325px;
height: 63px;
padding: 15px 120px 10px 120px;
margin: auto;
display: flex;
align-items: center;
justify-content: center;
font-size: 32px;
font-weight: 700;
line-height: 38.4px;
text-align: center;
background: var(--primary-color);
color: white;
}
.custom-slider-section .product-grid {
display: grid;
grid-template-columns: repeat(4, 1fr);
gap: 15px;
}
@media (max-width: 768px) {
.custom-slider-section .product-grid {
grid-template-columns: repeat(3, 1fr);
}
}
@media (max-width: 500px) {
.custom-slider-section {
margin-bottom: 2rem;
}
.custom-product-title{
text-align: center;
margin:auto;
font-size: 24px;
}
.custom-slider-section .product-grid {
grid-template-columns: repeat(2, 1fr);
gap: 5px;
}
.slider-navigation .swiper-button-prev,
.slider-navigation .swiper-button-next {
display: none;
}
.show-all-btn {
width: 163px;
height: 31px;
padding: 7px 60px 5px 60px;
font-size: 16px;
font-weight: 700;
line-height: 19.2px;
}
}
71 changes: 12 additions & 59 deletions assets/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,10 @@ button.more-button , a.more-button {

.account-lang-currency .account-btn {
background-color: transparent;
border: 1px solid var(--menu-header-text-color-primary-bg, var(--text-color-primary-bg));
border: 1px solid var(--header-text-color-primary-bg, var(--text-color-primary-bg));
box-sizing: border-box;
border-radius: 5px;
color: var(--menu-header-text-color-primary-bg, var(--text-color-primary-bg));
color: var(--header-text-color-primary-bg, var(--text-color-primary-bg));
min-width: 124px;
padding: 3px 5px;
}
Expand Down Expand Up @@ -805,61 +805,6 @@ button.more-button , a.more-button {
font-size: 18px;
}

/*
.cat-col, .prod-col {
flex: 0 0 20%;
max-width: 20%;

position: relative;
width: 100%;
min-height: 1px;
padding-right: 15px;
padding-left: 15px;
}

.prod-col-tb {
padding-top: 15px;
padding-bottom: 15px;
}

.slider-arrow {
height: 50px;
position: absolute;
top: 50%;
-webkit-transform: translateY(-50%);
-ms-transform: translateY(-50%);
transform: translateY(-50%);
cursor: pointer;
}

.slider-arrow span {
color: #ffffff;
font-size: 40px;
}

.slider-arrow.right {
right: -40px;
}

.slider-arrow.left {
left: -40px;
}

@media only screen and (max-width: 768px) {

.home-categories-section .categories {
grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
}

}

@media only screen and (max-width: 414px) {

.home-categories-section .categories {
grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
}

} */
/* products-section */

.products-section {
Expand Down Expand Up @@ -968,7 +913,6 @@ button.more-button , a.more-button {

.product-item {
width: 100%;
max-width: 200px;
}

.product-item .product-title {
Expand Down Expand Up @@ -1012,7 +956,7 @@ button.more-button , a.more-button {
.product-item img {
max-width: 100%;
max-height: 100%;
object-fit: contain;
object-fit: cover;
}

.products-title-section {
Expand Down Expand Up @@ -1747,6 +1691,14 @@ hr {

}

.btns-card .btn-primary {
width: 100%;
height: 40px;
display: flex;
justify-content: center;
align-items: center;
font-size: 16px;
}
.btn-primary {
color: var(--text-color-primary-bg);
background-color: var(--primary-color);
Expand All @@ -1764,6 +1716,7 @@ hr {
border-color: #cccccc;
}


.form-control:focus {
box-shadow: none !important;
border-color: #cccccc;
Expand Down
Loading