Merge pull request #24 from gustiazis/master

General: Some Commits for Update Styles and Update Position

about.html

@@ -84,15 +84,15 @@
  </div>
 
  <div class="container-fluid" style="background: white;">
- <div class="navbar-header pull-left" style="border-right: 1px solid #E6EAEA; padding-right: 10px; margin-right: 0px; padding-left: 10px;">
+ <div class="navbar-header pull-left">
  <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
  <span class="sr-only">Toggle navigation</span>
  <span class="icon-bar icon-short"></span>
  <span class="icon-bar"></span>
  <span class="icon-bar icon-medium"></span>
  </button>
  </div>
- <div class="visible-xs" style="width: 70%; float: left;">
+ <div class="visible-xs logo-center">
  <p class="text-center logo-container visible-xs"><a href="index.html"><img src="images/logo.png" width="90"></a></p>
  </div>
  <div class="visible-xs pull-right">

articleDetails.html

@@ -85,15 +85,15 @@
  </div>
 
  <div class="container-fluid" style="background: white;">
- <div class="navbar-header pull-left" style="border-right: 1px solid #E6EAEA; padding-right: 10px; margin-right: 0px; padding-left: 10px;">
+ <div class="navbar-header pull-left">
  <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
  <span class="sr-only">Toggle navigation</span>
  <span class="icon-bar icon-short"></span>
  <span class="icon-bar"></span>
  <span class="icon-bar icon-medium"></span>
  </button>
  </div>
- <div class="visible-xs" style="width: 70%; float: left;">
+ <div class="visible-xs logo-center">
  <p class="text-center logo-container visible-xs"><a href="index.html"><img src="images/logo.png" width="90"></a></p>
  </div>
  <div class="visible-xs pull-right">
@@ -265,7 +265,7 @@ <h5>Date</h5>
  <p>September 17 2017</p>
  </div>
  </div>
- 
+
 
 
 
@@ -316,7 +316,7 @@ <h4 class="text-center">Related Articles</h4>
  <a href="articleDetails.html" class="thumbnail_item thumbnail less-padding" style="margin-bottom: 0;">
  <img src="images/article1.jpg" alt="article title">
  </a>
- <div class="caption box" style="background: white; padding: 10px;">
+ <div class="caption box">
  <h3>Lemon Seafood Risotto</h3>
  <div class="row">
  <div class="col-sm-8 col-xs-6">
@@ -338,7 +338,7 @@ <h3>Lemon Seafood Risotto</h3>
  <a href="articleDetails.html" class="thumbnail_item thumbnail less-padding" style="margin-bottom: 0;">
  <img src="images/article2.jpg" alt="article title">
  </a>
- <div class="caption box" style="background: white; padding: 10px;">
+ <div class="caption box">
  <h3>Lemon Seafood Risotto</h3>
  <div class="row">
  <div class="col-sm-8 col-xs-6">

articles.html

@@ -85,15 +85,15 @@
  </div>
 
  <div class="container-fluid" style="background: white;">
- <div class="navbar-header pull-left" style="border-right: 1px solid #E6EAEA; padding-right: 10px; margin-right: 0px; padding-left: 10px;">
+ <div class="navbar-header pull-left">
  <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
  <span class="sr-only">Toggle navigation</span>
  <span class="icon-bar icon-short"></span>
  <span class="icon-bar"></span>
  <span class="icon-bar icon-medium"></span>
  </button>
  </div>
- <div class="visible-xs" style="width: 70%; float: left;">
+ <div class="visible-xs logo-center">
  <p class="text-center logo-container visible-xs"><a href="index.html"><img src="images/logo.png" width="90"></a></p>
  </div>
  <div class="visible-xs pull-right">
@@ -199,7 +199,7 @@ <h4 class="text-oswald">Recently Added Product(s)</h4>
  <a href="articleDetails.html" class="thumbnail_item thumbnail less-padding" style="margin-bottom: 0;">
  <img src="images/article0.jpg" alt="article title">
  </a>
