Skip to content
Snippets Groups Projects
Commit 1a74af16 authored by Muhammad Umar Fariz Tumbuan's avatar Muhammad Umar Fariz Tumbuan
Browse files

Merging branch lokal...

parents 4cdfae6a b9f06f56
1 merge request!45OneHundred - 13515005 - Husnulzaki Wibisono Haryadi
Hide whitespace changes
Inline Side-by-side
css/default_style.css
+ 19
− 0
View file @ 1a74af16
body {
margin: 0;
padding: 0;
}
.frame { .frame {
width: 360px; width: 360px;
height: 550px; height: 550px;
...@@ -92,3 +97,17 @@ a:hover { ...@@ -92,3 +97,17 @@ a:hover {
margin: 0; margin: 0;
} }
.profile_pict_frame {
width: 100px;
height: 100px;
overflow: auto;
border-radius: 50%;
margin-left: auto;
margin-right: auto;
}
.profile_pict_frame img {
display: inline;
margin: 0 auto;
height: 100%;
width: 100%;
}
\ No newline at end of file
css/history.css
+ 70
− 1
View file @ 1a74af16
.history_container { .history_container {
margin-top: 10%; margin-top: 10%;
height: 79%; height: 79%;
border: 1px solid red; border: 1px solid red; /*OJO LALI HAPUS IKI*/
} }
.history_container .subheader { .history_container .subheader {
...@@ -40,3 +40,72 @@ ...@@ -40,3 +40,72 @@
.history_menu > h3 { .history_menu > h3 {
margin: 5px 1px; margin: 5px 1px;
} }
<<<<<<< HEAD
=======
#history_table_container {
overflow-y: auto;
height: inherit;
}
table.history_table {
margin-top: 5px;
border: 1px solid blue; /*OJO LALI HAPUS IKI*/
width: 100%;
border: 1px solid purple;
padding: 0;
border-collapse: collapse;
}
table.history_table p {
margin: 0;
padding: 0;
font-size: 14px;
font-style: "Lucida Console", Monaco, monospace;
}
td.history_column {
padding: 2px 0 0 8px;
}
p.history_date {
color: grey;
font-weight: bold;
}
p.history_username {
font-size: 20px;
font-weight: bold;
}
p.history_loc {
}
p.history_rating {
}
p.history_comment {
}
table.history_table th, td {
border: 1px solid purple;
padding: 0;
border-collapse: collapse;
}
p.history_table td {
vertical-align: top;
}
img.history_pict {
width: 100px;
height: 100px;
overflow: auto;
border-radius: 50%;
display: inline;
margin: 0;
}
\ No newline at end of file
css/profile.css
+ 1
− 14
View file @ 1a74af16
...@@ -17,20 +17,7 @@ ...@@ -17,20 +17,7 @@
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
.profile_pict_frame {
width: 100px;
height: 100px;
overflow: auto;
border-radius: 50%;
margin-left: auto;
margin-right: auto;
}
.profile_pict_frame img {
display: inline;
margin: 0 auto;
height: 100%;
width: 100%;
}
.profile_data_container { .profile_data_container {
height: 100px; height: 100px;
} }
......
history/driver_history.php
+ 57
− 0
View file @ 1a74af16
...@@ -44,6 +44,63 @@ ...@@ -44,6 +44,63 @@
</a> </a>
</li> </li>
</ul> </ul>
<div id="history_table_container">
<table class="history_table">
<colgroup>
<col style="width: 20%;">
<col style="width: 80%;">
</colgroup>
<tbody>
<tr>
<td>
<img class="history_pict" src="../img/default_profile.jpeg">
</td>
<td class="history_column">
<p class="history_date">tanggal</p>
<p class="history_username">Username</p>
<p class="history_loc">asal - tujuan</p>
<p class="history_rating">rating</p>
<p class="history_comment">You commented:</p>
<p class="history_comment" style="margin-left: 30px;">ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
</p>
</td>
</tr>
<tr>
<td>
<img class="history_pict" src="../img/default_profile.jpeg">
</td>
<td class="history_column">
<p class="history_date">tanggal</p>
<p class="history_username">Username</p>
<p class="history_loc">asal - tujuan</p>
<p class="history_rating">rating</p>
<p class="history_comment">You commented:</p>
<p class="history_comment" style="margin-left: 30px;">ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
</p>
</td>
</tr>
<tr>
<td>
<img class="history_pict" src="../img/default_profile.jpeg">
</td>
<td class="history_column">
<p class="history_date">tanggal</p>
<p class="history_username">Username</p>
<p class="history_loc">asal - tujuan</p>
<p class="history_rating">rating</p>
<p class="history_comment">You commented:</p>
<p class="history_comment" style="margin-left: 30px;">ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
</p>
</td>
</tr>
</tbody>
</table>
</div>
</div> </div>
</div> </div>
</body> </body>
......
history/transaction_history.php
+ 57
− 0
View file @ 1a74af16
...@@ -43,6 +43,63 @@ ...@@ -43,6 +43,63 @@
</a> </a>
</li> </li>
</ul> </ul>
<div id="history_table_container">
<table class="history_table">
<colgroup>
<col style="width: 20%;">
<col style="width: 80%;">
</colgroup>
<tbody>
<tr>
<td>
<img class="history_pict" src="../img/default_profile.jpeg">
</td>
<td class="history_column">
<p class="history_date">tanggal</p>
<p class="history_username">Username</p>
<p class="history_loc">asal - tujuan</p>
<p class="history_rating">rating</p>
<p class="history_comment">You commented:</p>
<p class="history_comment" style="margin-left: 30px;">ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
</p>
</td>
</tr>
<tr>
<td>
<img class="history_pict" src="../img/default_profile.jpeg">
</td>
<td class="history_column">
<p class="history_date">tanggal</p>
<p class="history_username">Username</p>
<p class="history_loc">asal - tujuan</p>
<p class="history_rating">rating</p>
<p class="history_comment">You commented:</p>
<p class="history_comment" style="margin-left: 30px;">ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
</p>
</td>
</tr>
<tr>
<td>
<img class="history_pict" src="../img/default_profile.jpeg">
</td>
<td class="history_column">
<p class="history_date">tanggal</p>
<p class="history_username">Username</p>
<p class="history_loc">asal - tujuan</p>
<p class="history_rating">rating</p>
<p class="history_comment">You commented:</p>
<p class="history_comment" style="margin-left: 30px;">ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
</p>
</td>
</tr>
</tbody>
</table>
</div>
</div> </div>
</div> </div>
</body> </body>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment