Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

fix animation css.

Matthew Kennedycf8afb213cd3
diff --git a/backend/app/assets/stylesheets/spree/backend/plugins/overscroll_indicator.scss b/backend/app/assets/stylesheets/spree/backend/plugins/overscroll_indicator.scss
index 395f2b604a..74756cd347 100644
--- a/backend/app/assets/stylesheets/spree/backend/plugins/overscroll_indicator.scss
+++ b/backend/app/assets/stylesheets/spree/backend/plugins/overscroll_indicator.scss
@@ -1,6 +1,7 @@
[data-nav-x-wrapper] {
position: relative;
padding: 0 11px;
+ overflow: hidden;
}
[data-nav-x-container] {
@@ -43,11 +44,12 @@
position: absolute;
padding: 5px;
height: 100%;
+ max-width: 45px;
top: 0;
bottom: 0;
opacity: 0;
- z-index: 100;
- transition: all .3s;
+ transition: linear 0.01s 0.6s, opacity 0.4s;
+ z-index:300;
&:focus {
outline: 0;
@@ -59,30 +61,32 @@
svg {
height: 100%;
- fill: #bbb;
+ color: rgba(128, 128, 128, 0.56);
}
}
.nav-x_Advancer_Left {
border-right: 2px solid rgba(128, 128, 128, 0.56);
background: linear-gradient(90deg, rgba(255,255,255,1) 0%, rgba(255,255,255,1) 65%, rgba(255,255,255,0.8533788515406162) 100%);
- left: -1px;
+ left: -46px;
}
[data-overflowing="both"] ~ .nav-x_Advancer_Left,
[data-overflowing="left"] ~ .nav-x_Advancer_Left {
opacity: 1;
- z-index: 300;
+ left: -1px;
+ transition: linear 0.01s, opacity 0.4s 0.02s;
}
.nav-x_Advancer_Right {
border-left: 2px solid rgba(128, 128, 128, 0.56);
background: linear-gradient(90deg, rgba(255,255,255,0.850577731092437) 0%, rgba(255,255,255,1) 35%, rgba(255,255,255,1) 100%);
- right: -1px;
+ right: -46px;
}
[data-overflowing="both"] ~ .nav-x_Advancer_Right,
[data-overflowing="right"] ~ .nav-x_Advancer_Right {
opacity: 1;
- z-index: 300;
+ right: -1px;
+ transition: linear 0.01s, opacity 0.4s 0.02s;
}
diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb
index e59086b17f..23e6e2e717 100644
--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb
+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb
@@ -8,6 +8,6 @@
<% unless current_page.first? %>
<li class="first page-item">
- <%= link_to_unless current_page.first?, svg_icon(name: "double-chevron-left.svg", width: '13', height: '16', classes: 'spree-icon-arrow-left mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>
+ <%= link_to_unless current_page.first?, svg_icon(name: "double-chevron-left.svg", width: '13', height: '20', classes: 'spree-icon-arrow-left mb-0'), url, remote: remote, class: 'page-link d-flex', 'aria-label': 'First page' %>
</li>
<% end %>
diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb
index 3b56140331..6c457fad96 100644
--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb
+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb
@@ -8,6 +8,6 @@
<% unless current_page.last? %>
<li class="last next page-item"><%# "next" class present for border styling in twitter bootstrap %>
- <%= link_to_unless current_page.last?, svg_icon(name: "double-chevron-right.svg", width: '13', height: '16', classes: 'spree-icon-arrow-right mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>
+ <%= link_to_unless current_page.last?, svg_icon(name: "double-chevron-right.svg", width: '13', height: '20', classes: 'spree-icon-arrow-right mb-0'), url, remote: remote, class: 'page-link d-flex', 'aria-label': 'Last page' %>
</li>
<% end %>
diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb
index c4fb9882ec..8299eea29d 100644
--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb
+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb
@@ -8,6 +8,6 @@
<% unless current_page.last? %>
<li class="next_page page-item">
- <%= link_to_unless current_page.last?, svg_icon(name: "chevron-right.svg", width: '13', height: '16', classes: 'spree-icon-arrow-right mb-0'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>
+ <%= link_to_unless current_page.last?, svg_icon(name: "chevron-right.svg", width: '13', height: '20', classes: 'spree-icon-arrow-right mb-0'), url, rel: 'next', remote: remote, class: 'page-link d-flex', 'aria-label': 'Next page' %>
</li>
<% end %>
diff --git a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb
index 0512c58066..13a6f359ce 100644
--- a/backend/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb
+++ b/backend/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb
@@ -8,6 +8,6 @@
<% unless current_page.first? %>
<li class="prev page-item">
- <%= link_to_unless current_page.first?, svg_icon(name: "chevron-left.svg", width: '13', height: '16', classes: 'spree-icon-arrow-left mb-0'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>
+ <%= link_to_unless current_page.first?, svg_icon(name: "chevron-left.svg", width: '13', height: '20', classes: 'spree-icon-arrow-left mb-0'), url, rel: 'prev', remote: remote, class: 'page-link d-flex', 'aria-label': 'Previous page' %>
</li>
<% end %>
diff --git a/backend/app/views/spree/admin/shared/_content_header.html.erb b/backend/app/views/spree/admin/shared/_content_header.html.erb
index 553ebb7cc6..de31b43226 100644
--- a/backend/app/views/spree/admin/shared/_content_header.html.erb
+++ b/backend/app/views/spree/admin/shared/_content_header.html.erb
@@ -41,14 +41,14 @@
</div>
<button class="nav-x_Advancer nav-x_Advancer_Left" type="button">
- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 551 1024">
- <path d="M445.44 38.183L-2.53 512l447.97 473.817 85.857-81.173-409.6-433.23v81.172l409.6-433.23L445.44 38.18z" />
+ <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="bi bi-chevron-left" viewBox="0 0 16 16">
+ <path fill-rule="evenodd" d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z" />
</svg>
</button>
<button class="nav-x_Advancer nav-x_Advancer_Right" type="button">
- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 551 1024">
- <path d="M105.56 985.817L553.53 512 105.56 38.183l-85.857 81.173 409.6 433.23v-81.172l-409.6 433.23 85.856 81.174z" />
+ <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="bi bi-chevron-right" viewBox="0 0 16 16">
+ <path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z" />
</svg>
</button>
</div>