- <div class="caption box" style="background: white; padding: 10px;">
+ <div class="caption box">
  <h3>Lemon Seafood Risotto</h3>
  <div class="row">
  <div class="col-sm-8 col-xs-6">
@@ -221,7 +221,7 @@ <h3>Lemon Seafood Risotto</h3>
  <a href="articleDetails.html" class="thumbnail_item thumbnail less-padding" style="margin-bottom: 0;">
  <img src="images/article1.jpg" alt="article title">
  </a>
- <div class="caption box" style="background: white; padding: 10px;">
+ <div class="caption box">
  <h3>Lemon Seafood Risotto</h3>
  <div class="row">
  <div class="col-sm-8 col-xs-6">
@@ -243,7 +243,7 @@ <h3>Lemon Seafood Risotto</h3>
  <a href="articleDetails.html" class="thumbnail_item thumbnail less-padding" style="margin-bottom: 0;">
  <img src="images/article2.jpg" alt="article title">
  </a>
- <div class="caption box" style="background: white; padding: 10px;">
+ <div class="caption box">
  <h3>Lemon Seafood Risotto</h3>
  <div class="row">
  <div class="col-sm-8 col-xs-6">
@@ -265,7 +265,7 @@ <h3>Lemon Seafood Risotto</h3>
  <a href="articleDetails.html" class="thumbnail_item thumbnail less-padding" style="margin-bottom: 0;">
  <img src="images/article3.jpg" alt="article title">
  </a>
- <div class="caption box" style="background: white; padding: 10px;">
+ <div class="caption box">
  <h3>Lemon Seafood Risotto</h3>
  <div class="row">
  <div class="col-sm-8 col-xs-6">
@@ -287,7 +287,7 @@ <h3>Lemon Seafood Risotto</h3>
  <a href="articleDetails.html" class="thumbnail_item thumbnail less-padding" style="margin-bottom: 0;">
  <img src="images/article4.jpg" alt="article title">
  </a>
- <div class="caption box" style="background: white; padding: 10px;">
+ <div class="caption box">
  <h3>Lemon Seafood Risotto</h3>
  <div class="row">
  <div class="col-sm-8 col-xs-6">
@@ -309,7 +309,7 @@ <h3>Lemon Seafood Risotto</h3>
  <a href="articleDetails.html" class="thumbnail_item thumbnail less-padding" style="margin-bottom: 0;">
  <img src="images/article5.jpg" alt="article title">
  </a>
- <div class="caption box" style="background: white; padding: 10px;">
+ <div class="caption box">
  <h3>Lemon Seafood Risotto</h3>
  <div class="row">
  <div class="col-sm-8 col-xs-6">
@@ -329,11 +329,11 @@ <h3>Lemon Seafood Risotto</h3>
  </div>
 
  <div class="row">
- <div class="product-detail-tag-container col-md-4 col-md-offset-4 visible-xs">
- <button class="btn outline-white-button">Load More</button>
+ <div class="product-detail-tag-container col-md-4 col-md-offset-4 visible-xs text-center">
+ <button class="btn outline-white-button text-center">Load More</button>
  </div>
 
- <div class="col-md-8 hidden-xs">
+ <div class="col-md-12 hidden-xs text-center">
  <!--pagination-->
  <nav aria-label="Page navigation">
  <ul class="pagination">

blank.html

@@ -82,15 +82,15 @@
  </div>
 
  <div class="container-fluid" style="background: white;">
- <div class="navbar-header pull-left" style="border-right: 1px solid #E6EAEA; padding-right: 10px; margin-right: 0px; padding-left: 10px;">
+ <div class="navbar-header pull-left">
  <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
  <span class="sr-only">Toggle navigation</span>
  <span class="icon-bar icon-short"></span>
  <span class="icon-bar"></span>
  <span class="icon-bar icon-medium"></span>
  </button>
  </div>
- <div class="visible-xs" style="width: 70%; float: left;">
+ <div class="visible-xs logo-center">
  <p class="text-center logo-container visible-xs"><a href="index.html"><img src="images/logo.png" width="90"></a></p>
  </div>
  <div class="visible-xs pull-right">

