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

Dark - fixing the direction of the arrows #51

Merged
merged 3 commits into from
Sep 24, 2024
Merged

Dark - fixing the direction of the arrows #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5078b4
fixing aura theme
bj-anas Sep 23, 2024
6208be5
fixing harmony
bj-anas Sep 23, 2024
d2857fe
fixing meraki
bj-anas Sep 23, 2024
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
12 changes: 7 additions & 5 deletions themes/aura/assets/desktop-slider.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@
.splide{
height:var(--mobile-height);
}
@media (min-width: 768px){
.splide{
height:var(--desktop-height);
}
}

.yc-slider__desktop{
display:none;
}
@media (min-width: 768px){
.splide{
height:var(--desktop-height);
}
.yc-slider__desktop{
display:block;
}
Expand Down Expand Up @@ -55,10 +57,10 @@
.yc-slider__desktop .content p{
margin-top:1rem;
}
.yc-slider__desktop .content .btn-holder {
.yc-slider__desktop .content .btn-holder{
margin-top:1em;
text-align:var(--alignment);
}
.yc-slider__desktop .content .btn-holder a {
.yc-slider__desktop .content .btn-holder a{
display:inline-flex;
}
3 changes: 0 additions & 3 deletions themes/aura/assets/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,9 +615,6 @@ textarea{
.breadcrumbs-container .breadcrumbs-listings .third-listing{
font-weight:800;
}
[dir=ltr] .breadcrumbs-container .breadcrumbs-listings .arrow{
rotate:180deg;
}
.breadcrumbs-container .breadcrumbs-name{
font-weight:700;
font-size:26px;
Expand Down
6 changes: 3 additions & 3 deletions themes/aura/assets/mobile-slider.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
height:100%;
display:flex;
justify-content:center;
flex-direction: column;
flex-direction:column;
padding:0 20px;
text-align:var(--alignment);
}
Expand All @@ -28,10 +28,10 @@
.yc-slider__mobile .content p{
margin-top:1rem;
}
.yc-slider__desktop .content .btn-holder {
.yc-slider__mobile .content .btn-holder{
margin-top:1em;
text-align:var(--alignment);
}
.yc-slider__desktop .content .btn-holder a {
.yc-slider__mobile .content .btn-holder a{
display:inline-flex;
}
2 changes: 1 addition & 1 deletion themes/aura/sections/main-page.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="listings__item">
<a href="/" class="first-listing">{{ 'snippets.collection-listing.home' | t }}</a>
</div>
<div class="listings__item arrow">
<div class="listings__item">
<ion-icon name="chevron-forward-outline"></ion-icon>
</div>
<div class="listings__item">
Expand Down
4 changes: 2 additions & 2 deletions themes/aura/snippets/breadcrumbs.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<a href="/" class="first-listing">{{ 'snippets.collection-listing.home' | t }}</a>
</div>
{%- if template contains 'collection' or template contains 'list-collections' -%}
<div class="listings__item arrow">
<div class="listings__item">
<ion-icon name="chevron-forward-outline"></ion-icon>
</div>
<div class="listings__item">
<a href="/collections" class="second-listing">{{ 'snippets.collection-listing.collections' | t }}</a>
</div>
{% endif %}
{% if category %}
<div class="listings__item arrow">
<div class="listings__item">
<ion-icon name="chevron-forward-outline"></ion-icon>
</div>
<div class="listings__item">
Expand Down
9 changes: 2 additions & 7 deletions themes/aura/styles/desktop-slider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

.splide {
height: var(--mobile-height);

@include breakpoint('md') {
height: var(--desktop-height);
}
Expand Down Expand Up @@ -58,15 +58,10 @@
.btn-holder {
margin-top: 1em;
text-align: var(--alignment);

a {
display: inline-flex;
}
}

.container {
& > div {
max-width: 600px;
}
}
}
}
6 changes: 0 additions & 6 deletions themes/aura/styles/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,12 +698,6 @@ textarea {
.third-listing {
font-weight: 800;
}

.arrow {
[dir='ltr'] & {
rotate: 180deg;
}
}
}

.breadcrumbs-name {
Expand Down
5 changes: 3 additions & 2 deletions themes/harmony/assets/desktop-slider.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
.yc-slider__desktop .content .headers, .yc-slider__desktop .content h3, .yc-slider__desktop .content h2, .yc-slider__desktop .content h1{
font-weight:700;
line-height:1.2;
margin-bottom:2rem;
}
.yc-slider__desktop .content h1{
font-size:3rem;
Expand All @@ -56,10 +57,10 @@
.yc-slider__desktop .content p{
margin-top:1rem;
}
.yc-slider__desktop .content .btn-holder {
.yc-slider__desktop .content .btn-holder{
margin-top:1em;
text-align:var(--alignment);
}
.yc-slider__desktop .content .btn-holder a {
.yc-slider__desktop .content .btn-holder a{
display:inline-flex;
}
3 changes: 0 additions & 3 deletions themes/harmony/assets/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,9 +638,6 @@ textarea{
color:#000000;
font-weight:600;
}
[dir=ltr] .breadcrumbs-container .breadcrumbs-listings .arrow{
rotate:180deg;
}
.breadcrumbs-container .breadcrumbs-name{
font-weight:400;
font-size:24px;
Expand Down
7 changes: 4 additions & 3 deletions themes/harmony/assets/mobile-slider.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
height:100%;
display:flex;
justify-content:center;
flex-direction: column;
flex-direction:column;
padding:0 20px;
text-align:var(--alignment);
}
.yc-slider__mobile .content .headers, .yc-slider__mobile .content h3, .yc-slider__mobile .content h2, .yc-slider__mobile .content h1{
font-weight:700;
line-height:1.2;
margin-bottom:2rem;
}
.yc-slider__mobile .content h1{
font-size:3rem;
Expand All @@ -27,10 +28,10 @@
.yc-slider__mobile .content p{
margin-top:1rem;
}
.yc-slider__desktop .content .btn-holder {
.yc-slider__mobile .content .btn-holder{
margin-top:1em;
text-align:var(--alignment);
}
.yc-slider__desktop .content .btn-holder a {
.yc-slider__mobile .content .btn-holder a{
display:inline-flex;
}
2 changes: 1 addition & 1 deletion themes/harmony/assets/navbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
}
}
.yc-header .yc-navbar .logo img{
width: 100%;
width:100%;
max-width:110px;
max-height:70px;
}
Expand Down
8 changes: 4 additions & 4 deletions themes/harmony/snippets/breadcrumbs.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@
<a href="/" class="first-listing">{{ 'snippets.collection-listing.home' | t }}</a>
</div>
{%- if template contains 'collection' or template contains 'list-collections' -%}
<div class="listings__item arrow">
<div class="listings__item">
<ion-icon name="chevron-forward-outline"></ion-icon>
</div>
<div class="listings__item">
<a href="/collections" class="second-listing">{{ 'snippets.collection-listing.collections' | t }}</a>
</div>
{% endif %}
{% if category %}
<div class="listings__item arrow">
<div class="listings__item">
<ion-icon name="chevron-forward-outline"></ion-icon>
</div>
<div class="listings__item">
<a href="/collections/{{ category.slug }}" class="third-listing">{{ category.name}}</a>
</div>
{%- endif -%}
{%- if template contains 'cart' -%}
<div class="listings__item arrow">
<div class="listings__item">
<ion-icon name="chevron-forward-outline"></ion-icon>
</div>
<div class="listings__item">
<a href="/cart" class="second-listing">{{ 'cart.title' | t }}</a>
</div>
{% endif %}
{% if template contains 'page' %}
<div class="listings__item arrow">
<div class="listings__item">
<ion-icon name="chevron-forward-outline"></ion-icon>
</div>
<div class="listings__item">
Expand Down
11 changes: 3 additions & 8 deletions themes/harmony/styles/desktop-slider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

.splide {
height: var(--mobile-height);

@include breakpoint('md') {
height: var(--desktop-height);
}

.splide__arrow {
margin: 0 100px;
}
Expand Down Expand Up @@ -64,15 +64,10 @@
.btn-holder {
margin-top: 1em;
text-align: var(--alignment);

a {
display: inline-flex;
}
}

.container {
& > div {
max-width: 600px;
}
}
}
}
6 changes: 0 additions & 6 deletions themes/harmony/styles/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,12 +723,6 @@ textarea {
font-weight: 600;
}
}

.arrow {
[dir='ltr'] & {
rotate: 180deg;
}
}
}

.breadcrumbs-name {
Expand Down
1 change: 1 addition & 0 deletions themes/harmony/styles/mobile-slider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
.btn-holder {
margin-top:1em;
text-align:var(--alignment);

a {
display: inline-flex;
}
Expand Down
3 changes: 0 additions & 3 deletions themes/meraki/assets/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,9 +654,6 @@ textarea{
.breadcrumbs-container .breadcrumbs-listings .arrow-item{
color:#9C9C9C;
}
[dir=ltr] .breadcrumbs-container .breadcrumbs-listings .arrow{
rotate:180deg;
}
.breadcrumbs-container .breadcrumbs-name{
font-weight:700;
font-size:26px;
Expand Down
1 change: 0 additions & 1 deletion themes/meraki/assets/mobile-slider.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
.yc-slider__mobile .content .btn-holder{
text-align:var(--alignment);
}

.yc-slider__mobile .content .btn-holder a{
display:inline-flex;
}
2 changes: 1 addition & 1 deletion themes/meraki/config/settings_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
{
"value": "ltr",
"label": "left to right"
"label": "Left to right"
}
],
"default": "rtl"
Expand Down
2 changes: 1 addition & 1 deletion themes/meraki/sections/main-page.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<a href="/" class="first-listing">{{ 'snippets.collection-listing.home' | t }}</a>
</div>
<div class="listings__item">
<ion-icon name="chevron-forward-outline"></ion-icon>
/
</div>
<div class="listings__item">
<span class="second-listing">{{ page.name }}</span>
Expand Down
4 changes: 2 additions & 2 deletions themes/meraki/snippets/breadcrumbs.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</div>
{% endif %}
{% if category %}
<div class="listings__item arrow">
<div class="listings__item arrow-item">
/
</div>
<div class="listings__item">
<a href="/collections/{{ category.slug }}" class="third-listing">{{ category.name}}</a>
<a href="/collections/{{ category.slug }}" class="third-listing">{{ category.name }}</a>
</div>
{%- endif -%}
</div>
Expand Down
11 changes: 3 additions & 8 deletions themes/meraki/styles/desktop-slider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.splide {
height: var(--mobile-height);

@include breakpoint('md') {
height: var(--desktop-height);
}
Expand Down Expand Up @@ -77,13 +77,8 @@
.btn-holder {
text-align:var(--alignment);

.yc-btn-slider {
font-size: 14px;
background-color: var(--yc-primary-color) !important;
color: #ffffff;
margin-top: 38px;
padding: 12px 18px;
display:inline-flex;
a {
display:inline-flex;
}
}
}
Expand Down
6 changes: 0 additions & 6 deletions themes/meraki/styles/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,12 +738,6 @@ textarea {
.arrow-item {
color: #9C9C9C;
}

.arrow {
[dir='ltr'] & {
rotate: 180deg;
}
}
}

.breadcrumbs-name {
Expand Down
3 changes: 2 additions & 1 deletion themes/meraki/styles/mobile-slider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@

.btn-holder {
text-align: var(--alignment);
.yc-btn-slider {

a {
display: inline-flex;
}
}
Expand Down