From a0c1f9ac1b65798a04af7910ccd45f7b38d49630 Mon Sep 17 00:00:00 2001
From: Zain Fauzan Rofie Azizi <zanepojan94@gmail.com>
Date: Sat, 24 Mar 2018 12:50:58 +0800
Subject: [PATCH] complete the actual side by side, but need to fix the margin

---
 arrangements-warehouse_receive_note1.2.html | 133 +++++++++++---------
 css/global.style.css                        |  41 +++---
 2 files changed, 96 insertions(+), 78 deletions(-)

diff --git a/arrangements-warehouse_receive_note1.2.html b/arrangements-warehouse_receive_note1.2.html
index 8d4c6a8..71472e1 100644
--- a/arrangements-warehouse_receive_note1.2.html
+++ b/arrangements-warehouse_receive_note1.2.html
@@ -30,69 +30,82 @@
                         </div>
                         <div class="form-divider"></div>
                         <div class="form-row-group with-icons-no-padding">
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Total Carton(Nominal)</label>
+                                <div class="form-row no-padding">
+                                        <div class="form-element-title">
+                                            <label style="color: #000">Description</label>
+                                        </div>
+                                        <input type="text" class="form-element" placeholder="Items is goods" required />
                                 </div>
-                                <input type="text" class="form-element" placeholder="0" required />
-                            </div>
-        
+                
+                            <table style="width:100%">
+                                <tr>
+                                    <td>                                     
+                                        <div class="form-row no-padding">
+                                            <div class="form-element-title">
+                                            <label style="color: #000">Total Carton(Actual)</label>
+                                            <label style="color: #000">Total Carton(Nominal)</label><br>
+                                            <input width="46%" type="text" name="Nominal" class="form-first-name" placeholder="Nominal" />&nbsp;
+                                            <input width="46%" type="text" name="Actual" class="form-last-name" placeholder="Actual" />
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>                                     
+                                        <div class="form-row no-padding">
+                                            <div class="form-element-title">
+                                            <label style="color: #000">Measurement</label><br>
+                                            <input width="46%" type="text" name="Nominal" class="form-first-name" placeholder="Nominal" />&nbsp;
+                                            <input width="46%" type="text" name="Actual" class="form-last-name" placeholder="Actual" />
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>                                     
+                                        <div class="form-row no-padding">
+                                            <div class="form-element-title">
+                                            <label style="color: #000">Weight</label><br>
+                                            <input width="46%" type="text" name="Nominal" class="form-first-name" placeholder="Nominal" />&nbsp;
+                                            <input width="46%" type="text" name="Actual" class="form-last-name" placeholder="Actual" />
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                            </table>
                             <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Total Carton(Actual)</label>
+                                    <div class="form-element-title">
+                                        <label style="color: #000">Balanced</label>
+                                    </div>
+                                    <input type="text" class="form-element" placeholder="1 carton" required />
+                            </div>
+                            <div class="form-row no-padding">
+                                    <div class="form-element-title">
+                                        <label style="color: #000">Damages</label>
+                                    </div><br>
+                                    <label><input type="radio" name="gender" /> Yes</label>
+                                    <label class="form-element"><input type="radio" name="gender" /> No</label>
                                 </div>
-                                <input type="text" class="form-element" placeholder="0" required />
-                            </div>
-        
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Balanced</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="1 carton" required />
-                            </div>
-               
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Measurement(Nominal)</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="0.00" required />
-                            </div>
-        
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Measurement(Actual)</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="0.00" required />
-                            </div>
-        
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Weight(Nominal)</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="0.00" required />
-                            </div>
-        
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Weight(Actual)</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="0.00" required />
-                            </div>
-                       
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Damages</label>
-                                </div><br>
-                                <label><input type="radio" name="gender" /> Yes</label>
-                                <label class="form-element"><input type="radio" name="gender" /> No</label>
-                            </div>
-        
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Status</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Matched/Unmatched/Damaged/Matched Damaged/Unmatched Damaged" required />
-                            </div>							
+            
+                                <div class="form-row no-padding">
+                                    <div class="form-element-title">
+                                        <label style="color: #000">Status</label>
+                                    </div>
+                                    <input type="text" class="form-element" placeholder="Matched/Unmatched/Damaged/Matched Damaged/Unmatched Damaged" required />
+                                </div>							
+                            
+
+
+
+
+
+
+
+
+
+
+
+
                         </div>
                         <!-- Warehouse Receive Note start -->
                         <div class="form-divider"></div>
diff --git a/css/global.style.css b/css/global.style.css
index 2a81e61..33113cb 100644
--- a/css/global.style.css
+++ b/css/global.style.css
@@ -2645,28 +2645,12 @@ cont.menu ul.main-menu>li li a{
     from {opacity: 0;}
     to {opacity: 1;}
 }
-/*end of part 28----------------------------------------------------*/
+/*end of part 27----------------------------------------------------*/
 
 /*-------------------------------------------------------------------
-[27. Table and Collapsible]
+[28.Collapsible]
 -------------------------------------------------------------------*/
 
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-    width: 100%;
-    border: 1px solid #ddd;
-	
-}
-
-th, td {
-    text-align: left;
-    padding: 8px;
-	font-family: Nunito;
-}
-
-tr:nth-child(even){background-color: #f2f2f2}
-
 .collapsible {
     background-color: #f8f8f8;
     color: #069;
@@ -2692,6 +2676,25 @@ tr:nth-child(even){background-color: #f2f2f2}
 }
 /*end of part 28----------------------------------------------------*/
 
+/*-------------------------------------------------------------------
+[29. Table and Collapsible]
+-------------------------------------------------------------------*/
+
+.form-first-name, .form-last-name {
+	width: 46%;
+	border: none;	
+}
+
+.form-last-name {
+	float: right;
+}
+.form-first-name {
+	float: left;
+	
+}
+
+/*end of part 29----------------------------------------------------*/
+
 /*Other Styles and helpers------------------------------------------*/
 .block {
     display: block;
@@ -2723,3 +2726,5 @@ h1 .button {
 }
 
 
+
+