changePassword.html

@@ -82,15 +82,15 @@
  </div>
 
  <div class="container-fluid" style="background: white;">
- <div class="navbar-header pull-left" style="border-right: 1px solid #E6EAEA; padding-right: 10px; margin-right: 0px; padding-left: 10px;">
+ <div class="navbar-header pull-left">
  <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
  <span class="sr-only">Toggle navigation</span>
  <span class="icon-bar icon-short"></span>
  <span class="icon-bar"></span>
  <span class="icon-bar icon-medium"></span>
  </button>
  </div>
- <div class="visible-xs" style="width: 70%; float: left;">
+ <div class="visible-xs logo-center">
  <p class="text-center logo-container visible-xs"><a href="index.html"><img src="images/logo.png" width="90"></a></p>
  </div>
  <div class="visible-xs pull-right">

channelDashboard.html

@@ -82,15 +82,15 @@
  </div>
 
  <div class="container-fluid" style="background: white;">
- <div class="navbar-header pull-left" style="border-right: 1px solid #E6EAEA; padding-right: 10px; margin-right: 0px; padding-left: 10px;">
+ <div class="navbar-header pull-left">
  <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
  <span class="sr-only">Toggle navigation</span>
  <span class="icon-bar icon-short"></span>
  <span class="icon-bar"></span>
  <span class="icon-bar icon-medium"></span>
  </button>
  </div>
- <div class="visible-xs" style="width: 70%; float: left;">
+ <div class="visible-xs logo-center">
  <p class="text-center logo-container visible-xs"><a href="index.html"><img src="images/logo.png" width="90"></a></p>
  </div>
  <div class="visible-xs pull-right">
@@ -358,7 +358,7 @@ <h4>Sigit Setiadji</h4>
  <button class="btn button-gray-3">See Details</button>
  <button class="btn button-red">Reject with reason</button>
  </div>
- 
+
  </div>
 </div>
 
@@ -393,7 +393,7 @@ <h4 class="modal-title" id="myModalLabel">Add Product</h4>
  <div class="modal-body">
  <div class="row">
  <div class="col-sm-3">
- 
+
  <label for="file-upload" class="custom-file-upload">
  <img src="images/add_photo_desktop.png" width="100%">
  </label>
@@ -434,14 +434,14 @@ <h4 class="modal-title" style="margin-bottom: 10px;">Product</h4>
  <div class="form-group">
  <input type="text" class="form-control" id="" placeholder="Nama Produk">
  </div>
- 
+
  <div class="row">
  <div class="col-sm-4">
  <div class="form-group">
  <input type="number" class="form-control" id="" placeholder="Harga">
  </div>
  </div>
- 
+
  <div class="col-sm-4">
  <div class="form-group">
  <input type="number" class="form-control" id="" placeholder="Berat (gram)">
@@ -453,15 +453,15 @@ <h4 class="modal-title" style="margin-bottom: 10px;">Product</h4>
  <input type="number" class="form-control" id="" placeholder="Minimum Order">
  </div>
  </div>
- 
+
  <div class="col-sm-12">
  <textarea class="form-control" rows="3" placeholder="Deskripsi Produk"></textarea>
  </div>
  </div>
- 
+
  <div class="clearfix" style="margin-bottom: 15px;"></div>
- 
- 
+
+
  </form>
  </div>
  </div>
@@ -479,7 +479,7 @@ <h4 class="modal-title" style="margin-bottom: 10px;">Ukuran Produk</h4>
  <input type="number" class="form-control" id="" placeholder="Panjang (cm)">
  </div>
  </div>
- 
+
  <div class="col-sm-4">
  <div class="form-group">
  <input type="number" class="form-control" id="" placeholder="Lebar (cm)">
@@ -492,7 +492,7 @@ <h4 class="modal-title" style="margin-bottom: 10px;">Ukuran Produk</h4>
  </div>
  </div>
  </div>
- 
+
  <div class="clearfix" style="margin-bottom: 15px;"></div>
 
  <div class="checkbox">
