Download as
Browse Code »

Commit 268d49b1aad70fcc0003e6b9bfe0929d346c4416

Authored by Daniela Feitosa
1 parent 03c856bb
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, tests, tests_fixies

Fixed size and alignment of search fields

Showing 2 changed files with 72 additions and 7 deletions   Show diff stats
@@ -161,6 +161,36 @@ ActiveRecord::Schema.define(:version => 20120411132751) do @@ -161,6 +161,36 @@ ActiveRecord::Schema.define(:version => 20120411132751) do
161 161
162 add_index "boxes", ["owner_id", "owner_type"], :name => "index_boxes_on_owner_type_and_owner_id" 162 add_index "boxes", ["owner_id", "owner_type"], :name => "index_boxes_on_owner_type_and_owner_id"
163 163
  164 + create_table "bsc_plugin_contracts", :force => true do |t|
  165 + t.string "client_name"
  166 + t.integer "client_type"
  167 + t.integer "business_type"
  168 + t.string "state"
  169 + t.string "city"
  170 + t.integer "status", :default => 0
  171 + t.integer "number_of_producers", :default => 0
  172 + t.datetime "supply_start"
  173 + t.datetime "supply_end"
  174 + t.text "annotations"
  175 + t.integer "bsc_id"
  176 + t.datetime "created_at"
  177 + t.datetime "updated_at"
  178 + end
  179 +
  180 + create_table "bsc_plugin_contracts_enterprises", :id => false, :force => true do |t|
  181 + t.integer "contract_id"
  182 + t.integer "enterprise_id"
  183 + end
  184 +
  185 + create_table "bsc_plugin_sales", :force => true do |t|
  186 + t.integer "product_id", :null => false
  187 + t.integer "contract_id", :null => false
  188 + t.integer "quantity", :null => false
  189 + t.decimal "price"
  190 + t.datetime "created_at"
  191 + t.datetime "updated_at"
  192 + end
  193 +
164 create_table "categories", :force => true do |t| 194 create_table "categories", :force => true do |t|
165 t.string "name" 195 t.string "name"
166 t.string "slug" 196 t.string "slug"
@@ -254,6 +284,7 @@ ActiveRecord::Schema.define(:version => 20120411132751) do @@ -254,6 +284,7 @@ ActiveRecord::Schema.define(:version => 20120411132751) do
254 t.datetime "created_at" 284 t.datetime "created_at"
255 t.datetime "updated_at" 285 t.datetime "updated_at"
256 t.integer "reports_lower_bound", :default => 0, :null => false 286 t.integer "reports_lower_bound", :default => 0, :null => false
  287 + t.text "send_email_plugin_allow_to"
257 end 288 end
258 289
259 create_table "external_feeds", :force => true do |t| 290 create_table "external_feeds", :force => true do |t|
@@ -277,6 +308,10 @@ ActiveRecord::Schema.define(:version => 20120411132751) do @@ -277,6 +308,10 @@ ActiveRecord::Schema.define(:version => 20120411132751) do
277 t.integer "enterprise_id" 308 t.integer "enterprise_id"
278 end 309 end
279 310
  311 + create_table "foo_plugin_bars", :force => true do |t|
  312 + t.string "name"
  313 + end
  314 +
280 create_table "friendships", :force => true do |t| 315 create_table "friendships", :force => true do |t|
281 t.integer "person_id" 316 t.integer "person_id"
282 t.integer "friend_id" 317 t.integer "friend_id"
@@ -397,7 +432,7 @@ ActiveRecord::Schema.define(:version => 20120411132751) do @@ -397,7 +432,7 @@ ActiveRecord::Schema.define(:version => 20120411132751) do
397 t.string "type" 432 t.string "type"
398 t.string "identifier" 433 t.string "identifier"
399 t.integer "environment_id" 434 t.integer "environment_id"
400 - t.boolean "active", :default => true 435 + t.boolean "active", :default => true
401 t.string "address" 436 t.string "address"
402 t.string "contact_phone" 437 t.string "contact_phone"
403 t.integer "home_page_id" 438 t.integer "home_page_id"
@@ -408,19 +443,26 @@ ActiveRecord::Schema.define(:version => 20120411132751) do @@ -408,19 +443,26 @@ ActiveRecord::Schema.define(:version => 20120411132751) do
408 t.float "lat" 443 t.float "lat"
409 t.float "lng" 444 t.float "lng"
410 t.integer "geocode_precision" 445 t.integer "geocode_precision"
411 - t.boolean "enabled", :default => true  
412 - t.string "nickname", :limit => 16 446 + t.boolean "enabled", :default => true
  447 + t.string "nickname", :limit => 16
