Skip to content

Commit e55eab9

Browse files
committed
move img file, convert. min file
1 parent dbab6c5 commit e55eab9

29 files changed

+95
-118
lines changed

View/customer/detail.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<td style='vertical-align: middle;' class="text-center"><?php echo $value['Giảm giá']; ?>%</td>
3636
<td style='vertical-align: middle;' class="text-center"><?php echo $value['Số lượng']; ?></td>
3737
<td class="text-center" style='vertical-align: middle;'>
38-
<a href="index.php?page=product&id=<?php echo $value['id']; ?>">
38+
<a href="index.php?page=product&id=<?php echo $value['id']; ?>" target = "_blank">
3939
<button type="button" class="btn btn-icon waves-effect waves-light btn-primary" title="Xem chi tiết"><span><i class="mdi mdi-pencil"></i></span></button>
4040
</a>
4141
</td>

View/customer/side-bar.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="col-md-2 col-2 pd0" style="height: 100%; margin: 50px 20px 0px 50px;float: left;">
1+
<div class="col-md-2 col-12 pd0" style="height: 100%; margin: 50px 20px 0px 50px;float: left;">
22
<div class="name" style="padding-top: 15px;padding-bottom: 30px; height: 100px; border-bottom: 1px solid #efefef; ">
33
<div style="width: 35%; float: left; text-align: center;" id="ava_cus">
44
<?php
@@ -20,8 +20,8 @@
2020
</div>
2121
</div>
2222

23-
<div style="height: 100px; margin-top: 30px; font-size: 16px;">
24-
<ul class="list-group" style="float: left; ">
23+
<div id="sidebar">
24+
<ul class="list-group" style="float: left;">
2525
<a href="index.php?page=profile&method=info"><li class="list-group-item"><i class=""></i>Thông tin tài khoản</li></a>
2626
<a href="index.php?page=profile&method=password"><li class="list-group-item">Đổi mật khẩu</li></a>
2727
<a href="index.php?page=profile&method=history"><li class="list-group-item">Lịch sử mua hàng</li></a>

View/product/lastseen-product.php

-27
This file was deleted.

admin/Includes/header.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<meta charset="utf-8" />
55
<title>Login</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<meta content="A fully featured admin theme which can be used to build CRM, CMS, etc." name="description" />
8-
<meta content="Coderthemes" name="author" />
7+
<meta content="" name="description" />
8+
<meta content="" name="author" />
99
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
1010
<!-- App favicon -->
1111
<link rel="shortcut icon" href="assets/images/favicontab.png">

admin/Includes/header_dashboard.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<meta charset="utf-8" />
55
<title>Customer Management</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<meta content="A fully featured admin theme which can be used to build CRM, CMS, etc." name="description" />
8-
<meta content="Coderthemes" name="author" />
7+
<meta content="" name="description" />
8+
<meta content="" name="author" />
99
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
1010
<!-- App favicon -->
1111
<link rel="shortcut icon" href="Asset/images/favicontab.png">

assets/css/app.css

+70-2
Original file line numberDiff line numberDiff line change
@@ -2890,8 +2890,8 @@ h3.timeline-title {
28902890
padding: 0 !important;
28912891
}
28922892
#carousel-slide{
2893+
height: 500px;
28932894
margin-bottom: 15px;
2894-
height: 100%;
28952895
}
28962896
#service{
28972897
margin-top: 15px;
@@ -3400,4 +3400,72 @@ input[type='file'] {
34003400
width: 12px;
34013401
margin-top: 2px;
34023402

3403-
}
3403+
}
3404+
#sidebar{
3405+
height: 100px;
3406+
margin-top: 30px;
3407+
font-size: 16px;
3408+
}
3409+
*{
3410+
margin: 0px;
3411+
padding: 0px;
3412+
box-sizing: border-box;
3413+
3414+
}
3415+
html,body{
3416+
overflow-x: hidden;
3417+
}
3418+
@media screen and (max-width: 480px){
3419+
.col-md-push-4{
3420+
left: 0;
3421+
}
3422+
#carousel-slide{
3423+
height: 200px;
3424+
}
3425+
.banner-content-1{
3426+
position: absolute;
3427+
left: 130px;
3428+
top: 20px;
3429+
color: #a8741a;
3430+
font-family: banner-content;
3431+
font-family: 'Playfair Display', serif;
3432+
font-style: bold;
3433+
font-size: 15px;
3434+
}
3435+
.banner-content-2{
3436+
position: absolute;
3437+
left: 85px;
3438+
top: 50px;
3439+
color: #a8741a;
3440+
font-family: banner-content;
3441+
font-family: 'Playfair Display', serif;
3442+
font-size: 15px;
3443+
}
3444+
.footer_1{
3445+
display: none;
3446+
}
3447+
#ft_none{
3448+
display: block;
3449+
}
3450+
.icon-setting{
3451+
display: none;
3452+
}
3453+
#name_cus{
3454+
display: none;
3455+
}
3456+
.nav-user{
3457+
margin-top: 20px;
3458+
}
3459+
.login{
3460+
margin-right: 10px;
3461+
font-size: 10px;
3462+
}.logo-box{
3463+
float: right
3464+
}
3465+
.sidebar{
3466+
3467+
}
3468+
.sidebar li{
3469+
text-align: center;
3470+
}
3471+
}