@@ -501,8 +501,8 @@ <h4 class="modal-title" style="margin-bottom: 10px;">Ukuran Produk</h4>
  </label>
  </div>
 
- 
- 
+
+
  </form>
  </div>
  </div>
@@ -659,7 +659,7 @@ <h4 class="modal-title" style="margin-bottom: 10px;">Ukuran Produk</h4>
  <div class="col-sm-6 visible-xs">
  <h3 class="text-red">My Products</h3>
  <p>Currently you have 5 products<a href="#" class="text-red pull-right">Urutkan</a></p>
- 
+
  <button class="btn btn-block button-add-product" data-toggle="modal" data-target="#uploadProductMobile"><i class="fa fa-plus" aria-hidden="true"></i> Add Product</button>
  <div class="maya-small-padding"></div>
  </div>

channelDetail.html

@@ -83,15 +83,15 @@
  </div>
 
  <div class="container-fluid" style="background: white;">
- <div class="navbar-header pull-left" style="border-right: 1px solid #E6EAEA; padding-right: 10px; margin-right: 0px; padding-left: 10px;">
+ <div class="navbar-header pull-left">
  <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
  <span class="sr-only">Toggle navigation</span>
  <span class="icon-bar icon-short"></span>
  <span class="icon-bar"></span>
  <span class="icon-bar icon-medium"></span>
  </button>
  </div>
- <div class="visible-xs" style="width: 70%; float: left;">
+ <div class="visible-xs logo-center">
  <p class="text-center logo-container visible-xs"><a href="index.html"><img src="images/logo.png" width="90"></a></p>
  </div>
  <div class="visible-xs pull-right">
@@ -255,7 +255,7 @@ <h4 style="margin-left: 10px; float: left;">Premium Seller</h4>
  <a href="productDetail.html" class="thumbnail_item thumbnail less-padding less-margin">
  <img src="images/sosisSolo.jpg" alt="sosis solo">
  </a>
- <div class="caption box" style="background: white; padding: 10px;">
+ <div class="caption box">
  <h3>Sosis Solo Sucicakes</h3>
  <div class="row">
  <div class="col-sm-8 col-xs-6">
@@ -274,7 +274,7 @@ <h3>Sosis Solo Sucicakes</h3>
  <a href="productDetail.html" class="thumbnail_item thumbnail less-padding less-margin">
  <img src="images/nasi_bakar_ayam_woku_2.jpg" alt="sosis solo">
  </a>
- <div class="caption box" style="background: white; padding: 10px;">
+ <div class="caption box">
  <h3>Nasi Bakar Ayam Woku</h3>
  <div class="row">
  <div class="col-sm-8 col-xs-6">
@@ -293,7 +293,7 @@ <h3>Nasi Bakar Ayam Woku</h3>
  <a href="productDetail.html" class="thumbnail_item thumbnail less-padding less-margin">
  <img src="images/risotto_square.jpg" alt="sosis solo">
  </a>
- <div class="caption box" style="background: white; padding: 10px;">
+ <div class="caption box">
  <h3>Lemon Risotto</h3>
  <div class="row">
  <div class="col-sm-8 col-xs-6">

channelEdit.html

@@ -82,15 +82,15 @@
  </div>
 
  <div class="container-fluid" style="background: white;">
- <div class="navbar-header pull-left" style="border-right: 1px solid #E6EAEA; padding-right: 10px; margin-right: 0px; padding-left: 10px;">
+ <div class="navbar-header pull-left">
  <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
  <span class="sr-only">Toggle navigation</span>
  <span class="icon-bar icon-short"></span>
  <span class="icon-bar"></span>
  <span class="icon-bar icon-medium"></span>
  </button>
  </div>
- <div class="visible-xs" style="width: 70%; float: left;">
+ <div class="visible-xs logo-center">
  <p class="text-center logo-container visible-xs"><a href="index.html"><img src="images/logo.png" width="90"></a></p>
  </div>
  <div class="visible-xs pull-right">