tested mobile version, aded viewport tag

This commit is contained in:
Senad Uka
2015-01-29 07:07:08 +01:00
parent 906c29b22f
commit b8caf1a8a7
6 changed files with 23 additions and 16 deletions

View File

@@ -16,7 +16,6 @@ end
gem "sinatra" gem "sinatra"
gem "sinatra-activerecord" gem "sinatra-activerecord"
gem "json" gem "json"
gem 'puma' gem 'puma'

View File

@@ -7,6 +7,7 @@ Dir[File.dirname(__FILE__) + '/models/*.rb'].each {|file| require file }
set :bind, '0.0.0.0' set :bind, '0.0.0.0'
before do before do
content_type :json content_type :json
# TODO: before running to production change this so that only specific # TODO: before running to production change this so that only specific

View File

@@ -10,9 +10,6 @@ def prepare_items_for_mass_display(items)
]) ])
end end
def offset_and_limit_invalid?(offset, limit) def offset_and_limit_invalid?(offset, limit)
offset < 0 or limit <= 0 or limit > 100 offset < 0 or limit <= 0 or limit > 100
end end

View File

@@ -13,24 +13,29 @@ var ItemWithDetailsPage = React.createClass({
return ( return (
<div className="item-with-details row-fluid center"> <div className="item-with-details row-fluid center">
<div className="span3"> <div className="col-md-5">
<h3> {this.state.item.get('name')} </h3>
<div>
<div className='h4'> {this.state.item.get('list_price')} KM</div> <Carousel images={this.state.images}
<div> {this.state.item.get('description')}</div>
</div>
<Carousel images={this.state.images}
selected={this.state.currentImage} selected={this.state.currentImage}
onClickLeft={this.onClickLeft} onClickLeft={this.onClickLeft}
onClickRight={this.onClickRight} onClickRight={this.onClickRight}
onSelectImage={this.onSelectImage} /> onSelectImage={this.onSelectImage} />
</div>
<div className="span4"> </div>
<div className="col-md-7">
<h3> {this.state.item.get('name')} </h3>
<div>
<div className='h4'> {this.state.item.get('list_price')} KM</div>
<div> {this.state.item.get('description')}</div>
</div>
quantitative descriptions quantitative descriptions
</div> </div>
</div> </div>
); );
}, },

View File

@@ -15,11 +15,15 @@
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
} }
.arrow { .arrow {
position: relative; position: relative;
top: -100px; top: -100px;
padding: 10px; padding: 10px;
} }
.carousel-stage { .carousel-stage {
width: 300px; width: 300px;
height: 200px; height: 200px;

View File

@@ -3,6 +3,7 @@
<head> <head>
<link rel='stylesheet' type='text/css' href='ribica.css'> <link rel='stylesheet' type='text/css' href='ribica.css'>
<meta name="fragment" content="!"> <meta name="fragment" content="!">
<meta name="viewport" content="initial-scale=0.9">
</head> </head>
<body> <body>
<!-- <!--