assets/css/app.min.css

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/bootstrap.min.css

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

assets/js/vendor.min.js

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

includes/banner.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<div class="row float pd0" id="carousel-slide">
2-
<div class="col-md-12 col-sm-12 col-lg-12 col-12 pd0">
3-
<div id="carouselExampleIndicators" class="carousel slide " data-ride="carousel">
2+
<div class="col-md-12 col-sm-12 col-lg-12 col-12 pd0" style="height: 100%; margin-bottom: 10px;">
3+
<div id="carouselExampleIndicators" class="carousel slide " data-ride="carousel" style="height: 100%">
44
<ol class="carousel-indicators">
55
<li data-target="#carouselExampleIndicators" data-slide-to="0" class="active"></li>
66
<li data-target="#carouselExampleIndicators" data-slide-to="1"></li>
77
<li data-target="#carouselExampleIndicators" data-slide-to="2"></li>
88
</ol>
9-
<div class="carousel-inner">
9+
<div class="carousel-inner" style="">
1010
<div class="carousel-item active">
11-
<img class="d-block w-100" src="assets/images/slider/slider1.jpg" alt="First slide">
11+
<img class="d-block " src="assets/images/slider/slider1.jpg" alt="First slide">
1212
</div>
1313
<div class="carousel-item">
14-
<img class="d-block w-100" src="assets/images/slider/slider2.jpg" alt="Second slide">
14+
<img class="d-block " src="assets/images/slider/slider2.jpg" alt="Second slide">
1515
</div>
1616
<div class="carousel-item">
17-
<img class="d-block w-100" src="assets/images/slider/slider3.jpg" alt="Third slide">
17+
<img class="d-block " src="assets/images/slider/slider3.jpg" alt="Third slide">
1818
</div>
1919
</div>
2020
<a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev">

includes/footer.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
</div>
8686
8787
<!-- Vendor js -->
88-
<script src="assets/js/vendor.js"></script>
88+
<script src="assets/js/vendor.min.js"></script>
8989
9090
<!-- Required datatable js -->
9191
<script src="assets/libs/datatables/jquery.dataTables.min.js"></script>
@@ -114,7 +114,7 @@
114114
</script>
115115
116116
<script type="text/javascript">
117-
$.raty.path = 'images';
117+
$.raty.path = 'assets/images/images';
118118
119119
$(function() {
120120

includes/header.php

+4-65
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<meta charset="utf-8" />
44
<title>Millennium Watches</title>
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6-
<meta content="A fully featured admin theme which can be used to build CRM, CMS, etc." name="description" />
7-
<meta content="Coderthemes" name="author" />
6+
<meta content="Đồng hồ tốt số 1 Việt Nam" name="description" />
7+
<meta content="Hoag" name="author" />
88
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
99
<!-- App favicon -->
1010
<link rel="shortcut icon" href="assets/images/favicon.ico">
@@ -19,70 +19,9 @@
1919
<link href="assets/libs/datatables/responsive.bootstrap4.css" rel="stylesheet" type="text/css" />
2020
2121
<!-- App css -->
22-
<link href="assets/css/bootstrap.css" rel="stylesheet" type="text/css" />
22+
<link href="assets/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
2323
<link href="assets/css/icons.min.css" rel="stylesheet" type="text/css" />
24-
<link href="assets/css/app.css" rel="stylesheet" type="text/css" />
25-
26-
<style type="text/css">
27-
*{
28-
margin: 0px;
29-
padding: 0px;
30-
box-sizing: border-box;
31-
32-
}
33-
html,body{
34-
overflow-x: hidden;
35-
}
36-
@media screen and (max-width: 480px){
37-
.col-md-push-4{
38-
left: 0;
39-
}
40-
#carousel-slide{
41-
height: 50%;
42-
}
43-
.banner-content-1{
44-
position: absolute;
45-
left: 130px;
46-
top: 20px;
47-
color: #a8741a;
48-
font-family: banner-content;
49-
font-family: 'Playfair Display', serif;
50-
font-style: bold;
51-
font-size: 15px;
52-
}
53-
.banner-content-2{
54-
position: absolute;
55-
left: 85px;
56-
top: 50px;
57-
color: #a8741a;
58-
font-family: banner-content;
59-
font-family: 'Playfair Display', serif;
60-
font-size: 15px;
61-
}
62-
.footer_1{
63-
display: none;
64-
}
65-
#ft_none{
66-
display: block;
67-
}
68-
.icon-setting{
69-
display: none;
70-
}
71-
#name_cus{
72-
display: none;
73-
}
74-
.nav-user{
75-
margin-top: 20px;
76-
}
77-
.login{
78-
margin-right: 10px;
79-
font-size: 10px;
80-
}.logo-box{
81-
float: right
82-
}
83-
}
84-
85-
</style>
24+
<link href="assets/css/app.min.css" rel="stylesheet" type="text/css" />
8625
8726
</head>
8827

includes/topbar.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</a>
5050

5151
<!-- item-->
52-
<a href="index.php?page=history" class="dropdown-item notify-item">
52+
<a href="index.php?page=profile&method=history" class="dropdown-item notify-item">
5353
<i class="fe-shopping-cart"></i>
5454
<span>Lịch sử mua hàng</span>
5555
</a>

0 commit comments

Comments
 (0)