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

Changes updated in component/app.scss file & Conflict Resolved

This commit is contained in:
junaidjaved248 2021-11-12 00:36:07 +05:00
parent b3721378a4
commit e2f8fea50a
4 changed files with 82 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -2,5 +2,5 @@
"/js/velocity.js": "/js/velocity.js?id=045fcd0fe4945a15152e", "/js/velocity.js": "/js/velocity.js?id=045fcd0fe4945a15152e",
"/js/velocity-core.js": "/js/velocity-core.js?id=6d269d95c3cfc74183cb", "/js/velocity-core.js": "/js/velocity-core.js?id=6d269d95c3cfc74183cb",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd", "/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=b7bcd48354323173b162" "/css/velocity.css": "/css/velocity.css?id=0f099586249b1752109c"
} }

25
packages/Webkul/Velocity/src/Resources/assets/sass/app.scss vendored
View File

@ -1122,28 +1122,3 @@ i.within-circle {
.main-content-wrapper .content-list ul { .main-content-wrapper .content-list ul {
width: 101.2% !important; width: 101.2% !important;
} }
.account-content {
.account-layout {
.account-table-content.profile-page-content {
.table {
width: 100% !important;
}
}
.table {
table {
tr {
margin-bottom: 20px;
border: 1px solid #CCCCCC;
td {
width: auto;
border-top: none;
border-right: 1px solid #CCCCCC !important;
}
}
}
}
}
}

128
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -2,7 +2,7 @@
padding: 20px; padding: 20px;
position: relative; position: relative;
> div:first-child { >div:first-child {
top: 40px; top: 40px;
position: sticky; position: sticky;
height: max-content; height: max-content;
@ -28,7 +28,7 @@
} }
.customer-reviews { .customer-reviews {
> div { >div {
&.row { &.row {
padding-bottom: 30px; padding-bottom: 30px;
display: block; display: block;
@ -69,7 +69,7 @@
position: relative; position: relative;
background-color: $light-background; background-color: $light-background;
> div { >div {
width: 0px; width: 0px;
height: 100%; height: 100%;
background-color: $black-color; background-color: $black-color;
@ -86,7 +86,7 @@
.review-form { .review-form {
width: 80%; width: 80%;
> div { >div {
padding-top: 30px; padding-top: 30px;
label { label {
@ -111,7 +111,7 @@
margin: 20px 0; margin: 20px 0;
.toolbar-wrapper { .toolbar-wrapper {
> div { >div {
margin: 0 20px 0 0; margin: 0 20px 0 0;
display: inline-block; display: inline-block;
@ -126,13 +126,14 @@
color: $font-color; color: $font-color;
background-color: white; background-color: white;
} }
.down-icon-position { .down-icon-position {
pointer-events: none; pointer-events: none;
background-color: $white-color; background-color: $white-color;
} }
} }
> div:not(:first-child) { >div:not(:first-child) {
vertical-align: super; vertical-align: super;
} }
@ -190,10 +191,8 @@
animation: fade-in-white 0.3s ease-in-out; animation: fade-in-white 0.3s ease-in-out;
@include border-radius(5px); @include border-radius(5px);
@include box-shadow( @include box-shadow(0px 15px 25px 0px rgba(0, 0, 0, 0.03),
0px 15px 25px 0px rgba(0, 0, 0, 0.03), 0px 20px 45px 5px rgba(0, 0, 0, 0.2));
0px 20px 45px 5px rgba(0, 0, 0, 0.2)
);
.modal-header { .modal-header {
padding: 20px; padding: 20px;
@ -281,7 +280,7 @@
.card-body { .card-body {
cursor: default; cursor: default;
> div:last-child { >div:last-child {
margin-top: 10px; margin-top: 10px;
} }
@ -299,6 +298,7 @@
} }
.card-body { .card-body {
.compare-icon, .compare-icon,
.wishlist-icon { .wishlist-icon {
left: 0; left: 0;
@ -478,7 +478,7 @@
} }
form { form {
> div { >div {
padding-bottom: 20px; padding-bottom: 20px;
input { input {
@ -491,7 +491,7 @@
} }
.container-right { .container-right {
> .recently-viewed { >.recently-viewed {
padding-top: 20px; padding-top: 20px;
} }
} }
@ -683,7 +683,7 @@
padding-bottom: 20px !important; padding-bottom: 20px !important;
border-bottom: 2px solid $border-general; border-bottom: 2px solid $border-general;
> h3 { >h3 {
font-size: 16px; font-size: 16px;
font-weight: 600; font-weight: 600;
} }
@ -704,11 +704,11 @@
} }
.cart-item-list { .cart-item-list {
> .row { >.row {
margin-bottom: 40px; margin-bottom: 40px;
} }
> .row:last-child { >.row:last-child {
padding-bottom: 20px; padding-bottom: 20px;
border-bottom: 2px solid $border-general; border-bottom: 2px solid $border-general;
} }
@ -735,7 +735,7 @@
font-size: 18px; font-size: 18px;
} }
> a { >a {
line-height: 20px; line-height: 20px;
} }
} }
@ -769,7 +769,7 @@
li.breadcrumb-item { li.breadcrumb-item {
display: inline-block; display: inline-block;
& + .breadcrumb-item::before { &+.breadcrumb-item::before {
display: inline-block; display: inline-block;
padding-right: 5px; padding-right: 5px;
padding-left: 5px; padding-left: 5px;
@ -873,6 +873,27 @@
padding: 15px 20px; padding: 15px 20px;
padding-bottom: 60px; padding-bottom: 60px;
.account-table-content.profile-page-content {
.table {
width: 100% !important;
}
}
.table {
table {
tr {
margin-bottom: 20px;
border: 1px solid #CCCCCC;
td {
width: auto;
border-top: none;
border-right: 1px solid #CCCCCC !important;
}
}
}
}
&.right { &.right {
padding-left: $sidebar-width + 20px !important; padding-left: $sidebar-width + 20px !important;
} }
@ -887,7 +908,8 @@
} }
.account-table-content { .account-table-content {
> .row,
>.row,
.control-group { .control-group {
margin-bottom: 30px; margin-bottom: 30px;
} }
@ -924,7 +946,7 @@
.address-holder { .address-holder {
margin-top: 30px; margin-top: 30px;
> div { >div {
margin: 5px 0; margin: 5px 0;
padding-left: 0; padding-left: 0;
} }
@ -965,7 +987,7 @@
} }
} }
> * { >* {
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
@ -1043,7 +1065,7 @@
} }
} }
~ table { ~table {
&.table { &.table {
thead { thead {
font-size: 18px; font-size: 18px;
@ -1140,7 +1162,7 @@
margin-bottom: 15px; margin-bottom: 15px;
} }
.table > table { .table>table {
width: 100%; width: 100%;
color: #5e5e5e; color: #5e5e5e;
border: 1px solid rgba(0, 0, 0, 0.125); border: 1px solid rgba(0, 0, 0, 0.125);
@ -1189,11 +1211,9 @@
margin-right: 20px; margin-right: 20px;
border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.24); text-shadow: 0 1px 2px rgba(0, 0, 0, 0.24);
background-image: linear-gradient( background-image: linear-gradient(-180deg,
-180deg,
rgba(0, 0, 0, 0.08), rgba(0, 0, 0, 0.08),
rgba(0, 0, 0, 0.24) rgba(0, 0, 0, 0.24));
);
} }
input { input {
@ -1230,7 +1250,7 @@
} }
.reviews-container { .reviews-container {
> .row { >.row {
margin-bottom: 40px; margin-bottom: 40px;
} }
} }
@ -1240,6 +1260,7 @@
margin: 0; margin: 0;
a:not([href]) { a:not([href]) {
&.next, &.next,
&.previous { &.previous {
cursor: not-allowed; cursor: not-allowed;
@ -1264,6 +1285,7 @@
&.next, &.next,
&.previous { &.previous {
.angle-right-icon, .angle-right-icon,
.angle-left-icon { .angle-left-icon {
@extend .rango-default; @extend .rango-default;
@ -1326,7 +1348,7 @@
} }
.section-content { .section-content {
label + span { label+span {
font-weight: 600; font-weight: 600;
color: $grey-color; color: $grey-color;
} }
@ -1417,8 +1439,9 @@
padding: 40px 20px; padding: 40px 20px;
.col-lg-7 { .col-lg-7 {
.coupon-container, .coupon-container,
> div:not(:first-child) { >div:not(:first-child) {
margin-top: 20px; margin-top: 20px;
} }
} }
@ -1455,7 +1478,7 @@
.styled-select { .styled-select {
cursor: pointer; cursor: pointer;
+ .select-icon { +.select-icon {
top: 55%; top: 55%;
left: 92%; left: 92%;
font-size: 20px; font-size: 20px;
@ -1492,7 +1515,7 @@
.address-holder { .address-holder {
margin-top: 15px; margin-top: 15px;
> div { >div {
margin: 5px 0; margin: 5px 0;
padding-left: 0; padding-left: 0;
} }
@ -1515,7 +1538,7 @@
display: table; display: table;
text-align: center; text-align: center;
> div { >div {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
@ -1573,7 +1596,7 @@
.shipping-methods, .shipping-methods,
.payment-methods { .payment-methods {
> .row { >.row {
margin-bottom: 20px; margin-bottom: 20px;
} }
@ -1611,11 +1634,11 @@
margin-bottom: 20px !important; margin-bottom: 20px !important;
} }
> .row:first-child { >.row:first-child {
margin-top: 50px; margin-top: 50px;
} }
> .row { >.row {
margin-bottom: 20px; margin-bottom: 20px;
} }
} }
@ -1632,7 +1655,7 @@
position: sticky !important; position: sticky !important;
max-width: 500px !important; max-width: 500px !important;
> div { >div {
width: 100%; width: 100%;
} }
@ -1640,11 +1663,11 @@
padding: 25px 30px; padding: 25px 30px;
border: 1px solid $border-general; border: 1px solid $border-general;
> h3 { >h3 {
margin-bottom: 20px; margin-bottom: 20px;
} }
> .row:not(:last-child) { >.row:not(:last-child) {
margin-bottom: 10px; margin-bottom: 10px;
} }
@ -1772,6 +1795,7 @@
} }
.main-container-wrapper { .main-container-wrapper {
/** /**
* Sticky header for logo and search component. Just make sure * Sticky header for logo and search component. Just make sure
* this class should have height otherwise CLS score will reduce. * this class should have height otherwise CLS score will reduce.
@ -1847,8 +1871,8 @@
} }
li:hover { li:hover {
> a { >a {
> span { >span {
color: $light-link-color; color: $light-link-color;
} }
} }
@ -1860,7 +1884,7 @@
.category { .category {
padding: 5px 0 4px 15px; padding: 5px 0 4px 15px;
+ .nested { +.nested {
color: $font-color; color: $font-color;
li { li {
@ -1991,7 +2015,7 @@
line-height: 38px; line-height: 38px;
} }
> * { >* {
height: 100%; height: 100%;
} }
} }
@ -2226,22 +2250,22 @@
} }
.full-content-wrapper { .full-content-wrapper {
> .container-fluid { >.container-fluid {
padding: 0 !important; padding: 0 !important;
margin-bottom: 60px !important; margin-bottom: 60px !important;
> .row { >.row {
padding: 0 15px !important; padding: 0 15px !important;
} }
} }
p, p,
div { div {
> .container-fluid { >.container-fluid {
padding: 0 !important; padding: 0 !important;
margin-bottom: 60px !important; margin-bottom: 60px !important;
> .row { >.row {
padding: 0 15px !important; padding: 0 15px !important;
} }
} }
@ -2304,6 +2328,7 @@
.filter-attributes-item { .filter-attributes-item {
margin-bottom: 10px; margin-bottom: 10px;
border-bottom: 1px solid #cccccc; border-bottom: 1px solid #cccccc;
&.active { &.active {
.filter-attributes-content { .filter-attributes-content {
display: block; display: block;
@ -2321,7 +2346,7 @@
} }
} }
input[type='checkbox'] + span { input[type='checkbox']+span {
margin-left: 10px !important; margin-left: 10px !important;
} }
} }
@ -2357,6 +2382,7 @@
margin-top: 10px; margin-top: 10px;
margin-left: 96px; margin-left: 96px;
} }
.down-icon-position { .down-icon-position {
position: absolute; position: absolute;
} }
@ -2423,6 +2449,7 @@
&.next, &.next,
&.previous { &.previous {
.angle-right-icon, .angle-right-icon,
.angle-left-icon { .angle-left-icon {
@extend .rango-default; @extend .rango-default;
@ -2464,16 +2491,18 @@
background: unset; background: unset;
} }
.angle-right-icon::before { .angle-right-icon::before {
content: '\E908'; content: '\E908';
} }
.angle-left-icon::before { .angle-left-icon::before {
content: '\E907'; content: '\E907';
} }
} }
.carousel-products { .carousel-products {
+ .recently-viewed { +.recently-viewed {
top: -40px; top: -40px;
position: relative; position: relative;
} }
@ -2706,6 +2735,7 @@
0% { 0% {
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
transform: rotate(360deg); transform: rotate(360deg);
} }