activeadmin 0.6.6 → 1.0.0.pre1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of activeadmin might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/.gitignore +11 -8
- data/.hound.yml +11 -0
- data/.travis.yml +36 -10
- data/.yardopts +2 -1
- data/CHANGELOG.md +118 -67
- data/CONTRIBUTING.md +96 -73
- data/Gemfile +35 -35
- data/Guardfile +1 -0
- data/LICENSE +1 -1
- data/README.md +98 -0
- data/Rakefile +12 -4
- data/activeadmin.gemspec +21 -24
- data/app/assets/javascripts/active_admin/application.js.coffee +32 -0
- data/app/assets/javascripts/active_admin/base.js.coffee +14 -0
- data/app/assets/javascripts/active_admin/ext/jquery-ui.js.coffee +6 -0
- data/app/assets/javascripts/active_admin/ext/jquery.js.coffee +7 -0
- data/app/assets/javascripts/active_admin/lib/batch_actions.js.coffee +39 -0
- data/app/assets/javascripts/active_admin/{components/jquery.aa.checkbox-toggler.js.coffee → lib/checkbox-toggler.js.coffee} +3 -4
- data/app/assets/javascripts/active_admin/lib/dropdown-menu.js.coffee +101 -0
- data/app/assets/javascripts/active_admin/lib/flash.js.coffee +19 -0
- data/app/assets/javascripts/active_admin/lib/has_many.js.coffee +79 -0
- data/app/assets/javascripts/active_admin/lib/modal_dialog.js.coffee +37 -0
- data/app/assets/javascripts/active_admin/lib/per_page.js.coffee +27 -0
- data/app/assets/javascripts/active_admin/lib/popover.js.coffee +68 -0
- data/app/assets/javascripts/active_admin/{components/jquery.aa.table-checkbox-toggler.js.coffee → lib/table-checkbox-toggler.js.coffee} +2 -3
- data/app/assets/stylesheets/active_admin/{_base.css.scss → _base.scss} +3 -0
- data/app/assets/stylesheets/active_admin/{_forms.css.scss → _forms.scss} +61 -17
- data/app/assets/stylesheets/active_admin/{_header.css.scss → _header.scss} +9 -5
- data/app/assets/stylesheets/active_admin/{_mixins.css.scss → _mixins.scss} +0 -0
- data/app/assets/stylesheets/active_admin/{_typography.css.scss → _typography.scss} +0 -0
- data/app/assets/stylesheets/active_admin/components/_batch_actions.scss +11 -0
- data/app/assets/stylesheets/active_admin/components/_blank_slates.scss +0 -1
- data/app/assets/stylesheets/active_admin/components/_buttons.scss +1 -1
- data/app/assets/stylesheets/active_admin/components/{_comments.css.scss → _comments.scss} +0 -0
- data/app/assets/stylesheets/active_admin/components/{_date_picker.css.scss → _date_picker.scss} +40 -14
- data/app/assets/stylesheets/active_admin/components/_dropdown_menu.scss +5 -4
- data/app/assets/stylesheets/active_admin/components/_flash_messages.scss +37 -0
- data/app/assets/stylesheets/active_admin/components/_modal_dialog.scss +34 -0
- data/app/assets/stylesheets/active_admin/components/_pagination.scss +10 -0
- data/app/assets/stylesheets/active_admin/components/{_popovers.css.scss → _popovers.scss} +2 -3
- data/app/assets/stylesheets/active_admin/components/_status_tags.scss +4 -0
- data/app/assets/stylesheets/active_admin/components/_table_tools.scss +67 -0
- data/app/assets/stylesheets/active_admin/components/{_tables.css.scss → _tables.scss} +4 -2
- data/app/assets/stylesheets/active_admin/components/_tabs.scss +65 -0
- data/app/assets/stylesheets/active_admin/components/_unsupported_browser.scss +16 -0
- data/app/assets/stylesheets/active_admin/mixins/{_all.css.scss → _all.scss} +0 -0
- data/app/assets/stylesheets/active_admin/mixins/{_buttons.css.scss → _buttons.scss} +0 -1
- data/app/assets/stylesheets/active_admin/mixins/_gradients.scss +28 -0
- data/app/assets/stylesheets/active_admin/mixins/{_icons.css.scss → _icons.scss} +1 -2
- data/app/assets/stylesheets/active_admin/mixins/{_reset.css.scss → _reset.scss} +0 -0
- data/app/assets/stylesheets/active_admin/mixins/_rounded.scss +22 -0
- data/app/assets/stylesheets/active_admin/mixins/{_sections.css.scss → _sections.scss} +8 -2
- data/app/assets/stylesheets/active_admin/mixins/{_shadows.css.scss → _shadows.scss} +0 -7
- data/app/assets/stylesheets/active_admin/mixins/_utilities.scss +0 -9
- data/app/assets/stylesheets/active_admin/mixins/{_variables.css.scss → _variables.scss} +10 -8
- data/app/assets/stylesheets/active_admin/{print.css.scss → print.scss} +4 -0
- data/app/assets/stylesheets/active_admin/structure/_main_structure.scss +5 -2
- data/app/assets/stylesheets/active_admin/structure/_title_bar.scss +11 -9
- data/app/views/active_admin/devise/confirmations/new.html.erb +15 -0
- data/app/views/active_admin/devise/mailer/reset_password_instructions.html.erb +1 -1
- data/app/views/active_admin/devise/mailer/unlock_instructions.html.erb +1 -1
- data/app/views/active_admin/devise/passwords/edit.html.erb +9 -10
- data/app/views/active_admin/devise/passwords/new.html.erb +5 -4
- data/app/views/active_admin/devise/registrations/new.html.erb +22 -0
- data/app/views/active_admin/devise/sessions/new.html.erb +9 -7
- data/app/views/active_admin/devise/shared/_links.erb +1 -1
- data/app/views/active_admin/devise/unlocks/new.html.erb +5 -4
- data/app/views/layouts/active_admin_logged_out.html.erb +3 -5
- data/config/locales/ar.yml +120 -0
- data/config/locales/bg.yml +26 -6
- data/config/locales/bs.yml +122 -0
- data/config/locales/ca.yml +10 -1
- data/config/locales/cs.yml +7 -2
- data/config/locales/da.yml +7 -3
- data/config/locales/de-CH.yml +14 -31
- data/config/locales/de.yml +33 -33
- data/config/locales/el.yml +28 -2
- data/config/locales/en-GB.yml +12 -4
- data/config/locales/en.yml +29 -3
- data/config/locales/{es_MX.yml → es-MX.yml} +9 -24
- data/config/locales/es.yml +32 -25
- data/config/locales/fa.yml +120 -0
- data/config/locales/fi.yml +113 -0
- data/config/locales/fr.yml +21 -11
- data/config/locales/he.yml +7 -3
- data/config/locales/hr.yml +42 -11
- data/config/locales/hu.yml +10 -3
- data/config/locales/it.yml +31 -3
- data/config/locales/ja.yml +8 -3
- data/config/locales/ko.yml +7 -1
- data/config/locales/lt.yml +42 -11
- data/config/locales/lv.yml +7 -3
- data/config/locales/{no-NB.yml → nb.yml} +46 -15
- data/config/locales/nl.yml +36 -5
- data/config/locales/pl.yml +13 -8
- data/config/locales/pt-BR.yml +37 -5
- data/config/locales/pt-PT.yml +8 -4
- data/config/locales/ro.yml +7 -3
- data/config/locales/ru.yml +26 -5
- data/config/locales/sv-SE.yml +9 -5
- data/config/locales/tr.yml +10 -3
- data/config/locales/uk.yml +36 -12
- data/config/locales/vi.yml +7 -3
- data/config/locales/zh-CN.yml +26 -10
- data/config/locales/zh-TW.yml +19 -13
- data/docs/0-installation.md +65 -29
- data/docs/1-general-configuration.md +92 -81
- data/docs/10-custom-pages.md +68 -68
- data/docs/11-decorators.md +48 -59
- data/docs/12-arbre-components.md +80 -74
- data/docs/13-authorization-adapter.md +128 -107
- data/docs/14-gotchas.md +92 -0
- data/docs/2-resource-customization.md +293 -178
- data/docs/3-index-pages.md +160 -86
- data/docs/3-index-pages/custom-index.md +31 -0
- data/docs/3-index-pages/index-as-block.md +14 -9
- data/docs/3-index-pages/index-as-blog.md +41 -31
- data/docs/3-index-pages/index-as-grid.md +16 -8
- data/docs/3-index-pages/index-as-table.md +129 -52
- data/docs/4-csv-format.md +31 -24
- data/docs/5-forms.md +133 -56
- data/docs/6-show-pages.md +89 -27
- data/docs/7-sidebars.md +48 -27
- data/docs/8-custom-actions.md +98 -77
- data/docs/9-batch-actions.md +210 -146
- data/docs/README.md +24 -0
- data/features/action_item.feature +3 -3
- data/features/authorization_pundit.feature +37 -0
- data/features/breadcrumb.feature +48 -0
- data/features/comments/commenting.feature +56 -13
- data/features/development_reloading.feature +17 -30
- data/features/edit_page.feature +12 -1
- data/features/favicon.feature +3 -3
- data/features/i18n.feature +5 -4
- data/features/index/batch_actions.feature +41 -0
- data/features/index/filters.feature +67 -0
- data/features/index/format_as_csv.feature +90 -4
- data/features/index/formats.feature +27 -0
- data/features/index/index_as_blog.feature +4 -4
- data/features/index/index_as_table.feature +102 -6
- data/features/index/index_blank_slate.feature +22 -0
- data/features/index/index_scope_to.feature +16 -16
- data/features/index/page_title.feature +11 -0
- data/features/index/pagination.feature +1 -1
- data/features/index/switch_index_view.feature +14 -14
- data/features/new_page.feature +13 -2
- data/features/registering_pages.feature +1 -1
- data/features/renamed_resource.feature +32 -0
- data/features/show/page_title.feature +11 -0
- data/features/show/tabs.feature +27 -0
- data/features/sidebar_sections.feature +12 -0
- data/features/site_title.feature +2 -2
- data/features/specifying_actions.feature +3 -3
- data/features/step_definitions/action_item_steps.rb +2 -2
- data/features/step_definitions/action_link_steps.rb +14 -1
- data/features/step_definitions/additional_web_steps.rb +19 -20
- data/features/step_definitions/asset_steps.rb +3 -3
- data/features/step_definitions/attribute_steps.rb +8 -3
- data/features/step_definitions/batch_action_steps.rb +26 -9
- data/features/step_definitions/blog_steps.rb +3 -0
- data/features/step_definitions/breadcrumb_steps.rb +1 -1
- data/features/step_definitions/comment_steps.rb +1 -1
- data/features/step_definitions/configuration_steps.rb +9 -2
- data/features/step_definitions/dashboard_steps.rb +2 -2
- data/features/step_definitions/factory_steps.rb +9 -8
- data/features/step_definitions/filter_steps.rb +25 -3
- data/features/step_definitions/flash_steps.rb +3 -3
- data/features/step_definitions/format_steps.rb +18 -18
- data/features/step_definitions/index_scope_steps.rb +5 -5
- data/features/step_definitions/layout_steps.rb +1 -1
- data/features/step_definitions/member_link_steps.rb +2 -2
- data/features/step_definitions/menu_steps.rb +3 -3
- data/features/step_definitions/pagination_steps.rb +2 -3
- data/features/step_definitions/sidebar_steps.rb +8 -3
- data/features/step_definitions/site_title_steps.rb +6 -4
- data/features/step_definitions/symbol_leak_steps.rb +3 -0
- data/features/step_definitions/tab_steps.rb +5 -0
- data/features/step_definitions/table_steps.rb +4 -4
- data/features/step_definitions/user_steps.rb +10 -7
- data/features/step_definitions/web_steps.rb +14 -11
- data/features/sti_resource.feature +6 -2
- data/features/strong_parameters.feature +73 -0
- data/features/support/env.rb +34 -9
- data/features/support/paths.rb +14 -6
- data/features/support/selectors.rb +1 -1
- data/features/symbol_leak.feature +35 -0
- data/features/users/resetting_password.feature +5 -6
- data/lib/active_admin.rb +26 -25
- data/lib/active_admin/abstract_view_factory.rb +7 -17
- data/lib/active_admin/application.rb +72 -59
- data/lib/active_admin/asset_registration.rb +2 -2
- data/lib/active_admin/authorization_adapter.rb +2 -2
- data/lib/active_admin/base_controller.rb +2 -3
- data/lib/active_admin/base_controller/authorization.rb +13 -31
- data/lib/active_admin/batch_actions.rb +1 -1
- data/lib/active_admin/batch_actions/controller.rb +24 -8
- data/lib/active_admin/batch_actions/resource_extension.rb +47 -18
- data/lib/active_admin/batch_actions/views/batch_action_form.rb +7 -4
- data/lib/active_admin/batch_actions/views/batch_action_popover.rb +3 -3
- data/lib/active_admin/batch_actions/views/batch_action_selector.rb +8 -17
- data/lib/active_admin/batch_actions/views/selection_cells.rb +4 -4
- data/lib/active_admin/callbacks.rb +25 -24
- data/lib/active_admin/cancan_adapter.rb +7 -11
- data/lib/active_admin/csv_builder.rb +92 -15
- data/lib/active_admin/dependency.rb +93 -0
- data/lib/active_admin/deprecation.rb +6 -7
- data/lib/active_admin/devise.rb +28 -18
- data/lib/active_admin/dsl.rb +18 -11
- data/lib/active_admin/engine.rb +10 -8
- data/lib/active_admin/error.rb +62 -0
- data/lib/active_admin/filters/dsl.rb +2 -2
- data/lib/active_admin/filters/forms.rb +17 -27
- data/lib/active_admin/filters/formtastic_addons.rb +49 -15
- data/lib/active_admin/filters/resource_extension.rb +43 -34
- data/lib/active_admin/form_builder.rb +93 -154
- data/lib/active_admin/helpers/collection.rb +7 -13
- data/lib/active_admin/helpers/i18n.rb +7 -0
- data/lib/active_admin/helpers/optional_display.rb +5 -5
- data/lib/active_admin/helpers/routes/url_helpers.rb +15 -0
- data/lib/active_admin/helpers/scope_chain.rb +1 -1
- data/lib/active_admin/helpers/settings.rb +16 -9
- data/lib/active_admin/iconic.rb +17 -15
- data/lib/active_admin/iconic/icons.rb +136 -136
- data/lib/active_admin/inputs.rb +11 -7
- data/lib/active_admin/inputs/datepicker_input.rb +12 -3
- data/lib/active_admin/inputs/filters/base.rb +42 -0
- data/lib/active_admin/inputs/filters/base/search_method_select.rb +75 -0
- data/lib/active_admin/inputs/filters/boolean_input.rb +24 -0
- data/lib/active_admin/inputs/filters/check_boxes_input.rb +50 -0
- data/lib/active_admin/inputs/filters/date_range_input.rb +36 -0
- data/lib/active_admin/inputs/filters/numeric_input.rb +12 -0
- data/lib/active_admin/inputs/filters/select_input.rb +54 -0
- data/lib/active_admin/inputs/filters/string_input.rb +26 -0
- data/lib/active_admin/menu.rb +6 -4
- data/lib/active_admin/menu_collection.rb +1 -4
- data/lib/active_admin/namespace.rb +55 -29
- data/lib/active_admin/order_clause.rb +26 -0
- data/lib/active_admin/orm/active_record.rb +5 -0
- data/lib/active_admin/orm/active_record/comments.rb +81 -0
- data/lib/active_admin/orm/active_record/comments/comment.rb +45 -0
- data/lib/active_admin/{comments → orm/active_record/comments}/namespace_helper.rb +2 -2
- data/lib/active_admin/{comments → orm/active_record/comments}/resource_helper.rb +1 -1
- data/lib/active_admin/{comments → orm/active_record/comments}/show_page_helper.rb +0 -0
- data/lib/active_admin/orm/active_record/comments/views.rb +2 -0
- data/lib/active_admin/{comments → orm/active_record/comments}/views/active_admin_comments.rb +16 -14
- data/lib/active_admin/orm/mongoid.rb +1 -0
- data/lib/active_admin/orm/mongoid/.gitkeep +0 -0
- data/lib/active_admin/page.rb +7 -3
- data/lib/active_admin/page_dsl.rb +1 -1
- data/lib/active_admin/page_presenter.rb +2 -2
- data/lib/active_admin/pundit_adapter.rb +68 -0
- data/lib/active_admin/resource.rb +16 -17
- data/lib/active_admin/resource/action_items.rb +23 -18
- data/lib/active_admin/resource/belongs_to.rb +7 -3
- data/lib/active_admin/resource/controllers.rb +1 -0
- data/lib/active_admin/resource/includes.rb +12 -0
- data/lib/active_admin/resource/menu.rb +5 -5
- data/lib/active_admin/resource/naming.rb +27 -43
- data/lib/active_admin/resource/page_presenters.rb +1 -1
- data/lib/active_admin/resource/routes.rb +27 -11
- data/lib/active_admin/resource/scope_to.rb +7 -7
- data/lib/active_admin/resource/sidebars.rb +1 -0
- data/lib/active_admin/resource_controller.rb +6 -7
- data/lib/active_admin/resource_controller/data_access.rb +101 -93
- data/lib/active_admin/resource_controller/decorators.rb +91 -9
- data/lib/active_admin/resource_controller/streaming.rb +37 -0
- data/lib/active_admin/resource_dsl.rb +53 -10
- data/lib/active_admin/router.rb +7 -7
- data/lib/active_admin/scope.rb +6 -6
- data/lib/active_admin/sidebar_section.rb +10 -2
- data/lib/active_admin/version.rb +1 -1
- data/lib/active_admin/view_factory.rb +17 -17
- data/lib/active_admin/view_helpers.rb +0 -1
- data/lib/active_admin/view_helpers/auto_link_helper.rb +23 -12
- data/lib/active_admin/view_helpers/breadcrumb_helper.rb +4 -3
- data/lib/active_admin/view_helpers/display_helper.rb +30 -15
- data/lib/active_admin/view_helpers/download_format_links_helper.rb +21 -25
- data/lib/active_admin/view_helpers/fields_for.rb +4 -4
- data/lib/active_admin/view_helpers/flash_helper.rb +4 -3
- data/lib/active_admin/view_helpers/form_helper.rb +5 -9
- data/lib/active_admin/view_helpers/method_or_proc_helper.rb +6 -6
- data/lib/active_admin/views/action_items.rb +2 -2
- data/lib/active_admin/views/components/action_list_popover.rb +1 -1
- data/lib/active_admin/views/components/active_admin_form.rb +123 -0
- data/lib/active_admin/views/components/attributes_table.rb +63 -21
- data/lib/active_admin/views/components/blank_slate.rb +1 -1
- data/lib/active_admin/views/components/columns.rb +13 -7
- data/lib/active_admin/views/components/dropdown_menu.rb +6 -6
- data/lib/active_admin/views/components/index_list.rb +7 -7
- data/lib/active_admin/views/components/paginated_collection.rb +38 -20
- data/lib/active_admin/views/components/panel.rb +8 -2
- data/lib/active_admin/views/components/popover.rb +1 -1
- data/lib/active_admin/views/components/scopes.rb +5 -4
- data/lib/active_admin/views/components/sidebar_section.rb +3 -2
- data/lib/active_admin/views/components/site_title.rb +2 -2
- data/lib/active_admin/views/components/status_tag.rb +34 -11
- data/lib/active_admin/views/components/table_for.rb +90 -45
- data/lib/active_admin/views/components/tabs.rb +28 -0
- data/lib/active_admin/views/components/unsupported_browser.rb +11 -0
- data/lib/active_admin/views/footer.rb +3 -3
- data/lib/active_admin/views/header.rb +3 -3
- data/lib/active_admin/views/index_as_block.rb +10 -10
- data/lib/active_admin/views/index_as_blog.rb +45 -39
- data/lib/active_admin/views/index_as_grid.rb +14 -10
- data/lib/active_admin/views/index_as_table.rb +242 -129
- data/lib/active_admin/views/pages/base.rb +22 -18
- data/lib/active_admin/views/pages/form.rb +21 -11
- data/lib/active_admin/views/pages/index.rb +40 -35
- data/lib/active_admin/views/pages/layout.rb +1 -1
- data/lib/active_admin/views/pages/show.rb +4 -4
- data/lib/active_admin/views/tabbed_navigation.rb +7 -3
- data/lib/active_admin/views/title_bar.rb +10 -8
- data/lib/generators/active_admin/assets/assets_generator.rb +3 -28
- data/lib/generators/active_admin/assets/templates/{3.1/active_admin.css.scss → active_admin.css.scss} +0 -0
- data/lib/generators/active_admin/assets/templates/active_admin.js.coffee +1 -0
- data/lib/generators/active_admin/devise/devise_generator.rb +24 -26
- data/lib/generators/active_admin/install/install_generator.rb +8 -9
- data/lib/generators/active_admin/install/templates/active_admin.rb.erb +28 -26
- data/lib/generators/active_admin/install/templates/admin_user.rb.erb +12 -2
- data/lib/generators/active_admin/install/templates/dashboard.rb +4 -4
- data/lib/generators/active_admin/install/templates/migrations/create_active_admin_comments.rb +3 -3
- data/lib/generators/active_admin/page/USAGE +8 -0
- data/lib/generators/active_admin/page/page_generator.rb +12 -0
- data/lib/generators/active_admin/page/templates/page.rb +5 -0
- data/lib/generators/active_admin/resource/resource_generator.rb +3 -5
- data/lib/generators/active_admin/resource/templates/admin.rb +15 -0
- data/lib/ransack_ext.rb +12 -0
- data/script/local +2 -2
- data/script/travis_cache +107 -0
- data/spec/javascripts/coffeescripts/jquery.aa.flash.js.coffee +25 -0
- data/spec/javascripts/fixtures/flashes.html +2 -0
- data/spec/rails_helper.rb +154 -0
- data/spec/{integration → requests}/default_namespace_spec.rb +6 -6
- data/spec/{integration → requests}/javascript_spec.rb +5 -5
- data/spec/requests/memory_spec.rb +23 -0
- data/spec/requests/stylesheets_spec.rb +18 -0
- data/spec/spec_helper.rb +12 -173
- data/spec/support/detect_rails_version.rb +9 -17
- data/spec/support/rails_template.rb +64 -35
- data/spec/support/rails_template_with_data.rb +14 -14
- data/spec/support/templates/admin/stores.rb +5 -1
- data/spec/support/templates/policies/active_admin/comment_policy.rb +9 -0
- data/spec/support/templates/policies/active_admin/page_policy.rb +18 -0
- data/spec/support/templates/policies/admin_user_policy.rb +11 -0
- data/spec/support/templates/policies/application_policy.rb +45 -0
- data/spec/support/templates/policies/category_policy.rb +7 -0
- data/spec/support/templates/policies/post_policy.rb +15 -0
- data/spec/support/templates/policies/store_policy.rb +11 -0
- data/spec/support/templates/policies/user_policy.rb +11 -0
- data/spec/support/templates/post_decorator.rb +4 -46
- data/spec/unit/abstract_view_factory_spec.rb +16 -16
- data/spec/unit/action_builder_spec.rb +24 -18
- data/spec/unit/active_admin_spec.rb +2 -2
- data/spec/unit/application_spec.rb +33 -34
- data/spec/unit/asset_registration_spec.rb +25 -29
- data/spec/unit/authorization/authorization_adapter_spec.rb +10 -10
- data/spec/unit/authorization/controller_authorization_spec.rb +11 -11
- data/spec/unit/authorization/index_overriding_spec.rb +22 -0
- data/spec/unit/auto_link_spec.rb +43 -13
- data/spec/unit/batch_actions/resource_spec.rb +15 -14
- data/spec/unit/batch_actions/settings_spec.rb +18 -18
- data/spec/unit/belongs_to_spec.rb +28 -19
- data/spec/unit/cancan_adapter_spec.rb +8 -8
- data/spec/unit/comments_spec.rb +99 -39
- data/spec/unit/component_spec.rb +3 -3
- data/spec/unit/config_shared_examples.rb +10 -10
- data/spec/unit/controller_filters_spec.rb +23 -16
- data/spec/unit/csv_builder_spec.rb +165 -24
- data/spec/unit/dependency_spec.rb +135 -0
- data/spec/unit/devise_spec.rb +17 -37
- data/spec/unit/dsl_spec.rb +70 -9
- data/spec/unit/event_spec.rb +11 -11
- data/spec/unit/filters/filter_form_builder_spec.rb +207 -148
- data/spec/unit/filters/resource_spec.rb +60 -26
- data/spec/unit/form_builder_spec.rb +419 -145
- data/spec/unit/generators/install_spec.rb +23 -0
- data/spec/unit/helpers/collection_spec.rb +18 -18
- data/spec/unit/helpers/scope_chain_spec.rb +6 -6
- data/spec/unit/helpers/settings_spec.rb +4 -4
- data/spec/unit/i18n_spec.rb +12 -0
- data/spec/unit/menu_collection_spec.rb +14 -14
- data/spec/unit/menu_item_spec.rb +42 -42
- data/spec/unit/menu_spec.rb +20 -20
- data/spec/unit/namespace/authorization_spec.rb +8 -8
- data/spec/unit/namespace/register_page_spec.rb +11 -11
- data/spec/unit/namespace/register_resource_spec.rb +28 -30
- data/spec/unit/namespace_spec.rb +20 -20
- data/spec/unit/order_clause_spec.rb +81 -0
- data/spec/unit/page_controller_spec.rb +1 -1
- data/spec/unit/page_spec.rb +18 -12
- data/spec/unit/pretty_format_spec.rb +42 -14
- data/spec/unit/pundit_adapter_spec.rb +98 -0
- data/spec/unit/resource/action_items_spec.rb +15 -12
- data/spec/unit/resource/includes_spec.rb +21 -0
- data/spec/unit/resource/menu_spec.rb +1 -1
- data/spec/unit/resource/naming_spec.rb +35 -21
- data/spec/unit/resource/page_presenters_spec.rb +8 -8
- data/spec/unit/resource/pagination_spec.rb +6 -6
- data/spec/unit/resource/routes_spec.rb +10 -10
- data/spec/unit/resource/scopes_spec.rb +14 -7
- data/spec/unit/resource/sidebars_spec.rb +6 -6
- data/spec/unit/resource_collection_spec.rb +31 -38
- data/spec/unit/resource_controller/data_access_spec.rb +96 -30
- data/spec/unit/resource_controller/decorators_spec.rb +83 -0
- data/spec/unit/resource_controller/sidebars_spec.rb +7 -8
- data/spec/unit/resource_controller_spec.rb +73 -70
- data/spec/unit/resource_registration_spec.rb +12 -12
- data/spec/unit/resource_spec.rb +77 -42
- data/spec/unit/routing_spec.rb +39 -31
- data/spec/unit/scope_spec.rb +112 -30
- data/spec/unit/settings_spec.rb +51 -21
- data/spec/unit/view_factory_spec.rb +2 -3
- data/spec/unit/view_helpers/breadcrumbs_spec.rb +71 -60
- data/spec/unit/view_helpers/display_name_spec.rb +49 -21
- data/spec/unit/view_helpers/download_format_links_helper_spec.rb +5 -5
- data/spec/unit/view_helpers/fields_for_spec.rb +18 -18
- data/spec/unit/view_helpers/flash_helper_spec.rb +25 -0
- data/spec/unit/view_helpers/form_helper_spec.rb +10 -23
- data/spec/unit/view_helpers/method_or_proc_helper_spec.rb +64 -22
- data/spec/unit/views/components/action_list_popover_spec.rb +16 -6
- data/spec/unit/views/components/attributes_table_spec.rb +171 -30
- data/spec/unit/views/components/batch_action_popover_spec.rb +20 -6
- data/spec/unit/views/components/blank_slate_spec.rb +14 -4
- data/spec/unit/views/components/columns_spec.rb +52 -22
- data/spec/unit/views/components/index_list_spec.rb +11 -8
- data/spec/unit/views/components/index_table_for_spec.rb +46 -0
- data/spec/unit/views/components/paginated_collection_spec.rb +79 -90
- data/spec/unit/views/components/panel_spec.rb +32 -21
- data/spec/unit/views/components/popover_spec.rb +7 -7
- data/spec/unit/views/components/sidebar_section_spec.rb +18 -8
- data/spec/unit/views/components/site_title_spec.rb +26 -26
- data/spec/unit/views/components/status_tag_spec.rb +178 -38
- data/spec/unit/views/components/table_for_spec.rb +237 -35
- data/spec/unit/views/components/tabs_spec.rb +39 -0
- data/spec/unit/views/components/unsupported_browser_spec.rb +47 -0
- data/spec/unit/views/pages/form_spec.rb +17 -10
- data/spec/unit/views/pages/index_spec.rb +60 -0
- data/spec/unit/views/pages/layout_spec.rb +17 -21
- data/spec/unit/views/pages/show_spec.rb +18 -6
- data/spec/unit/views/tabbed_navigation_spec.rb +61 -52
- data/tasks/docs.rake +9 -11
- data/tasks/parallel_tests.rake +8 -2
- data/tasks/test.rake +13 -9
- data/tasks/yard.rake +7 -4
- metadata +219 -163
- data/.document +0 -5
- data/README.rdoc +0 -88
- data/app/assets/images/active_admin/admin_notes_icon.png +0 -0
- data/app/assets/images/active_admin/datepicker/datepicker-header-bg.png +0 -0
- data/app/assets/images/active_admin/datepicker/datepicker-next-link-icon.png +0 -0
- data/app/assets/images/active_admin/datepicker/datepicker-nipple.png +0 -0
- data/app/assets/images/active_admin/datepicker/datepicker-prev-link-icon.png +0 -0
- data/app/assets/images/active_admin/index_list_icons/block_icon.svg +0 -10
- data/app/assets/images/active_admin/index_list_icons/blog_icon.svg +0 -4
- data/app/assets/images/active_admin/index_list_icons/grid_icon.svg +0 -13
- data/app/assets/images/active_admin/index_list_icons/table_icon.svg +0 -3
- data/app/assets/images/active_admin/loading.gif +0 -0
- data/app/assets/javascripts/active_admin/application.js +0 -3
- data/app/assets/javascripts/active_admin/base.js +0 -5
- data/app/assets/javascripts/active_admin/components/jquery.aa.dropdown-menu.js.coffee +0 -105
- data/app/assets/javascripts/active_admin/components/jquery.aa.popover.js.coffee +0 -97
- data/app/assets/javascripts/active_admin/lib/namespace.js.coffee +0 -4
- data/app/assets/javascripts/active_admin/pages/application.js.coffee +0 -21
- data/app/assets/javascripts/active_admin/pages/batch_actions.js.coffee +0 -26
- data/app/assets/stylesheets/active_admin/components/_batch_actions.css.scss +0 -11
- data/app/assets/stylesheets/active_admin/components/_flash_messages.css.scss +0 -41
- data/app/assets/stylesheets/active_admin/components/_table_tools.css.scss +0 -95
- data/app/assets/stylesheets/active_admin/mixins/_gradients.css.scss +0 -38
- data/app/assets/stylesheets/active_admin/mixins/_rounded.css.scss +0 -43
- data/app/views/active_admin/dashboard/index.html.arb +0 -1
- data/app/views/active_admin/resource/index.csv.erb +0 -23
- data/docs/3-index-pages/create-an-index.md +0 -29
- data/lib/active_admin/comments.rb +0 -83
- data/lib/active_admin/comments/comment.rb +0 -42
- data/lib/active_admin/comments/views.rb +0 -2
- data/lib/active_admin/dependency_checker.rb +0 -46
- data/lib/active_admin/inputs/filter_base.rb +0 -33
- data/lib/active_admin/inputs/filter_base/search_method_select.rb +0 -73
- data/lib/active_admin/inputs/filter_boolean_input.rb +0 -36
- data/lib/active_admin/inputs/filter_check_boxes_input.rb +0 -40
- data/lib/active_admin/inputs/filter_date_range_input.rb +0 -34
- data/lib/active_admin/inputs/filter_numeric_input.rb +0 -10
- data/lib/active_admin/inputs/filter_select_input.rb +0 -49
- data/lib/active_admin/inputs/filter_string_input.rb +0 -24
- data/lib/active_admin/reloader.rb +0 -130
- data/lib/active_admin/resource_controller/actions.rb +0 -81
- data/lib/active_admin/sass/active_admin.scss +0 -3
- data/lib/active_admin/sass/css_loader.rb +0 -16
- data/lib/active_admin/sass/helpers.rb +0 -45
- data/lib/active_admin/view_helpers/assigns_with_indifferent_access_helper.rb +0 -7
- data/lib/active_admin/views/dashboard_section_renderer.rb +0 -19
- data/lib/active_admin/views/pages/dashboard.rb +0 -62
- data/lib/generators/active_admin/assets/templates/3.0/active_admin.js +0 -1
- data/lib/generators/active_admin/assets/templates/3.1/active_admin.js +0 -1
- data/lib/meta_search_ext.rb +0 -10
- data/spec/integration/memory_spec.rb +0 -29
- data/spec/integration/stylesheets_spec.rb +0 -41
- data/spec/javascripts/compiled/jquery.aa.checkbox-toggler-spec.js +0 -60
- data/spec/javascripts/compiled/jquery.aa.popover-spec.js +0 -106
- data/spec/javascripts/compiled/jquery.aa.table-checkbox-toggler-spec.js +0 -37
- data/spec/javascripts/helpers/vendor/jasmine-fixture-0.0.5.js +0 -108
- data/spec/javascripts/helpers/vendor/jasmine-jquery.js +0 -288
- data/spec/javascripts/helpers/vendor/sinon-1.2.0.js +0 -2915
- data/spec/javascripts/support/jquery-ui-1.8.16.custom.min.js +0 -34
- data/spec/javascripts/support/jquery.min.js +0 -4
- data/spec/spec_helper_without_rails.rb +0 -11
- data/spec/unit/generators/install_rails_3_1_spec.rb +0 -16
- data/spec/unit/rails_spec.rb +0 -43
- data/spec/unit/reloader_spec.rb +0 -124
- data/spec/unit/sass/helpers_spec.rb +0 -47
- data/tasks/js.rake +0 -32
|
@@ -78,17 +78,16 @@
|
|
|
78
78
|
li {
|
|
79
79
|
display: block;
|
|
80
80
|
border-bottom: solid 1px #ebebeb;
|
|
81
|
-
|
|
81
|
+
box-sizing: border-box;
|
|
82
82
|
|
|
83
83
|
a {
|
|
84
84
|
display: block;
|
|
85
|
-
|
|
85
|
+
box-sizing: padding-box;
|
|
86
86
|
font-size: 0.95em;
|
|
87
87
|
font-weight: bold;
|
|
88
88
|
padding: 7px 16px 5px;
|
|
89
89
|
text-decoration: none;
|
|
90
90
|
text-align: center;
|
|
91
|
-
-webkit-font-smoothing: antialiased;
|
|
92
91
|
|
|
93
92
|
&:hover {
|
|
94
93
|
@include highlight-gradient;
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
.table_tools {
|
|
2
|
+
@include clearfix;
|
|
3
|
+
margin-bottom: 16px;
|
|
4
|
+
}
|
|
5
|
+
|
|
6
|
+
.table_tools .dropdown_menu {
|
|
7
|
+
float: left;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
a.table_tools_button, .table_tools .dropdown_menu_button {
|
|
11
|
+
@include light-button;
|
|
12
|
+
@include gradient(#FFFFFF, #F0F0F0);
|
|
13
|
+
@include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
|
|
14
|
+
font-size: 0.9em;
|
|
15
|
+
padding: 4px 14px 4px;
|
|
16
|
+
margin: 0;
|
|
17
|
+
|
|
18
|
+
&:not(.disabled) {
|
|
19
|
+
&:hover {
|
|
20
|
+
@include gradient(#FFFFFF, #F6F6F6);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
&:active {
|
|
24
|
+
@include border-colors(#d7d7d7, #c8c8c8, #c3c3c3);
|
|
25
|
+
box-shadow: 0 1px 1px 0 rgba(0,0,0,0.17) inset;
|
|
26
|
+
@include gradient(#FFFFFF, #E8E8E8);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
.table_tools_segmented_control {
|
|
32
|
+
list-style-type: none;
|
|
33
|
+
padding: 0;
|
|
34
|
+
margin: 0;
|
|
35
|
+
|
|
36
|
+
li {
|
|
37
|
+
float: left;
|
|
38
|
+
|
|
39
|
+
a {
|
|
40
|
+
border-width: 1px .5px 1px .5px;
|
|
41
|
+
border-radius: 0;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
&:first-child a {
|
|
45
|
+
border-left-width: 1px;
|
|
46
|
+
border-top-left-radius: 12px;
|
|
47
|
+
border-bottom-left-radius: 12px;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
&:last-child a {
|
|
51
|
+
border-right-width: 1px;
|
|
52
|
+
border-top-right-radius: 12px;
|
|
53
|
+
border-bottom-right-radius: 12px;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
&.selected a {
|
|
57
|
+
@include gradient(#F0F0F0, #FDFDFD);
|
|
58
|
+
box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1) inset;
|
|
59
|
+
cursor: default;
|
|
60
|
+
|
|
61
|
+
&:hover {
|
|
62
|
+
@include gradient(#F0F0F0, #FDFDFD);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
}
|
|
67
|
+
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
//= depend_on_asset "active_admin/orderable.png"
|
|
1
2
|
// ----------------------------------- Tables
|
|
2
3
|
|
|
3
4
|
table tr {
|
|
@@ -26,11 +27,10 @@ table.index_table {
|
|
|
26
27
|
text-decoration: none;
|
|
27
28
|
display: block;
|
|
28
29
|
white-space: nowrap;
|
|
29
|
-
-webkit-font-smoothing: antialiased;
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
&.sortable a {
|
|
33
|
-
background: url(
|
|
33
|
+
background: image-url('active_admin/orderable.png') no-repeat 0 4px; padding-left: 13px;
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
&.sorted-asc a { background-position: 0 -27px; }
|
|
@@ -80,6 +80,8 @@ table.index_table {
|
|
|
80
80
|
.attributes_table { overflow: hidden; }
|
|
81
81
|
|
|
82
82
|
.attributes_table table {
|
|
83
|
+
col.even { background: $table-stripe-color; }
|
|
84
|
+
col.odd { background: darken($table-stripe-color, 3%); }
|
|
83
85
|
th, td {
|
|
84
86
|
padding: 8px $cell-horizontal-padding 6px $cell-horizontal-padding;
|
|
85
87
|
vertical-align: top;
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
.ui-tabs-nav {
|
|
2
|
+
list-style: none;
|
|
3
|
+
display: block;
|
|
4
|
+
width: auto;
|
|
5
|
+
margin-bottom: -12px;
|
|
6
|
+
padding-left: 0;
|
|
7
|
+
overflow: auto;
|
|
8
|
+
margin-left: 15px;
|
|
9
|
+
|
|
10
|
+
li {
|
|
11
|
+
display: block;
|
|
12
|
+
position: relative;
|
|
13
|
+
margin: 0;
|
|
14
|
+
padding: 0;
|
|
15
|
+
float: left;
|
|
16
|
+
|
|
17
|
+
&:first-child a {
|
|
18
|
+
border-left-width: 1px;
|
|
19
|
+
border-top-left-radius: 12px;
|
|
20
|
+
border-bottom-left-radius: 12px;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
&:last-child a {
|
|
24
|
+
border-right-width: 1px;
|
|
25
|
+
border-top-right-radius: 12px;
|
|
26
|
+
border-bottom-right-radius: 12px;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
a {
|
|
30
|
+
@include light-button;
|
|
31
|
+
@include gradient(#FFFFFF, #F0F0F0);
|
|
32
|
+
@include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
|
|
33
|
+
text-decoration: none;
|
|
34
|
+
border-radius: 0;
|
|
35
|
+
border-width: 1px .5px 1px .5px;
|
|
36
|
+
margin-right: 0;
|
|
37
|
+
padding: 4px 14px 4px;
|
|
38
|
+
|
|
39
|
+
&:not(.disabled) {
|
|
40
|
+
&:hover {
|
|
41
|
+
@include gradient(#FFFFFF, #F6F6F6);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
&.ui-tabs-active {
|
|
47
|
+
a {
|
|
48
|
+
cursor: default;
|
|
49
|
+
@include gradient(#F0F0F0, #FDFDFD);
|
|
50
|
+
box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1) inset;
|
|
51
|
+
|
|
52
|
+
a:hover {
|
|
53
|
+
@include gradient(#F0F0F0, #FDFDFD);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
.tab-content {
|
|
61
|
+
border: 1px solid #D3D3D3;
|
|
62
|
+
padding: 15px;
|
|
63
|
+
padding-top: 30px;
|
|
64
|
+
text-align: left;
|
|
65
|
+
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
.unsupported_browser {
|
|
2
|
+
padding: 10px 30px;
|
|
3
|
+
color: #211e14;
|
|
4
|
+
background-color: #fae692;
|
|
5
|
+
@include gradient(#feefae, #fae692);
|
|
6
|
+
border-bottom: 1px solid #b3a569;
|
|
7
|
+
|
|
8
|
+
h1 {
|
|
9
|
+
font-size: 13px;
|
|
10
|
+
font-weight: bold;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
p {
|
|
14
|
+
margin-bottom: 0.5em;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
File without changes
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
$secondary-gradient-start: #efefef !default;
|
|
2
|
+
$secondary-gradient-stop: #dfe1e2 !default;
|
|
3
|
+
|
|
4
|
+
@mixin gradient($start, $end){
|
|
5
|
+
background-color: $start;
|
|
6
|
+
background-image: linear-gradient(180deg, $start, $end);
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
@mixin primary-gradient {
|
|
10
|
+
@include gradient(lighten($primary-color, 5%), darken($primary-color, 7%));
|
|
11
|
+
border-bottom: 1px solid darken($primary-color, 11%);
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
@mixin secondary-gradient {
|
|
15
|
+
@include gradient($secondary-gradient-start, $secondary-gradient-stop);
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
@mixin highlight-gradient {
|
|
19
|
+
@include gradient(#75a1c2, #608cb4);
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
@mixin reverse-highlight-gradient {
|
|
23
|
+
@include gradient(#608cb4, #75a1c2);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
@mixin no-gradient {
|
|
27
|
+
background-color: none;
|
|
28
|
+
}
|
|
@@ -4,13 +4,12 @@ span.icon svg { vertical-align: baseline; }
|
|
|
4
4
|
|
|
5
5
|
@mixin icon-color ($color) {
|
|
6
6
|
span.icon svg {
|
|
7
|
-
path, polygon, rect, circle { fill: $color
|
|
7
|
+
path, polygon, rect, circle { fill: $color; }
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
@mixin icon-size ($size) {
|
|
12
12
|
span.icon { width: $size; height: $size; }
|
|
13
|
-
span.icon svg { width: $size; height: $size; }
|
|
14
13
|
}
|
|
15
14
|
|
|
16
15
|
@mixin icon($color, $size) {
|
|
File without changes
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
@mixin rounded($radius: 3px) {
|
|
2
|
+
border-radius: $radius;
|
|
3
|
+
}
|
|
4
|
+
|
|
5
|
+
@mixin rounded-all($top-left:3px, $top-right:3px, $bottom-right:3px, $bottom-left:3px) {
|
|
6
|
+
border-top-right-radius: $top-right;
|
|
7
|
+
border-top-left-radius: $top-left;
|
|
8
|
+
border-bottom-right-radius: $bottom-right;
|
|
9
|
+
border-bottom-left-radius: $bottom-left;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
@mixin rounded-top($radius: 3px) {
|
|
13
|
+
@include rounded(0);
|
|
14
|
+
border-top-right-radius: $radius;
|
|
15
|
+
border-top-left-radius: $radius;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
@mixin rounded-bottom($radius: 3px) {
|
|
19
|
+
@include rounded(0);
|
|
20
|
+
border-bottom-right-radius: $radius;
|
|
21
|
+
border-bottom-left-radius: $radius;
|
|
22
|
+
}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
@include border-colors(#e6e6e6, #d4d4d4, #cdcdcd);
|
|
6
6
|
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 0 1px #FFF inset;
|
|
7
7
|
|
|
8
|
-
font-size:
|
|
8
|
+
font-size: 1em;
|
|
9
9
|
font-weight: bold;
|
|
10
10
|
line-height: 18px;
|
|
11
11
|
margin-bottom: 0.5em;
|
|
@@ -25,7 +25,13 @@
|
|
|
25
25
|
@include section-background;
|
|
26
26
|
margin-bottom: 20px;
|
|
27
27
|
|
|
28
|
-
> h3 {
|
|
28
|
+
> h3 {
|
|
29
|
+
@include section-header;
|
|
30
|
+
|
|
31
|
+
.header_action {
|
|
32
|
+
float: right;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
29
35
|
|
|
30
36
|
> div { padding: 3px $section-padding $section-padding $section-padding; }
|
|
31
37
|
|
|
@@ -1,22 +1,15 @@
|
|
|
1
1
|
@mixin shadow($x: 0, $y: 1px, $blur: 2px, $color: rgba(0,0,0,0.37)) {
|
|
2
2
|
box-shadow: $x $y $blur $color;
|
|
3
|
-
-moz-box-shadow: $x $y $blur $color;
|
|
4
|
-
-webkit-box-shadow: $x $y $blur $color;
|
|
5
3
|
}
|
|
6
4
|
|
|
7
5
|
@mixin no-shadow {
|
|
8
6
|
box-shadow: none;
|
|
9
|
-
-moz-box-shadow: none;
|
|
10
|
-
-webkit-box-shadow: none;
|
|
11
7
|
}
|
|
12
8
|
|
|
13
9
|
@mixin inset-shadow($x: 0, $y: 1px, $blur: 2px, $color: #aaa) {
|
|
14
10
|
box-shadow: inset $x $y $blur $color;
|
|
15
|
-
-moz-box-shadow: inset $x $y $blur $color;
|
|
16
|
-
-webkit-box-shadow: inset $x $y $blur $color;
|
|
17
11
|
}
|
|
18
12
|
|
|
19
13
|
@mixin text-shadow($color: #fff, $x: 0, $y: 1px, $blur: 0) {
|
|
20
14
|
text-shadow: $color $x $y $blur;
|
|
21
15
|
}
|
|
22
|
-
|
|
@@ -8,15 +8,6 @@
|
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
10
|
|
|
11
|
-
@mixin box-sizing($value: border-box) {
|
|
12
|
-
-moz-box-sizing: $value;
|
|
13
|
-
-webkit-box-sizing: $value;
|
|
14
|
-
-o-box-sizing: $value;
|
|
15
|
-
-ms-box-sizing: $value;
|
|
16
|
-
box-sizing: $value;
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
|
|
20
11
|
@mixin border-colors($top, $sides, $bottom) {
|
|
21
12
|
border-color: $sides;
|
|
22
13
|
border-top-color: $top;
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// to 'app/assets/stylesheets/active_admin.css.scss'.
|
|
4
4
|
|
|
5
5
|
// Colors
|
|
6
|
-
$body-background-color: #FFF;
|
|
6
|
+
$body-background-color: #FFF !default;
|
|
7
7
|
$primary-color: #5E6469 !default;
|
|
8
8
|
$secondary-color: #f0f0f0 !default;
|
|
9
9
|
$text-color: #323537 !default;
|
|
@@ -14,19 +14,21 @@ $hover-menu-item-background: lighten($primary-color, 12%) !default;
|
|
|
14
14
|
$table-stripe-color: lighten($primary-color, 57%) !default;
|
|
15
15
|
$table-selected-color: #d9e4ec !default;
|
|
16
16
|
$error-color: #932419 !default;
|
|
17
|
-
$blank-slate-primary-color: #AAA;
|
|
18
|
-
$breadcrumbs-color: #8a949e;
|
|
19
|
-
$breadcrumbs-separator-color: #aab2ba;
|
|
20
|
-
$required-field-marker-color: #aaa;
|
|
21
|
-
$form-label-color: $section-header-text-color;
|
|
22
|
-
$page-header-text-color: #cdcdcd;
|
|
17
|
+
$blank-slate-primary-color: #AAA !default;
|
|
18
|
+
$breadcrumbs-color: #8a949e !default;
|
|
19
|
+
$breadcrumbs-separator-color: #aab2ba !default;
|
|
20
|
+
$required-field-marker-color: #aaa !default;
|
|
21
|
+
$form-label-color: $section-header-text-color !default;
|
|
22
|
+
$page-header-text-color: #cdcdcd !default;
|
|
23
23
|
|
|
24
24
|
// Sizes
|
|
25
|
+
$border-width: 1px !default;
|
|
25
26
|
$horizontal-page-margin: 30px !default;
|
|
26
27
|
$sidebar-width: 270px !default;
|
|
27
28
|
$cell-padding: 5px 10px 3px 10px !default;
|
|
28
29
|
$cell-horizontal-padding: 12px !default;
|
|
29
30
|
$section-padding: 15px !default;
|
|
30
31
|
$text-input-horizontal-padding: 10px !default;
|
|
32
|
+
$text-input-total-padding: $text-input-horizontal-padding * 2 + $border-width * 2;
|
|
31
33
|
|
|
32
|
-
$blank-slate-border: 1px dashed #DADADA
|
|
34
|
+
$blank-slate-border: 1px dashed #DADADA !default;
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
#wrapper {
|
|
2
|
-
display: table;
|
|
3
2
|
width: 100%;
|
|
4
3
|
}
|
|
5
4
|
|
|
5
|
+
.index #wrapper {
|
|
6
|
+
display: table;
|
|
7
|
+
}
|
|
8
|
+
|
|
6
9
|
#active_admin_content {
|
|
7
10
|
margin: 0;
|
|
8
|
-
padding:
|
|
11
|
+
padding: $horizontal-page-margin;
|
|
9
12
|
|
|
10
13
|
#main_content_wrapper {
|
|
11
14
|
float: left;
|
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
#title_bar {
|
|
2
2
|
@include section-header;
|
|
3
3
|
@include clearfix;
|
|
4
|
-
|
|
4
|
+
box-sizing: border-box;
|
|
5
5
|
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.37);
|
|
6
6
|
display: table;
|
|
7
7
|
border-bottom-color: #EEE;
|
|
8
8
|
width: 100%;
|
|
9
9
|
position: relative;
|
|
10
10
|
margin: 0;
|
|
11
|
-
margin-bottom: 15px;
|
|
12
11
|
padding: 10px $horizontal-page-margin;
|
|
13
12
|
z-index: 800;
|
|
14
13
|
|
|
@@ -26,18 +25,21 @@
|
|
|
26
25
|
margin: 0;
|
|
27
26
|
padding: 0;
|
|
28
27
|
font-size: 2.6em;
|
|
28
|
+
line-height: 100%;
|
|
29
29
|
font-weight: bold;
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
.action_items {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
33
|
+
span.action_item {
|
|
34
|
+
& > a, & > .dropdown_menu > a {
|
|
35
|
+
@include light-button;
|
|
36
|
+
padding: 12px 17px 10px;
|
|
37
|
+
span.icon { vertical-align: bottom; margin-right: 4px;}
|
|
38
|
+
margin: 0px;
|
|
38
39
|
|
|
39
|
-
|
|
40
|
-
|
|
40
|
+
&:hover{
|
|
41
|
+
@include icon-color(#000);
|
|
42
|
+
}
|
|
41
43
|
}
|
|
42
44
|
}
|
|
43
45
|
}
|