Преглед изворни кода

Merge branch 'master' of http://git.hghweb.ir/ali.s/palizvani-front-vite

hgh пре 2 година
родитељ
комит
cdf0461b85

+ 52 - 28
src/components/Template/Header/MainHeader.vue

@@ -330,23 +330,20 @@ export default {
 .drawer-btn {
 .drawer-btn {
   display: none;
   display: none;
   @media screen and (max-width: 1439px) {
   @media screen and (max-width: 1439px) {
-    display: block;
+    & {
+      display: block;
+    }
   }
   }
   @media screen and (max-width: 599px) {
   @media screen and (max-width: 599px) {
-    margin-bottom: 10px;
+    & {
+      margin-bottom: 10px;
+    }
   }
   }
 }
 }
 
 
 .right-side {
 .right-side {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
-  @media screen and (max-width: 1023px) {
-    margin-left: 42px;
-  }
-  @media screen and (max-width: 599px) {
-    margin-left: 0;
-  }
-
   .breadcrumbs {
   .breadcrumbs {
     &:deep(> *) {
     &:deep(> *) {
       font-style: normal;
       font-style: normal;
@@ -361,14 +358,27 @@ export default {
       }
       }
     }
     }
   }
   }
+  @media screen and (max-width: 1023px) {
+    & {
+      margin-left: 42px;
+    }
+  }
+  @media screen and (max-width: 599px) {
+    & {
+      margin-left: 0;
+    }
+  }
+
 }
 }
 
 
 .left-side {
 .left-side {
   display: flex;
   display: flex;
   justify-content: flex-end;
   justify-content: flex-end;
   @media screen and (max-width: 1439px) {
   @media screen and (max-width: 1439px) {
-    position: absolute;
-    right: 0;
+    & {
+      position: absolute;
+      right: 0;
+    }
   }
   }
   @media screen and (max-width: 1023px) {
   @media screen and (max-width: 1023px) {
     .q-btn {
     .q-btn {
@@ -380,8 +390,10 @@ export default {
     }
     }
   }
   }
   @media screen and (max-width: 599px) {
   @media screen and (max-width: 599px) {
-    right: 16px;
-    margin-bottom: 10px;
+    & {
+      right: 16px;
+      margin-bottom: 10px;
+    }
   }
   }
 }
 }
 </style>
 </style>
@@ -391,14 +403,13 @@ export default {
   height: 120px;
   height: 120px;
   background-color: #FBF4EA;
   background-color: #FBF4EA;
   color: #212121;
   color: #212121;
-  @media only screen and (max-width: 1023px) {
-    height: 70px;
-  }
   //border-bottom: solid 1px #DFE1EC;
   //border-bottom: solid 1px #DFE1EC;
   &.isHomePage {
   &.isHomePage {
     background: transparent;
     background: transparent;
     @media only screen and (max-width: 1023px) {
     @media only screen and (max-width: 1023px) {
-      background-color: #FBF4EA;
+      & {
+        background-color: #FBF4EA;
+      }
     }
     }
   }
   }
   .admin-top-menu {
   .admin-top-menu {
@@ -449,15 +460,6 @@ export default {
     margin-left: 100px;
     margin-left: 100px;
     margin-bottom: 22px;
     margin-bottom: 22px;
 
 
-    @media only screen and (max-width: 1500px) {
-      margin-right: 10px;
-      margin-left: 10px;
-    }
-    @media only screen and (max-width: 1023px) {
-      padding-top: 0;
-      margin-bottom: 0;
-    }
-
     display: flex;
     display: flex;
     flex-flow: row;
     flex-flow: row;
     justify-content: space-between;
     justify-content: space-between;
@@ -496,10 +498,14 @@ export default {
       align-items: center;
       align-items: center;
       padding-right: 50px;
       padding-right: 50px;
       @media only screen and (max-width: 1023px) {
       @media only screen and (max-width: 1023px) {
-        height: 100%;
+        & {
+          height: 100%;
+        }
       }
       }
       @media only screen and (max-width: 599px) {
       @media only screen and (max-width: 599px) {
-        padding-right: 0;
+        & {
+          padding-right: 0;
+        }
       }
       }
     }
     }
 
 
@@ -510,6 +516,24 @@ export default {
         }
         }
       }
       }
     }
     }
+
+    @media only screen and (max-width: 1500px) {
+      & {
+        margin-right: 10px;
+        margin-left: 10px;
+      }
+    }
+    @media only screen and (max-width: 1023px) {
+      & {
+        padding-top: 0;
+        margin-bottom: 0;
+      }
+    }
+  }
+  @media only screen and (max-width: 1023px) {
+    & {
+      height: 70px;
+    }
   }
   }
 }
 }
 
 

+ 12 - 4
src/components/Widgets/Store/Shop/Shop.vue

@@ -243,7 +243,9 @@ export default {
     .shop-widget__sidebar {
     .shop-widget__sidebar {
       width: $sidebar-width;
       width: $sidebar-width;
       @media screen and (max-width: 1024px) {
       @media screen and (max-width: 1024px) {
-        width: 100%;
+        & {
+          width: 100%;
+        }
       }
       }
     }
     }
     .shop-widget__main {
     .shop-widget__main {
@@ -323,10 +325,14 @@ export default {
                 padding: 18px;
                 padding: 18px;
                 flex: 0 0 auto;
                 flex: 0 0 auto;
                 @media screen and (max-width: 900px) {
                 @media screen and (max-width: 900px) {
-                  width: 50%;
+                  & {
+                    width: 50%;
+                  }
                 }
                 }
                 @media screen and (max-width: 500px) {
                 @media screen and (max-width: 500px) {
-                  width: 100%;
+                  & {
+                    width: 100%;
+                  }
                 }
                 }
               }
               }
             }
             }
@@ -334,7 +340,9 @@ export default {
         }
         }
       }
       }
       @media screen and (max-width: 1024px) {
       @media screen and (max-width: 1024px) {
-        width: 100%;
+        & {
+          width: 100%;
+        }
       }
       }
     }
     }
   }
   }

+ 25 - 0
src/components/Widgets/Store/Shop/components/packageItem.vue

@@ -236,5 +236,30 @@ export default {
       flex-flow: column;
       flex-flow: column;
     }
     }
   }
   }
+  @media screen and (max-width: 1024px) {
+    & {
+      .package-item__badges {
+        z-index: 2;
+        .package-item__badge {
+          .package-item__badge-title {
+            display: block;
+          }
+        }
+      }
+      :deep(.package-item__thumbnail) {
+        z-index: 1;
+      }
+      .package-item__title {
+        margin-bottom: 44px;
+      }
+      .package-item__price {
+        margin-bottom: 27px;
+      }
+      .package-item__actions {
+        display: flex;
+        flex-flow: column;
+      }
+    }
+  }
 }
 }
 </style>
 </style>

+ 25 - 0
src/components/Widgets/Store/Shop/components/productItem.vue

@@ -248,5 +248,30 @@ export default {
       flex-flow: column;
       flex-flow: column;
     }
     }
   }
   }
+  @media screen and (max-width: 1024px) {
+    & {
+      .product-item__badges {
+        z-index: 2;
+        .product-item__badge {
+          .product-item__badge-title {
+            display: block;
+          }
+        }
+      }
+      :deep(.product-item__thumbnail) {
+        z-index: 1;
+      }
+      .product-item__title {
+        margin-bottom: 44px;
+      }
+      .product-item__price {
+        margin-bottom: 27px;
+      }
+      .product-item__actions {
+        display: flex;
+        flex-flow: column;
+      }
+    }
+  }
 }
 }
 </style>
 </style>