413 t.text "custom_header" 448 t.text "custom_header"
414 t.text "custom_footer" 449 t.text "custom_footer"
415 t.string "theme" 450 t.string "theme"
416 - t.boolean "public_profile", :default => true 451 + t.boolean "public_profile", :default => true
417 t.date "birth_date" 452 t.date "birth_date"
418 t.integer "preferred_domain_id" 453 t.integer "preferred_domain_id"
419 t.datetime "updated_at" 454 t.datetime "updated_at"
420 - t.boolean "visible", :default => true 455 + t.boolean "visible", :default => true
421 t.integer "image_id" 456 t.integer "image_id"
422 - t.boolean "validated", :default => true 457 + t.boolean "validated", :default => true
423 t.string "cnpj" 458 t.string "cnpj"
  459 + t.boolean "shopping_cart", :default => true
  460 + t.boolean "shopping_cart_delivery", :default => false
  461 + t.decimal "shopping_cart_delivery_price", :default => 0.0
  462 + t.string "usp_id"
  463 + t.integer "bar_id"
  464 + t.integer "bsc_id"
  465 + t.string "company_name"
424 t.string "national_region_code" 466 t.string "national_region_code"
425 end 467 end
426 468
@@ -484,6 +526,15 @@ ActiveRecord::Schema.define(:version => 20120411132751) do @@ -484,6 +526,15 @@ ActiveRecord::Schema.define(:version => 20120411132751) do
484 t.datetime "updated_at" 526 t.datetime "updated_at"
485 end 527 end
486 528
  529 + create_table "shopping_cart_plugin_purchase_orders", :force => true do |t|
  530 + t.integer "customer_id"
  531 + t.integer "seller_id"
  532 + t.text "data"
  533 + t.integer "status"
  534 + t.datetime "created_at"
  535 + t.datetime "updated_at"
  536 + end
  537 +
487 create_table "taggings", :force => true do |t| 538 create_table "taggings", :force => true do |t|
488 t.integer "tag_id" 539 t.integer "tag_id"
489 t.integer "taggable_id" 540 t.integer "taggable_id"
@@ -511,6 +562,7 @@ ActiveRecord::Schema.define(:version => 20120411132751) do @@ -511,6 +562,7 @@ ActiveRecord::Schema.define(:version => 20120411132751) do
511 t.datetime "created_at" 562 t.datetime "created_at"
512 t.string "target_type" 563 t.string "target_type"
513 t.integer "image_id" 564 t.integer "image_id"
  565 + t.integer "bsc_id"
514 end 566 end
515 567
516 create_table "thumbnails", :force => true do |t| 568 create_table "thumbnails", :force => true do |t|
public/stylesheets/search.css
  Diff comments   View file @268d49b
@@ -668,14 +668,22 @@ li.search-product-item hr { @@ -668,14 +668,22 @@ li.search-product-item hr {
668 668
669 /* Search field and button */ 669 /* Search field and button */
670 670
  671 +.search-field input {
  672 + vertical-align: middle;
  673 +}
671 .search-field .formfield { 674 .search-field .formfield {
672 height: 34px; 675 height: 34px;
673 display: inline-block; 676 display: inline-block;
674 } 677 }
675 .search-field .formfield input { 678 .search-field .formfield input {
676 - height: 35px; 679 + height: 25px;
677 width: 530px; 680 width: 530px;
678 } 681 }
  682 +#public-profile-search .search-field .formfield input {
  683 + height: 25px;
  684 + width: 395px;
  685 +}
  686 +
679 .search-field .formfield { 687 .search-field .formfield {
680 height: 34px; 688 height: 34px;
681 display: inline-block; 689 display: inline-block;
@@ -698,6 +706,10 @@ li.search-product-item hr { @@ -698,6 +706,10 @@ li.search-product-item hr {
698 -o-border-radius: 5px; 706 -o-border-radius: 5px;
699 border-radius: 5px; 707 border-radius: 5px;
700 } 708 }
  709 +#content #public-profile-search form .search-field input.button.submit {
  710 + width: 75px;
  711 +}
  712 +
701 form .search-field input:hover.button.submit { 713 form .search-field input:hover.button.submit {
702 background-color:#444; 714 background-color:#444;
703 } 715 }
@@ -897,6 +909,7 @@ a.search-image-pic { @@ -897,6 +909,7 @@ a.search-image-pic {
897 #search-input { 909 #search-input {
898 font-size: 140%; 910 font-size: 140%;
899 color: #000; 911 color: #000;
  912 + vertical-align: middle;
900 } 913 }
901 #search-input.blur { 914 #search-input.blur {
902 font-size: 140%; 915 font-size: 140%;