Commit 1b52afe7 by Juliper

op

parent 36fc9a90
...@@ -24,14 +24,8 @@ ...@@ -24,14 +24,8 @@
<div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft"> <div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
<input type="text" class="text wow agileits w3layouts slideInLeft" name="jumlah_kamar" placeholder="Jumlah Kamar" required="" style="background-color: white; color: black"> <input type="text" class="text wow agileits w3layouts slideInLeft" name="jumlah_kamar" placeholder="Jumlah Kamar" required="" style="background-color: white; color: black">
</div> </div>
<<<<<<< HEAD
<div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft" style="margin-top: 10px;">
<button class="btn btn-success " >BOOK NOW</button>
=======
<div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft"> <div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
<input type="submit" class="more_btn wow agileits w3layouts slideInLeft" value="Book Now"> <input type="submit" class="more_btn wow agileits w3layouts slideInLeft" value="Book Now">
>>>>>>> f3f2287d7c86a7c8efc0162c242d120bfcaf820a
</div> </div>
</form> </form>
</div> </div>
...@@ -107,13 +101,10 @@ ...@@ -107,13 +101,10 @@
<div class="details agileits w3layouts"> <div class="details agileits w3layouts">
<div class="container"> <div class="container">
<div class="col-md-6 col-sm-6 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft"> <div class="col-md-6 col-sm-6 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
<<<<<<< HEAD
<h2 style="margin-bottom: 10px;"> Kritik dan Saran</h2> <h2 style="margin-bottom: 10px;"> Kritik dan Saran</h2>
<form action="#" method="post" style="margin-bottom: 25px;"> <form action="#" method="post" style="margin-bottom: 25px;">
=======
<h2 style="margin-bottom: 10px;"> Kritik dan Saran </h2> <h2 style="margin-bottom: 10px;"> Kritik dan Saran </h2>
<form action ="#" method="post" style="margin-bottom: 25px;"> <form action ="#" method="post" style="margin-bottom: 25px;">
>>>>>>> f3f2287d7c86a7c8efc0162c242d120bfcaf820a
<input type="text" class="text wow agileits w3layouts slideInLeft" name="Name" placeholder="Name" required=""> <input type="text" class="text wow agileits w3layouts slideInLeft" name="Name" placeholder="Name" required="">
<input type="text" class="text wow agileits w3layouts slideInLeft" name="Email" placeholder="Email" required=""> <input type="text" class="text wow agileits w3layouts slideInLeft" name="Email" placeholder="Email" required="">
<textarea name="Message" class="wow agileits w3layouts slideInLeft" placeholder="Message" required=""></textarea> <textarea name="Message" class="wow agileits w3layouts slideInLeft" placeholder="Message" required=""></textarea>
...@@ -134,11 +125,7 @@ ...@@ -134,11 +125,7 @@
document.querySelector('').onclick = function(){ document.querySelector('').onclick = function(){
swal("Good job!", "You clicked the button!", "success");}; swal("Good job!", "You clicked the button!", "success");};
</script> </script>
<<<<<<< HEAD
@endsection
</div> </div>
=======
<script> <script>
...@@ -171,5 +158,3 @@ ...@@ -171,5 +158,3 @@
}; };
</script> </script>
\ No newline at end of file
>>>>>>> f3f2287d7c86a7c8efc0162c242d120bfcaf820a
Markdown is supported
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