Merge branch 'master' of github.com:jeena/seinheit.ch

application/view/main.phtml

@@ -76,7 +76,7 @@
 				<img src="<?php echo $this->base ?>/img/facebook-icon.png" alt="SEINHEIT bei Facebook">
 			</a>
 		</p>
-		<p>Naturheilpraxis SEINHEIT. Kinga Pannek, Bahnhofstraße 105, 8620 Wetzikon, Schweiz</p>
+		<p>Naturheilpraxis SEINHEIT. Kinga Pannek, Bahnhofstraße 105, 8620 Wetzikon, Schweiz, Telefon: 078 684 86 75</p>
 	</footer>
 
 </div>

public/style/main.css

@@ -132,6 +132,7 @@ ul {
     line-height: 1.7;
 }
 
+.col1:before, .col1:after,
 .col2:before, .col2:after,
 .col3:before, .col3:after,
 .col4:before, .col4:after,
@@ -140,7 +141,7 @@ ul {
     display: table;
 }
 
-.col2:after, .col3:after, .col4:after,
+.col1:after, .col2:after, .col3:after, .col4:after,
 #stage:after {
     clear: both;
 }
@@ -181,22 +182,22 @@ footer #social {
     margin-top: 10px;
 }
 
-.col4, .col3, .col2 {
+.col4, .col3, .col2, .col1 {
     clear: both;
 }
 
 .col3 .col {
-    width: 33%;
+    width: 32%;
     float: left;
-    padding: 0 0.2em;
+    margin-right: 2%;
 }
 
 .col3 .col:first-child {
-    margin-right: 0.4em;
+    
 }
 
 .col3 .col:last-child {
-    float: right;
+    margin-right: 0;
 }
 
 .box {
@@ -236,9 +237,9 @@ footer #social {
 }
 
 .col {
-    -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-    -moz-box-sizing: border-box;    /* Firefox, other Gecko */
-    box-sizing: border-box;         /* Opera/IE 8+ */    
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
 }
 
 .col2 .col:first-child {
@@ -270,17 +271,17 @@ footer #social {
 }
 
 .col4 .col {
-    width: 25%;
+    width: 24%;
     float: left;
-    padding: 0 0.5em;
+    margin-right: 1.3%;
 }
 
 .col4 .col:first-child {
-    padding-left: 0;
+    
 }
 
 .col4 .col:last-child {
-    padding-right: 0;
+    margin-right: 0;
 }
 
 .col4 h2 {