浏览代码

new ui change

master
azri 1 个月前
父节点
当前提交
967d2fe7fe

+ 28
- 29
src/components/Footer/Footer.jsx 查看文件

@@ -3,11 +3,11 @@ import { Box, Typography, TextField, Button, InputAdornment } from '@mui/materia
3 3
 import logoSrc from "../../assets/images/amberlogofooter.png";
4 4
 import Grid from '@mui/material/Grid2';
5 5
 import InstagramIcon from '@mui/icons-material/Instagram';
6
-import WhatsAppIcon from '@mui/icons-material/WhatsApp';import customerService from '../../services/CustomerService';
6
+import WhatsAppIcon from '@mui/icons-material/WhatsApp'; import customerService from '../../services/CustomerService';
7 7
 
8 8
 const TikTokIcon = ({ color = "#000000" }) => {
9 9
   return (
10
-    <svg  fill={color} width="1.3em" height="1.3em" viewBox="0 0 512 512" id="icons" xmlns="http://www.w3.org/2000/svg"><path d="M412.19,118.66a109.27,109.27,0,0,1-9.45-5.5,132.87,132.87,0,0,1-24.27-20.62c-18.1-20.71-24.86-41.72-27.35-56.43h.1C349.14,23.9,350,16,350.13,16H267.69V334.78c0,4.28,0,8.51-.18,12.69,0,.52-.05,1-.08,1.56,0,.23,0,.47-.05.71,0,.06,0,.12,0,.18a70,70,0,0,1-35.22,55.56,68.8,68.8,0,0,1-34.11,9c-38.41,0-69.54-31.32-69.54-70s31.13-70,69.54-70a68.9,68.9,0,0,1,21.41,3.39l.1-83.94a153.14,153.14,0,0,0-118,34.52,161.79,161.79,0,0,0-35.3,43.53c-3.48,6-16.61,30.11-18.2,69.24-1,22.21,5.67,45.22,8.85,54.73v.2c2,5.6,9.75,24.71,22.38,40.82A167.53,167.53,0,0,0,115,470.66v-.2l.2.2C155.11,497.78,199.36,496,199.36,496c7.66-.31,33.32,0,62.46-13.81,32.32-15.31,50.72-38.12,50.72-38.12a158.46,158.46,0,0,0,27.64-45.93c7.46-19.61,9.95-43.13,9.95-52.53V176.49c1,.6,14.32,9.41,14.32,9.41s19.19,12.3,49.13,20.31c21.48,5.7,50.42,6.9,50.42,6.9V131.27C453.86,132.37,433.27,129.17,412.19,118.66Z"/></svg>
10
+    <svg fill={color} width="1.3em" height="1.3em" viewBox="0 0 512 512" id="icons" xmlns="http://www.w3.org/2000/svg"><path d="M412.19,118.66a109.27,109.27,0,0,1-9.45-5.5,132.87,132.87,0,0,1-24.27-20.62c-18.1-20.71-24.86-41.72-27.35-56.43h.1C349.14,23.9,350,16,350.13,16H267.69V334.78c0,4.28,0,8.51-.18,12.69,0,.52-.05,1-.08,1.56,0,.23,0,.47-.05.71,0,.06,0,.12,0,.18a70,70,0,0,1-35.22,55.56,68.8,68.8,0,0,1-34.11,9c-38.41,0-69.54-31.32-69.54-70s31.13-70,69.54-70a68.9,68.9,0,0,1,21.41,3.39l.1-83.94a153.14,153.14,0,0,0-118,34.52,161.79,161.79,0,0,0-35.3,43.53c-3.48,6-16.61,30.11-18.2,69.24-1,22.21,5.67,45.22,8.85,54.73v.2c2,5.6,9.75,24.71,22.38,40.82A167.53,167.53,0,0,0,115,470.66v-.2l.2.2C155.11,497.78,199.36,496,199.36,496c7.66-.31,33.32,0,62.46-13.81,32.32-15.31,50.72-38.12,50.72-38.12a158.46,158.46,0,0,0,27.64-45.93c7.46-19.61,9.95-43.13,9.95-52.53V176.49c1,.6,14.32,9.41,14.32,9.41s19.19,12.3,49.13,20.31c21.48,5.7,50.42,6.9,50.42,6.9V131.27C453.86,132.37,433.27,129.17,412.19,118.66Z" /></svg>
11 11
   );
12 12
 };
