merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Prateek/rtl-filter-ui-issue'

This commit is contained in:
Sanjay 2022-02-24 17:35:39 +05:30
parent ac2f2338f7 d3af388b34
commit ec3420f99f
3 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -4,7 +4,7 @@
"/js/velocity.js": "/js/velocity.js?id=8467110c3c1ee5e363d02172acbf1a3f",
"/js/manifest.js": "/js/manifest.js?id=3cded37ef514b0fb89b10e7109801248",
"/js/components.js": "/js/components.js?id=f536199f308a82f48041993dd85acdd3",
"/css/velocity.css": "/css/velocity.css?id=111d0a858bc1a53755a516bc60365027",
"/css/velocity.css": "/css/velocity.css?id=47d53499747d0380f5aa4c10a2f237c0",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
"/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a58377422766f3152e15486",
"/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",

30
packages/Webkul/Velocity/src/Resources/assets/sass/components/datagrid.scss
View File

@ -1,7 +1,7 @@
@import "../main/mixins";
@import "../main/_variables";
@import '../main/mixins';
@import '../main/_variables';
.dropdown-toggle{
.dropdown-toggle {
position: relative;
}
@ -11,11 +11,12 @@
top: 16px;
}
.rtl{
.rtl {
.dropdown-toggle::after {
position: absolute;
left: 22px;
top: 16px;
right: unset;
}
}
@ -60,7 +61,6 @@
vertical-align: top;
&.actions {
.action {
display: inline-flex;
}
@ -120,7 +120,6 @@
display: inline-block;
&.per-page {
.control-group {
margin-bottom: 0px;
@ -252,7 +251,6 @@
margin-bottom: 15px;
}
}
}
}
@ -284,8 +282,8 @@
display: flex;
flex-direction: row;
align-items: center;
background: #E7E7E7;
border: 1px solid #E7E7E7;
background: #e7e7e7;
border: 1px solid #e7e7e7;
font-size: 14px;
height: 40px;
color: #000311;
@ -299,18 +297,17 @@
&:hover {
background: $white-color;
border: 1px solid #E7E7E7;
border: 1px solid #e7e7e7;
}
}
}
.rtl {
.search-filter {
.control {
padding-right: 10px;
border-left: 0;
border-right: 1px solid #C7C7C7;
border-right: 1px solid #c7c7c7;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
border-top-left-radius: 0;
@ -333,17 +330,14 @@
.dropdown-filters {
display: inline-block;
&.per-page {
margin-left: 10px;
margin-right: 10px;
}
}
.filtered-tags {
.filter-tag {
.wrapper,
.cross-icon {
margin-right: 10px;
@ -353,10 +347,8 @@
}
}
@media only screen and (max-width: 768px) {
.grid-container {
.grid-top {
.datagrid-filters {
grid-template-columns: 100%;
@ -364,7 +356,6 @@
.search-filter {
max-width: 100% !important;
}
.filter-left {
@ -388,9 +379,8 @@
}
.dropdown-list {
&.dropdown-container {
padding: 10px;
}
}
}
}