senaduka/old-ribica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted change in Gruntfile.js and fixed CSS issues in firefox

Browse Source
This commit is contained in:
Edin Dazdarevic
2015-06-02 12:30:48 +02:00
parent 055f9ab3fa
commit 1db13308ef
4 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
front-ui/Gruntfile.js
View File

@@ -23,16 +23,16 @@ module.exports = function(grunt) {
server: { server: {
options: { options: {
port: 3001, port: 3001,
base: 'build'//, base: 'build',
// middleware: function(connect, options) { middleware: function(connect, options) {
// return [ return [
// function(req, res) { function(req, res) {
// var filename = 'build/' + req.url; var filename = 'build/' + req.url;
// if ((filename === 'build//') || !grunt.file.exists(filename)) filename = 'build/index.html'; if ((filename === 'build//') || !grunt.file.exists(filename)) filename = 'build/index.html';
// res.end(grunt.file.read(filename)); res.end(grunt.file.read(filename));
// } }
// ]; ];
// }, },
} }
} }
}, },

7
front-ui/app/components/cart/addToCart.js
View File

@@ -13,10 +13,9 @@ var AddToCart = React.createClass({
var itemCount = this.state.count; var itemCount = this.state.count;
var amountAndAddButton = ( var amountAndAddButton = (
<div className="row-fluid add-to-cart"> <div className="row-fluid add-to-cart">
<div className="span12"> <div className="col-lg-12">
<div style={buttonHolderStyle}><button className="btn white_button" onClick={this._onDecreaseClick}>-</button></div> <button className="btn white_button" onClick={this._onDecreaseClick}>-</button><span className='add-to-cart-count'>{itemCount}</span>
<div style={buttonHolderStyle}> <div className="add-to-cart-count">{ itemCount }</div> </div> <button className="btn white_button" onClick={this._onIncreaseClick}>+</button>
<div style={buttonHolderStyle}><button className="btn white_button" onClick={this._onIncreaseClick}>+</button></div>
</div> </div>
<div> <div>
<div style={buttonHolderStyle}><button className="btn add-to-cart-button" onClick={this._addToCartClick}>Dodaj na popis za kupovinu</button></div> <div style={buttonHolderStyle}><button className="btn add-to-cart-button" onClick={this._addToCartClick}>Dodaj na popis za kupovinu</button></div>

17
front-ui/app/css/cart.css
View File

@@ -1,13 +1,16 @@
.add-to-cart { .add-to-cart {
padding-top: 20px; padding-top: 20px;
} }
.add-to-cart-count { .add-to-cart-count {
font-size: 20px; font-size: 20px;
margin-top-top: 10px; padding-left: 10px;
width: 50px; padding-right: 10px;
text-align: center; vertical-align: middle;
vertical-align: bottom; /*margin-top-top: 10px;*/
/*width: 50px;*/
/*text-align: center;*/
/*vertical-align: bottom; */
} }
.shopping-cart-icon { .shopping-cart-icon {
@@ -19,7 +22,7 @@
.shopping-cart-notification-text { .shopping-cart-notification-text {
display: inline-block; display: inline-block;
background:red; background:red;
color: white; color: white;
font-size: 9px; font-size: 9px;
position: absolute; position: absolute;
@@ -42,4 +45,4 @@
font-size: 17px; font-size: 17px;
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
} }

2
front-ui/app/css/main.css
View File

@@ -483,7 +483,7 @@ text-decoration: none;
width: 40px; width: 40px;
height: 40px; height: 40px;
padding-bottom: 7px; padding-bottom: 7px;
display: block; /*display: block;*/
border-radius: 1px; border-radius: 1px;
margin-top: 8px; margin-top: 8px;
border: solid #cccccc 1px; border: solid #cccccc 1px;