13 13
 
@@ -36,8 +36,8 @@ const Footer = () => {
36 36
         }}
37 37
       />
38 38
 
39
-      <Grid container spacing={2} justifyContent="space-evenly">
40
-
39
+      <Grid container spacing={2} justifyContent="space-between">
40
+        {/* 
41 41
         <Grid item size={{ xs: 12, sm: 6, md: 6, lg: 3 }}>
42 42
           <Typography variant="body1" sx={{ fontWeight: "bold", mb: 4 }}>
43 43
             Company
@@ -50,10 +50,19 @@ const Footer = () => {
50 50
               <a href="#" style={{ textDecoration: 'none', color: 'inherit' }}>Cotact Us</a>
51 51
             </Typography>
52 52
           </nav>
53
+        </Grid> */}
54
+
55
+        <Grid item size={{ xs: 12, sm: 6, md: 6, lg: 3, xl: 3 }} sx={{ position: "relative" }}>
56
+
57
+          <Typography variant="body1" sx={{ fontWeight: "bold", mb: 4 }}>
58
+            Contact Info
59
+          </Typography>
60
+          <Typography variant="body2" sx={{ mb: 2 }}><span style={{ fontWeight: "bold" }}>Phone:</span> +4 (509) 120 6705</Typography>
61
+          <Typography variant="body2" sx={{ maxWidth: 250 }}><span style={{ fontWeight: "bold" }}>Address:</span> Lot G-77, Wangsa Walk Mall, Wangsa Avenue, No.9, Jalan Wangsa Perdana 1, Bandar Wangsa Maju, 53300 Kuala Lumpur, Malaysia</Typography>
53 62
         </Grid>
54 63
 
55 64
 
56
-        <Grid item size={{ xs: 12, sm: 6, md: 6, lg: 3 }}>
65
+        <Grid item size={{ xs: 12, sm: 6, md: 6, lg: 4, xl: 4 }} sx={{pl:{xs:0, sm:0, md:0, lg:5, xl:5}}}>
57 66
           <Typography variant="body1" sx={{ fontWeight: "bold", mb: 4 }}>
58 67
             Get Help
59 68
           </Typography>
@@ -76,17 +85,7 @@ const Footer = () => {
76 85
           </nav>
77 86
         </Grid>
78 87
 
79
-        <Grid item size={{ xs: 12, sm: 6, md: 6, lg: 3 }} sx={{ position: "relative" }}>
80
-
81
-          <Typography variant="body1" sx={{ fontWeight: "bold", mb: 4 }}>
82
-            Contact Info
83
-          </Typography>
84
-          <Typography variant="body2" sx={{ mb: 2 }}><span style={{ fontWeight: "bold" }}>Phone:</span> +4 (509) 120 6705</Typography>
85
-          <Typography variant="body2" sx={{ maxWidth: 250 }}><span style={{ fontWeight: "bold" }}>Address:</span> Lot G-77, Wangsa Walk Mall, Wangsa Avenue, No.9, Jalan Wangsa Perdana 1, Bandar Wangsa Maju, 53300 Kuala Lumpur, Malaysia</Typography>
86
-        </Grid>
87
-
88
-
89
-        <Grid item size={{ xs: 12, sm: 6, md: 6, lg: 3 }}>
88
+        <Grid item size={{ xs: 12, sm: 6, md: 6, lg: 4, xl: 4 }}>
90 89
           <Typography variant="body1" sx={{ fontWeight: "bold", mb: 4 }}>
91 90
             Let’s stay in touch
92 91
           </Typography>
@@ -149,30 +148,30 @@ const Footer = () => {
149 148
               }}
150 149
             />
151 150
 
152
-            <Typography variant="body2" >Keep up to date with our latest  news and <br /> special offers.</Typography>
151
+            <Typography variant="body2" >Keep up to date with our latest  news and special offers.</Typography>
153 152
 
