Commit 0c822dbea60ff068327350eb71e1ac273f809529
1 parent
e8e1083e
Exists in
master
and in
29 other branches
Restore css for inputs
Showing
3 changed files
with
10 additions
and
7 deletions
Show diff stats
db/schema.rb
@@ -175,6 +175,8 @@ ActiveRecord::Schema.define(:version => 20111004184104) do | @@ -175,6 +175,8 @@ ActiveRecord::Schema.define(:version => 20111004184104) do | ||
175 | t.integer "children_count", :default => 0 | 175 | t.integer "children_count", :default => 0 |
176 | t.boolean "accept_products", :default => true | 176 | t.boolean "accept_products", :default => true |
177 | t.integer "image_id" | 177 | t.integer "image_id" |
178 | + t.string "acronym" | ||
179 | + t.string "abbreviation" | ||
178 | end | 180 | end |
179 | 181 | ||
180 | create_table "categories_profiles", :id => false, :force => true do |t| | 182 | create_table "categories_profiles", :id => false, :force => true do |t| |
@@ -436,9 +438,9 @@ ActiveRecord::Schema.define(:version => 20111004184104) do | @@ -436,9 +438,9 @@ ActiveRecord::Schema.define(:version => 20111004184104) do | ||
436 | 438 | ||
437 | create_table "roles", :force => true do |t| | 439 | create_table "roles", :force => true do |t| |
438 | t.string "name" | 440 | t.string "name" |
441 | + t.text "permissions" | ||
439 | t.string "key" | 442 | t.string "key" |
440 | t.boolean "system", :default => false | 443 | t.boolean "system", :default => false |
441 | - t.text "permissions" | ||
442 | t.integer "environment_id" | 444 | t.integer "environment_id" |
443 | end | 445 | end |
444 | 446 |
public/stylesheets/application.css
@@ -2454,7 +2454,6 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation | @@ -2454,7 +2454,6 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation | ||
2454 | .formfield input { | 2454 | .formfield input { |
2455 | text-indent: 5px; | 2455 | text-indent: 5px; |
2456 | padding: 2px 0px; | 2456 | padding: 2px 0px; |
2457 | - background: #fff; | ||
2458 | } | 2457 | } |
2459 | .msie5 .formfield input, .msie6 .formfield input { | 2458 | .msie5 .formfield input, .msie6 .formfield input { |
2460 | background-attachment: fixed; | 2459 | background-attachment: fixed; |
public/stylesheets/search.css
@@ -663,11 +663,6 @@ li.search-product-item hr { | @@ -663,11 +663,6 @@ li.search-product-item hr { | ||
663 | background: transparent !important; | 663 | background: transparent !important; |
664 | padding:0 !important; | 664 | padding:0 !important; |
665 | } | 665 | } |
666 | -.formfield input { | ||
667 | - border: 1px solid #231F20; | ||
668 | - height: 28px; | ||
669 | - width: 558px; | ||
670 | -} | ||
671 | .search-field .formfield { | 666 | .search-field .formfield { |
672 | height: 34px; | 667 | height: 34px; |
673 | display: inline-block | 668 | display: inline-block |
@@ -730,3 +725,10 @@ li.search-product-item hr { | @@ -730,3 +725,10 @@ li.search-product-item hr { | ||
730 | .facet-menu a.facet-options-toggle.facet-less-options { | 725 | .facet-menu a.facet-options-toggle.facet-less-options { |
731 | background-position: 0 -32px; | 726 | background-position: 0 -32px; |
732 | } | 727 | } |
728 | +.controller-search .formfield input { | ||
729 | + border: 1px solid #231F20; | ||
730 | + height: 28px; | ||
731 | + width: 558px; | ||
732 | + background: none; | ||
733 | +} | ||
734 | + |