diff --git a/front-api/db/schema.rb b/front-api/db/schema.rb index b3ee2a8..2c52d13 100644 --- a/front-api/db/schema.rb +++ b/front-api/db/schema.rb @@ -126,8 +126,8 @@ ActiveRecord::Schema.define(version: 20150414214540) do t.datetime "updated_at", null: false t.string "tags" t.json "traits" - t.decimal "weight", precision: 5, scale: 3 t.integer "supplier_id" + t.decimal "weight", precision: 5, scale: 3 t.integer "delivery_time_estimation_id" t.integer "brand_id" end @@ -197,9 +197,11 @@ ActiveRecord::Schema.define(version: 20150414214540) do end create_table "sub_categories", force: :cascade do |t| - t.string "name" - t.integer "category_id" - t.integer "order" + t.string "name" + t.integer "category_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "order" end create_table "suppliers", force: :cascade do |t| diff --git a/front-ui/app/components/items/singleItem.js b/front-ui/app/components/items/singleItem.js index 609da0d..f167541 100644 --- a/front-ui/app/components/items/singleItem.js +++ b/front-ui/app/components/items/singleItem.js @@ -29,7 +29,7 @@ var SingleItem = React.createClass({ else { return ( -
+
product image
diff --git a/front-ui/app/components/rootApp.js b/front-ui/app/components/rootApp.js index 319d16f..3e283ed 100644 --- a/front-ui/app/components/rootApp.js +++ b/front-ui/app/components/rootApp.js @@ -43,7 +43,7 @@ var RootApp = React.createClass({ } return ( -
+
diff --git a/front-ui/app/css/main.css b/front-ui/app/css/main.css index 91cf455..8f309f7 100644 --- a/front-ui/app/css/main.css +++ b/front-ui/app/css/main.css @@ -106,9 +106,9 @@ background: none; .productbox{ cursor: pointer; --moz-box-shadow: 1px 4px 25px #000000; --webkit-box-shadow: 1px 4px 25px #000000; -box-shadow: 1px 4px 25px #000000; +-moz-box-shadow: 1px 2px 2px #cccccc; +-webkit-box-shadow: 1px 2px 2px #cccccc; +box-shadow: 1px 2px 2px #cccccc; height: auto; background-color: rgba(255, 255, 255, 0.6); margin-top: 10px;