154
-            <Box sx={{display:"flex", gap:1, justifyContent:"end", cursor:"pointer"}}>
155
-              <a 
156
-                href="whatsapp" 
153
+            <Box sx={{ display: "flex", gap: 1, justifyContent: "end", cursor: "pointer" }}>
154
+              <a
155
+                href="whatsapp"
157 156
                 style={{
158
-                  color:"#95AAC5"
157
+                  color: "#95AAC5"
159 158
                 }}><WhatsAppIcon />
160 159
               </a>
161
-              <a 
162
-                href="instagram" 
160
+              <a
161
+                href="instagram"
163 162
                 style={{
164
-                  color:"#95AAC5"
163
+                  color: "#95AAC5"
165 164
                 }}><InstagramIcon />
166 165
               </a>
167
-              <a 
168
-                href="tiktok" 
166
+              <a
167
+                href="tiktok"
169 168
                 style={{
170
-                  color:"#95AAC5"
169
+                  color: "#95AAC5"
171 170
                 }}><TikTokIcon color={"#95AAC5"} />
172 171
               </a>
173
-              
172
+
174 173
             </Box>
175
-            
174
+
176 175
           </Box>
177 176
         </Grid>
178 177
       </Grid>

+ 2
- 0
src/components/NewsLetter/NewsLetter.jsx 查看文件

@@ -61,6 +61,8 @@ const NewsLetter = () => {
61 61
             onChange={(e) => { setEmail(e.target.value) }}
62 62
             sx={{
63 63
               backgroundColor: "white",
64
+              overflow:"hidden",
65
+              borderRadius:"4px",
64 66
               my: 4,
65 67
               '& .MuiInputLabel-root': {
66 68
                 fontSize: {

+ 2
- 2
src/components/PageTitle/PageTitle.jsx 查看文件

@@ -34,7 +34,7 @@ const PageTitle = ({title = "", image = null}) => {
34 34
       />
35 35
       
36 36
       {/* Title */}
37
-      <Typography
37
+      {/* <Typography
38 38
         variant="h3"
39 39
         className="main-title"
40 40
         sx={{
@@ -45,7 +45,7 @@ const PageTitle = ({title = "", image = null}) => {
45 45
         }}
46 46
       >
47 47
         {title?.toUpperCase() || " "}
48
-      </Typography>
48
+      </Typography> */}
49 49
     </Box>
50 50
   );
51 51
 };

+ 6
- 6
src/components/ProductList/ProductList.jsx 查看文件

@@ -233,9 +233,9 @@ const ProductList = ({ size = 99999 }) => {
233 233
               sx={{
234 234
                 fontWeight: "100",
235 235
                 fontSize: {
236
-                  xs: "0.875rem",
237
-                  sm: "0.875rem",
238
-                  md: "1.1rem",
236
+                  xs: "0.75rem",
237
+                  sm: "0.75rem",
238
+                  md: "0.75rem",
239 239
                 },
240 240
               }}
241 241
             >
@@ -244,11 +244,11 @@ const ProductList = ({ size = 99999 }) => {
244 244
             <Typography
245 245
               variant="body2"
246 246
               sx={{
247
-                fontWeight: "400",
247
+                fontWeight: "500",
248 248
                 fontSize: {
249 249
                   xs: "0.875rem",
250 250
                   sm: "0.875rem",
251
-                  md: "1.1rem",
251
+                  md: "0.875rem",
252 252
                 },
253 253
               }}
254 254
             >
@@ -261,7 +261,7 @@ const ProductList = ({ size = 99999 }) => {
261 261
                 fontSize: {
262 262
                   xs: "0.875rem",
263 263
                   sm: "0.875rem",
264
-                  md: "1.1rem",
264
+                  md: "0.875rem",
265 265
                 },
266 266
               }}
267 267
             >

+ 1
- 1
src/components/ProductType/ProductType.jsx 查看文件

@@ -30,7 +30,7 @@ const ProductType = ({ title, img_url }) => {
30 30
           color: '#fff', // Text and button color for visibility
31 31
         }}
32 32
       >
33
-        <Typography variant="h5" gutterBottom sx={{ fontWeight: "600", letterSpacing: 7 }}>
33
+        <Typography variant="h5" gutterBottom sx={{ fontWeight: "600", letterSpacing: 7, marginRight:"-0.4em" }}>
34 34
           {title?.toUpperCase()}
35 35
         </Typography>
36 36
         <Button

正在加载...
取消
保存