Merge pull request #42 from eysteinbye/NewLayout

#4 Added some CSS for a nice layout
Assert · Mar 22, 2014 · 74f93a4 · 74f93a4
2 parents 730de7f + d181579
commit 74f93a4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/css/style.css b/css/style.css
@@ -22,10 +22,11 @@ header{
     width:100%;
     text-align: center;
 }
+
 h1{
     display: block;
-
 }
+
 article{
     padding-top: 20px;
     width: 500px;
@@ -40,12 +41,10 @@ footer{
     height:30px;
     background-color: #3C3C3C;
     color: #F2F2F2;
-    padding-left: 10px;
     padding-top: 5px;
     font-size: 14px;
 }
 
-
 a{
     color:#4096F1;
 }
@@ -55,19 +54,19 @@ a:hover{
 }
 select, button{
     font-size: 24px;
-
 }
 input {
     font-size: 24px;
-    text-align: right;
 }
 
 input[type='text'] {
     color: #3C3C3C;
     border: 1px solid #3C3C3C;
     background-color: white;
+    width: 310px;
 }
 
 span.labelText{
-    width:200px;
+    width: 170px;
+    display: inline-block;
 }
diff --git a/index.htm b/index.htm
@@ -37,12 +37,10 @@ <h1>ShowMe!</h1>
         <article>
 
         <div ng-show="user">
-
-            Product:
+<p>
+            <span class="labelText">Products</span>
             <select ng-model="item" ng-options="p.product for p in products"></select><br>
-
-            <input type="hidden" ng-model="item.id">
-
+</p>
             <label>
                 <span class="labelText">Product name</span>
                 <input type="text" ng-model="item.product" placeholder="Product name.....">
@@ -51,7 +49,6 @@ <h1>ShowMe!</h1>
                 <span class="labelText">Description</span>
                 <input type="text" ng-model="item.desc" placeholder="Description...">
             </label><br />
-
             <label>
                 <span class="labelText">Time</span>
                 <input type="text" ng-model="item.startTime" placeholder="Time...">
@@ -74,6 +71,8 @@ <h1>ShowMe!</h1>
             </label>
             <br />
             <p>
+            <input type="hidden" ng-model="item.id">
+
             <button ng-hide="item.id" ng-click="saveProduct()">Save</button>
 
             <button ng-show="item.id" ng-click="saveProduct()">Update</button>