diff --git a/app/assets/images/rails_admin/magnifier.png b/app/assets/images/rails_admin/magnifier.png old mode 100644 new mode 100755 index cf3d97f75e..f21c29cca9 Binary files a/app/assets/images/rails_admin/magnifier.png and b/app/assets/images/rails_admin/magnifier.png differ diff --git a/app/assets/stylesheets/rails_admin/ra.filtering-multiselect.css b/app/assets/stylesheets/rails_admin/ra.filtering-multiselect.css index 3e5ae4de51..29271bade9 100644 --- a/app/assets/stylesheets/rails_admin/ra.filtering-multiselect.css +++ b/app/assets/stylesheets/rails_admin/ra.filtering-multiselect.css @@ -4,22 +4,28 @@ } .ra-multiselect-search { - background: url(/assets/rails_admin/magnifier.png) no-repeat; - padding-left: 19px; - padding-top: 5px; - font-size: 11px; - font-family: Verdana, Geneva, sans-serif; - padding-bottom: 5px; - background-position: 2px 4px; - border-left: 1px solid #e2e3ea; - border-top: 1px solid #abadb3; - border-bottom: 1px solid #e3e9ef; - border-right: 1px solid #dbdfe6; - width: 120px; - color: #AAA; - margin-right: 20px; + background: transparent url("/assets/rails_admin/magnifier.png") no-repeat scroll 166px center; + border: 1px solid #c1c1c1; + -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.15); + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.15); + -moz-border-radius: 13px; + -webkit-border-radius: 13px; + border-radius: 13px; float: left; -} + font-family: helvetica, arial, sans-serif; + font-size: 13px; + height: 25px; + margin: 0 25px 15px 0; + outline: none; + padding: 0 25px 0 10px; + width: 155px; } + +.ra-multiselect-collection, .ra-multiselect-selection { + -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); } + .ra-multiselect-header .help { float: left; diff --git a/app/assets/stylesheets/rails_admin/theme/activo/style.css b/app/assets/stylesheets/rails_admin/theme/activo/style.css index 39cf33ec43..81026739b8 100644 --- a/app/assets/stylesheets/rails_admin/theme/activo/style.css +++ b/app/assets/stylesheets/rails_admin/theme/activo/style.css @@ -413,29 +413,6 @@ hr { -webkit-border-bottom-right-radius: 13px; border-bottom-right-radius: 13px; } -#wrapper .ra-multiselect-search { - background: transparent url("/assets/rails_admin/theme/activo/images/search-button.png") no-repeat scroll 166px center; - border: 1px solid #c1c1c1; - -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.15); - -moz-border-radius: 13px; - -webkit-border-radius: 13px; - border-radius: 13px; - float: left; - font-family: "MuseoSans500", helvetica, arial, sans-serif; - font-size: 13px; - height: 25px; - margin: 0 25px 15px 0; - outline: none; - padding: 0 25px 0 10px; - width: 155px; } - -#wrapper .ra-multiselect-collection, .ra-multiselect-selection { - -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); } - .flash .message { -moz-border-radius: 3px; -webkit-border-radius: 3px; diff --git a/app/views/rails_admin/main/_form_filtering_multiselect.html.haml b/app/views/rails_admin/main/_form_filtering_multiselect.html.haml index a4339057b4..da09cfec70 100644 --- a/app/views/rails_admin/main/_form_filtering_multiselect.html.haml +++ b/app/views/rails_admin/main/_form_filtering_multiselect.html.haml @@ -39,7 +39,7 @@ sortable: #{field.orderable ? 'true' : 'false'}, regional: { chooseAll: "#{t("admin.new.chose_all")}", - chosen: "#{t("admin.new.chosen", :name => config.abstract_model.model.model_name.human(:count => 2, :default => config.label.pluralize))}", + chosen: "#{t("admin.new.chosen", :name => config.label_plural)}", clearAll: "#{t("admin.new.clear_all")}", selectChoice: "#{t("admin.new.select_choice")}", up: "#{t("admin.new.up")}",