Merge branch 'master' of https://github.com/senaduka/ribica

Conflicts:
	front-ui/app/components/cart/cartPage.js

front-ui/app/components/cart/cartPage.js

@@ -96,7 +96,6 @@ var CartPage = React.createClass({
 
 
       return (
-
         <div className="col-lg-12">
           <LinkBanner locationName="thankYouPage" />
            <div className="cart-title">KORPA</div>
@@ -116,6 +115,13 @@ var CartPage = React.createClass({
                {displayedItems}
              </tbody>
            </table>
+
+
+        <div className="cart-page center">
+          <LinkBanner locationName="cartPage" />
+
+           {displayedItems}
+
            {buySomethingMessage}
            {cartTotal}
         </div>

front-ui/app/css/main.css

@@ -46,9 +46,7 @@ h1 h2 h3 h4 h5{
 .mybutton{
     background-color: #00a8a8;
     padding: 6px 11px !important;
-    display: block;
     border-radius: 3px;
-    margin-top: 8px;
     border: solid #06c3c3 1px;
     color: #ffffff !important;
 }
@@ -56,9 +54,8 @@ h1 h2 h3 h4 h5{
 
 .mybutton:hover  {
     background-color: #06c3c3 !important;
+    padding: 6px 11px !important;
     color: black !important;
-    margin-top: 8px;
-    display: block;
     border-radius: 3px;
     border: solid #06c3c3 1px;
     color: #ffffff !important;
@@ -105,7 +102,7 @@ background: none;
 }
 .mynav li .mybutton:hover  {
     background-color: #06c3c3;
-       padding: 4px 10px !important;
+    padding: 4px 10px !important;
     margin-top: 6px;
     display: block;
     border-radius: 3px;