diff --git a/front-ui/app/components/cart/checkoutPage.js b/front-ui/app/components/cart/checkoutPage.js index 883adb0..2b92b0d 100644 --- a/front-ui/app/components/cart/checkoutPage.js +++ b/front-ui/app/components/cart/checkoutPage.js @@ -5,11 +5,11 @@ var React = require('react'), NavigationActions = require('../../actions/navigationActions'), SingleItem = require('../items/singleItem'), Globals = require('../../globals'), - CartTotal = require('./cartTotal'), + CartTotal = require('./cartTotal'), LinkBanner = require('../linkBanner/linkBanner'), PaymentSelect = require('../payment/paymentSelect'), RibicaFormError = require('../shared/ribicaFormError'); - + var Router = require('react-router'); @@ -18,15 +18,14 @@ var CheckoutPage = React.createClass({ render: function() { - var choosePayment = ( -
- Plaćanje:
+ var choosePayment = ( +
); var supportedPlaceOptions = CartStore.getSupportedPlaces().map ( function (p) { return ()}); - + var content = (
@@ -49,15 +48,15 @@ var CheckoutPage = React.createClass({ adresa na koju će roba biti isporučena
- +
@@ -96,19 +95,21 @@ var CheckoutPage = React.createClass({
+
+ Plaćanje:

+
{choosePayment}
-
- + - ); + ); if(CartStore.isAddressColapsed()) { @@ -125,7 +126,7 @@ var CheckoutPage = React.createClass({

- ili + ili

@@ -162,7 +163,7 @@ var CheckoutPage = React.createClass({ _onFieldChange: function (event) { CartActions.changeDeliveryDestinationProperty(event.target.name, event.target.value); }, - + _onOrderClick: function (event) { CartActions.confirmDelivery(); }, @@ -178,4 +179,4 @@ var CheckoutPage = React.createClass({ }); -module.exports = CheckoutPage; +module.exports = CheckoutPage; diff --git a/front-ui/app/css/checkout.css b/front-ui/app/css/checkout.css index 9740cf8..71886a0 100644 --- a/front-ui/app/css/checkout.css +++ b/front-ui/app/css/checkout.css @@ -3,3 +3,8 @@ margin-left: 10px !important; } + +.payment-btn { + float: left; + margin-left: 12px; +}