activeadmin 0.6.0 → 0.6.1

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.

Files changed (322) hide show
  1. data/.gitignore +5 -1
  2. data/.travis.yml +1 -1
  3. data/.yardopts +2 -3
  4. data/CHANGELOG.md +180 -36
  5. data/CONTRIBUTING.md +12 -2
  6. data/Gemfile +9 -3
  7. data/README.rdoc +38 -65
  8. data/Rakefile +1 -3
  9. data/activeadmin.gemspec +10 -11
  10. data/app/assets/images/active_admin/index_list_icons/block_icon.svg +1 -1
  11. data/app/assets/images/active_admin/index_list_icons/blog_icon.svg +1 -1
  12. data/app/assets/images/active_admin/index_list_icons/grid_icon.svg +1 -1
  13. data/app/assets/images/active_admin/index_list_icons/table_icon.svg +1 -1
  14. data/app/assets/javascripts/active_admin/components/jquery.aa.checkbox-toggler.js.coffee +2 -2
  15. data/app/assets/javascripts/active_admin/components/jquery.aa.dropdown-menu.js.coffee +2 -2
  16. data/app/assets/javascripts/active_admin/components/jquery.aa.popover.js.coffee +2 -2
  17. data/app/assets/javascripts/active_admin/components/jquery.aa.table-checkbox-toggler.js.coffee +2 -2
  18. data/app/assets/javascripts/active_admin/lib/namespace.js.coffee +2 -1
  19. data/app/assets/javascripts/active_admin/pages/application.js.coffee +6 -1
  20. data/app/assets/stylesheets/active_admin/_base.css.scss +29 -34
  21. data/app/assets/stylesheets/active_admin/_forms.css.scss +65 -62
  22. data/app/assets/stylesheets/active_admin/_header.css.scss +57 -45
  23. data/app/assets/stylesheets/active_admin/_typography.css.scss +9 -9
  24. data/app/assets/stylesheets/active_admin/components/_batch_actions.css.scss +1 -1
  25. data/app/assets/stylesheets/active_admin/components/_blank_slates.scss +5 -5
  26. data/app/assets/stylesheets/active_admin/components/_breadcrumbs.scss +2 -2
  27. data/app/assets/stylesheets/active_admin/components/_comments.css.scss +1 -1
  28. data/app/assets/stylesheets/active_admin/components/_date_picker.css.scss +20 -20
  29. data/app/assets/stylesheets/active_admin/components/_dropdown_menu.scss +16 -16
  30. data/app/assets/stylesheets/active_admin/components/_flash_messages.css.scss +25 -23
  31. data/app/assets/stylesheets/active_admin/components/_grid.scss +2 -2
  32. data/app/assets/stylesheets/active_admin/components/_index_list.scss +1 -1
  33. data/app/assets/stylesheets/active_admin/components/_pagination.scss +10 -10
  34. data/app/assets/stylesheets/active_admin/components/_panels.scss +1 -1
  35. data/app/assets/stylesheets/active_admin/components/_popovers.css.scss +27 -27
  36. data/app/assets/stylesheets/active_admin/components/_scopes.scss +1 -1
  37. data/app/assets/stylesheets/active_admin/components/_table_tools.css.scss +10 -10
  38. data/app/assets/stylesheets/active_admin/components/_tables.css.scss +9 -9
  39. data/app/assets/stylesheets/active_admin/mixins/_buttons.css.scss +3 -3
  40. data/app/assets/stylesheets/active_admin/mixins/_gradients.css.scss +4 -4
  41. data/app/assets/stylesheets/active_admin/mixins/_icons.css.scss +4 -7
  42. data/app/assets/stylesheets/active_admin/mixins/_reset.css.scss +5 -5
  43. data/app/assets/stylesheets/active_admin/mixins/_rounded.css.scss +3 -3
  44. data/app/assets/stylesheets/active_admin/mixins/_sections.css.scss +6 -6
  45. data/app/assets/stylesheets/active_admin/mixins/_shadows.css.scss +8 -8
  46. data/app/assets/stylesheets/active_admin/mixins/_typography.scss +1 -1
  47. data/app/assets/stylesheets/active_admin/mixins/_utilities.scss +1 -1
  48. data/app/assets/stylesheets/active_admin/mixins/_variables.css.scss +9 -1
  49. data/app/assets/stylesheets/active_admin/pages/_logged_out.scss +1 -1
  50. data/app/assets/stylesheets/active_admin/print.css.scss +2 -8
  51. data/app/assets/stylesheets/active_admin/structure/_footer.scss +5 -5
  52. data/app/assets/stylesheets/active_admin/structure/_main_structure.scss +13 -13
  53. data/app/assets/stylesheets/active_admin/structure/_title_bar.scss +14 -14
  54. data/app/views/active_admin/devise/passwords/edit.html.erb +1 -1
  55. data/app/views/active_admin/devise/sessions/new.html.erb +1 -1
  56. data/app/views/active_admin/devise/shared/_links.erb +8 -1
  57. data/app/views/active_admin/resource/index.csv.erb +3 -3
  58. data/app/views/layouts/active_admin_logged_out.html.erb +5 -3
  59. data/config/locales/bg.yml +101 -0
  60. data/{lib/active_admin → config}/locales/ca.yml +24 -7
  61. data/{lib/active_admin → config}/locales/cs.yml +34 -12
  62. data/{lib/active_admin → config}/locales/da.yml +29 -7
  63. data/config/locales/de-CH.yml +117 -0
  64. data/{lib/active_admin → config}/locales/de.yml +19 -9
  65. data/config/locales/en-GB.yml +90 -0
  66. data/{lib/active_admin → config}/locales/en.yml +16 -6
  67. data/config/locales/es.yml +106 -0
  68. data/{lib/active_admin/locales/es.yml → config/locales/es_MX.yml} +14 -8
  69. data/{lib/active_admin → config}/locales/fr.yml +14 -6
  70. data/{lib/active_admin → config}/locales/he.yml +16 -6
  71. data/{lib/active_admin → config}/locales/hr.yml +14 -6
  72. data/{lib/active_admin → config}/locales/hu.yml +31 -6
  73. data/{lib/active_admin → config}/locales/it.yml +14 -6
  74. data/{lib/active_admin → config}/locales/ja.yml +32 -7
  75. data/{lib/active_admin → config}/locales/ko.yml +14 -6
  76. data/{lib/active_admin → config}/locales/lt.yml +15 -6
  77. data/{lib/active_admin → config}/locales/lv.yml +14 -6
  78. data/{lib/active_admin → config}/locales/nl.yml +14 -6
  79. data/{lib/active_admin → config}/locales/no-NB.yml +14 -6
  80. data/{lib/active_admin → config}/locales/pl.yml +14 -6
  81. data/{lib/active_admin → config}/locales/pt-BR.yml +14 -6
  82. data/{lib/active_admin → config}/locales/pt-PT.yml +14 -6
  83. data/{lib/active_admin → config}/locales/ro.yml +32 -7
  84. data/{lib/active_admin → config}/locales/ru.yml +30 -8
  85. data/{lib/active_admin → config}/locales/sv-SE.yml +14 -6
  86. data/{lib/active_admin → config}/locales/tr.yml +15 -6
  87. data/config/locales/uk.yml +100 -0
  88. data/{lib/active_admin → config}/locales/vi.yml +15 -6
  89. data/{lib/active_admin → config}/locales/zh-CN.yml +15 -6
  90. data/{lib/active_admin → config}/locales/zh-TW.yml +15 -6
  91. data/docs/0-installation.md +22 -18
  92. data/docs/1-general-configuration.md +1 -1
  93. data/docs/10-custom-pages.md +3 -3
  94. data/docs/11-decorators.md +18 -2
  95. data/docs/12-arbre-components.md +53 -54
  96. data/docs/13-authorization-adapter.md +31 -10
  97. data/docs/2-resource-customization.md +16 -1
  98. data/docs/3-index-pages.md +13 -1
  99. data/docs/3-index-pages/create-an-index.md +4 -4
  100. data/docs/3-index-pages/index-as-block.md +1 -1
  101. data/docs/3-index-pages/index-as-blog.md +1 -1
  102. data/docs/3-index-pages/index-as-grid.md +1 -1
  103. data/docs/4-csv-format.md +4 -4
  104. data/docs/5-forms.md +46 -3
  105. data/docs/{6-show-screens.md → 6-show-pages.md} +3 -3
  106. data/docs/8-custom-actions.md +3 -3
  107. data/docs/9-batch-actions.md +9 -1
  108. data/features/action_item.feature +6 -6
  109. data/features/authorization_cancan.feature +1 -1
  110. data/features/belongs_to.feature +3 -3
  111. data/features/breadcrumb.feature +2 -2
  112. data/features/comments/commenting.feature +7 -5
  113. data/features/dashboard.feature +0 -51
  114. data/features/favicon.feature +20 -0
  115. data/features/global_navigation.feature +0 -1
  116. data/features/index/batch_actions.feature +12 -11
  117. data/features/index/filters.feature +6 -6
  118. data/features/index/format_as_csv.feature +4 -5
  119. data/features/index/index_as_blog.feature +20 -1
  120. data/features/index/index_as_table.feature +1 -1
  121. data/features/index/index_blank_slate.feature +3 -3
  122. data/features/index/index_parameters.feature +4 -10
  123. data/features/index/index_scope_to.feature +24 -0
  124. data/features/index/index_scopes.feature +17 -5
  125. data/features/index/pagination.feature +15 -0
  126. data/features/registering_pages.feature +1 -1
  127. data/features/registering_resources.feature +2 -2
  128. data/features/show/default_content.feature +3 -3
  129. data/features/sidebar_sections.feature +3 -3
  130. data/features/specifying_actions.feature +1 -1
  131. data/features/step_definitions/additional_web_steps.rb +3 -16
  132. data/features/step_definitions/asset_steps.rb +5 -1
  133. data/features/step_definitions/attribute_steps.rb +4 -4
  134. data/features/step_definitions/batch_action_steps.rb +25 -74
  135. data/features/step_definitions/breadcrumb_steps.rb +1 -3
  136. data/features/step_definitions/comment_steps.rb +0 -1
  137. data/features/step_definitions/configuration_steps.rb +53 -69
  138. data/features/step_definitions/dashboard_steps.rb +2 -2
  139. data/features/step_definitions/factory_steps.rb +17 -33
  140. data/features/step_definitions/filter_steps.rb +2 -2
  141. data/features/step_definitions/format_steps.rb +10 -14
  142. data/features/step_definitions/index_scope_steps.rb +9 -25
  143. data/features/step_definitions/index_views_steps.rb +1 -1
  144. data/features/step_definitions/sidebar_steps.rb +2 -1
  145. data/features/step_definitions/site_title_steps.rb +1 -1
  146. data/features/step_definitions/table_steps.rb +6 -1
  147. data/features/step_definitions/user_steps.rb +23 -38
  148. data/features/step_definitions/web_steps.rb +18 -147
  149. data/features/support/env.rb +13 -34
  150. data/features/support/paths.rb +2 -0
  151. data/features/users/logging_in.feature +2 -2
  152. data/features/users/logging_out.feature +0 -12
  153. data/features/users/resetting_password.feature +1 -1
  154. data/lib/active_admin.rb +4 -17
  155. data/lib/active_admin/abstract_view_factory.rb +1 -1
  156. data/lib/active_admin/application.rb +19 -28
  157. data/lib/active_admin/asset_registration.rb +7 -25
  158. data/lib/active_admin/authorization_adapter.rb +9 -5
  159. data/lib/active_admin/base_controller.rb +2 -2
  160. data/lib/active_admin/base_controller/authorization.rb +25 -27
  161. data/lib/active_admin/batch_actions/resource_extension.rb +3 -3
  162. data/lib/active_admin/batch_actions/views/batch_action_selector.rb +1 -1
  163. data/lib/active_admin/batch_actions/views/selection_cells.rb +1 -1
  164. data/lib/active_admin/callbacks.rb +1 -1
  165. data/lib/active_admin/cancan_adapter.rb +2 -2
  166. data/lib/active_admin/comments.rb +32 -38
  167. data/lib/active_admin/comments/comment.rb +6 -8
  168. data/lib/active_admin/comments/views.rb +0 -1
  169. data/lib/active_admin/comments/views/active_admin_comments.rb +27 -38
  170. data/lib/active_admin/csv_builder.rb +4 -6
  171. data/lib/active_admin/dependency_checker.rb +4 -0
  172. data/lib/active_admin/deprecation.rb +3 -3
  173. data/lib/active_admin/dsl.rb +5 -5
  174. data/lib/active_admin/engine.rb +1 -1
  175. data/lib/active_admin/filters.rb +2 -1
  176. data/lib/active_admin/filters/forms.rb +36 -43
  177. data/lib/active_admin/filters/formtastic_addons.rb +45 -0
  178. data/lib/active_admin/filters/resource_extension.rb +9 -1
  179. data/lib/active_admin/form_builder.rb +30 -19
  180. data/lib/active_admin/helpers/optional_display.rb +11 -13
  181. data/lib/active_admin/helpers/settings.rb +50 -8
  182. data/lib/active_admin/inputs/filter_base.rb +5 -18
  183. data/lib/active_admin/inputs/filter_base/search_method_select.rb +73 -0
  184. data/lib/active_admin/inputs/filter_boolean_input.rb +6 -14
  185. data/lib/active_admin/inputs/filter_check_boxes_input.rb +1 -1
  186. data/lib/active_admin/inputs/filter_numeric_input.rb +2 -47
  187. data/lib/active_admin/inputs/filter_select_input.rb +32 -10
  188. data/lib/active_admin/inputs/filter_string_input.rb +12 -14
  189. data/lib/active_admin/namespace.rb +8 -40
  190. data/lib/active_admin/page.rb +2 -2
  191. data/lib/active_admin/page_dsl.rb +1 -1
  192. data/lib/active_admin/reloader.rb +3 -3
  193. data/lib/active_admin/resource.rb +16 -23
  194. data/lib/active_admin/resource/belongs_to.rb +8 -5
  195. data/lib/active_admin/resource/menu.rb +10 -23
  196. data/lib/active_admin/resource/naming.rb +3 -3
  197. data/lib/active_admin/resource/page_presenters.rb +2 -2
  198. data/lib/active_admin/resource/routes.rb +74 -21
  199. data/lib/active_admin/resource/scope_to.rb +74 -0
  200. data/lib/active_admin/resource/scopes.rb +8 -4
  201. data/lib/active_admin/resource_collection.rb +20 -66
  202. data/lib/active_admin/resource_controller.rb +12 -16
  203. data/lib/active_admin/resource_controller/data_access.rb +19 -22
  204. data/lib/active_admin/resource_controller/resource_class_methods.rb +2 -2
  205. data/lib/active_admin/resource_controller/scoping.rb +4 -9
  206. data/lib/active_admin/resource_dsl.rb +5 -32
  207. data/lib/active_admin/router.rb +34 -47
  208. data/lib/active_admin/scope.rb +5 -3
  209. data/lib/active_admin/sidebar_section.rb +1 -1
  210. data/lib/active_admin/version.rb +1 -1
  211. data/lib/active_admin/view_factory.rb +1 -1
  212. data/lib/active_admin/view_helpers/auto_link_helper.rb +1 -1
  213. data/lib/active_admin/view_helpers/breadcrumb_helper.rb +8 -8
  214. data/lib/active_admin/view_helpers/display_helper.rb +15 -6
  215. data/lib/active_admin/view_helpers/download_format_links_helper.rb +2 -2
  216. data/lib/active_admin/view_helpers/form_helper.rb +6 -1
  217. data/lib/active_admin/view_helpers/icon_helper.rb +1 -1
  218. data/lib/active_admin/view_helpers/method_or_proc_helper.rb +5 -5
  219. data/lib/active_admin/view_helpers/title_helper.rb +1 -1
  220. data/lib/active_admin/views/components/action_list_popover.rb +6 -6
  221. data/lib/active_admin/views/components/attributes_table.rb +9 -12
  222. data/lib/active_admin/views/components/blank_slate.rb +4 -4
  223. data/lib/active_admin/views/components/columns.rb +1 -1
  224. data/lib/active_admin/views/components/index_list.rb +1 -1
  225. data/lib/active_admin/views/components/paginated_collection.rb +20 -12
  226. data/lib/active_admin/views/components/panel.rb +1 -1
  227. data/lib/active_admin/views/components/scopes.rb +2 -1
  228. data/lib/active_admin/views/components/sidebar_section.rb +1 -1
  229. data/lib/active_admin/views/components/status_tag.rb +1 -1
  230. data/lib/active_admin/views/header.rb +2 -2
  231. data/lib/active_admin/views/index_as_blog.rb +16 -3
  232. data/lib/active_admin/views/index_as_table.rb +2 -2
  233. data/lib/active_admin/views/pages/base.rb +8 -3
  234. data/lib/active_admin/views/pages/form.rb +2 -2
  235. data/lib/active_admin/views/pages/index.rb +19 -17
  236. data/lib/generators/active_admin/assets/templates/3.0/active_admin.js +1 -1
  237. data/lib/generators/active_admin/assets/templates/3.1/active_admin.css.scss +1 -13
  238. data/lib/generators/active_admin/devise/devise_generator.rb +22 -1
  239. data/lib/generators/active_admin/install/install_generator.rb +1 -5
  240. data/lib/generators/active_admin/install/templates/active_admin.rb.erb +40 -19
  241. data/lib/generators/active_admin/install/templates/admin_user.rb.erb +18 -18
  242. data/lib/generators/active_admin/install/templates/migrations/create_active_admin_comments.rb +19 -0
  243. data/lib/generators/active_admin/resource/resource_generator.rb +1 -1
  244. data/lib/generators/active_admin/resource/templates/admin.rb +1 -1
  245. data/script/use_rails +1 -1
  246. data/spec/integration/memory_spec.rb +3 -2
  247. data/spec/javascripts/coffeescripts/jquery.aa.checkbox-toggler-spec.js.coffee +4 -4
  248. data/spec/javascripts/coffeescripts/jquery.aa.popover-spec.js.coffee +1 -1
  249. data/spec/javascripts/coffeescripts/jquery.aa.table-checkbox-toggler-spec.js.coffee +2 -2
  250. data/spec/javascripts/compiled/jquery.aa.checkbox-toggler-spec.js +4 -4
  251. data/spec/javascripts/compiled/jquery.aa.popover-spec.js +1 -1
  252. data/spec/javascripts/compiled/jquery.aa.table-checkbox-toggler-spec.js +2 -2
  253. data/spec/spec_helper.rb +16 -6
  254. data/spec/spec_helper_without_rails.rb +2 -0
  255. data/spec/support/deferred_garbage_collection.rb +19 -0
  256. data/spec/support/jslint.yml +1 -1
  257. data/spec/support/rails_template.rb +29 -27
  258. data/spec/support/templates/admin/stores.rb +5 -1
  259. data/spec/unit/abstract_view_factory_spec.rb +1 -1
  260. data/spec/unit/action_builder_spec.rb +7 -7
  261. data/spec/unit/active_admin_spec.rb +0 -14
  262. data/spec/unit/application_spec.rb +16 -17
  263. data/spec/unit/asset_registration_spec.rb +21 -8
  264. data/spec/unit/authorization/authorization_adapter_spec.rb +3 -3
  265. data/spec/unit/authorization/controller_authorization_spec.rb +16 -24
  266. data/spec/unit/batch_actions/resource_spec.rb +11 -11
  267. data/spec/unit/belongs_to_spec.rb +1 -1
  268. data/spec/unit/cancan_adapter_spec.rb +11 -3
  269. data/spec/unit/comments_spec.rb +10 -28
  270. data/spec/unit/controller_filters_spec.rb +22 -24
  271. data/spec/unit/csv_builder_spec.rb +3 -3
  272. data/spec/unit/devise_spec.rb +10 -10
  273. data/spec/unit/filters/filter_form_builder_spec.rb +140 -45
  274. data/spec/unit/filters/resource_spec.rb +20 -19
  275. data/spec/unit/form_builder_spec.rb +122 -70
  276. data/spec/unit/menu_item_spec.rb +3 -3
  277. data/spec/unit/namespace/authorization_spec.rb +4 -8
  278. data/spec/unit/namespace/register_page_spec.rb +1 -1
  279. data/spec/unit/namespace/register_resource_spec.rb +12 -7
  280. data/spec/unit/namespace_spec.rb +4 -10
  281. data/spec/unit/page_spec.rb +1 -1
  282. data/spec/unit/resource/menu_spec.rb +1 -1
  283. data/spec/unit/resource/naming_spec.rb +9 -0
  284. data/spec/unit/resource/pagination_spec.rb +2 -2
  285. data/spec/unit/resource/routes_spec.rb +73 -0
  286. data/spec/unit/resource/scopes_spec.rb +1 -1
  287. data/spec/unit/resource_collection_spec.rb +95 -43
  288. data/spec/unit/resource_registration_spec.rb +3 -12
  289. data/spec/unit/resource_spec.rb +41 -48
  290. data/spec/unit/routing_spec.rb +10 -64
  291. data/spec/unit/scope_spec.rb +19 -0
  292. data/spec/unit/settings_spec.rb +88 -0
  293. data/spec/unit/view_factory_spec.rb +1 -0
  294. data/spec/unit/{breadcrumbs_spec.rb → view_helpers/breadcrumbs_spec.rb} +16 -7
  295. data/spec/unit/view_helpers/display_name_spec.rb +41 -0
  296. data/spec/unit/view_helpers/form_helper_spec.rb +36 -2
  297. data/spec/unit/views/components/attributes_table_spec.rb +17 -9
  298. data/spec/unit/views/components/batch_action_popover_spec.rb +4 -4
  299. data/spec/unit/views/components/index_list_spec.rb +2 -2
  300. data/spec/unit/views/components/paginated_collection_spec.rb +42 -0
  301. data/spec/unit/views/components/panel_spec.rb +8 -0
  302. data/spec/unit/views/components/site_title_spec.rb +2 -2
  303. data/spec/unit/views/components/table_for_spec.rb +4 -4
  304. data/spec/unit/views/pages/form_spec.rb +35 -0
  305. data/spec/unit/views/pages/layout_spec.rb +1 -1
  306. data/spec/unit/views/tabbed_navigation_spec.rb +10 -10
  307. data/tasks/parallel_tests.rake +1 -1
  308. data/tasks/test.rake +4 -1
  309. metadata +117 -106
  310. data/app/assets/stylesheets/active_admin/pages/_dashboard.scss +0 -5
  311. data/lib/active_admin/comments/views/active_admin_comment.rb +0 -0
  312. data/lib/active_admin/dashboards.rb +0 -68
  313. data/lib/active_admin/dashboards/dashboard_controller.rb +0 -50
  314. data/lib/active_admin/dashboards/section.rb +0 -34
  315. data/lib/active_admin/locales/bg.yml +0 -77
  316. data/lib/generators/active_admin/install/templates/migrations/1_create_admin_notes.rb +0 -17
  317. data/lib/generators/active_admin/install/templates/migrations/2_move_admin_notes_to_comments.rb +0 -26
  318. data/spec/unit/base_controller_spec.rb +0 -6
  319. data/spec/unit/dashboard_controller_spec.rb +0 -76
  320. data/spec/unit/dashboard_section_spec.rb +0 -56
  321. data/spec/unit/dashboards_spec.rb +0 -59
  322. data/spec/unit/display_name_spec.rb +0 -29
@@ -1,31 +1,33 @@
1
- &.logged_in {
2
- .flash {
3
- @include gradient(#f7f1d3, #f5edc5);
4
- @include text-shadow(#fafafa);
5
- border-bottom: 1px solid #eee098;
6
- color: #cb9810;
7
- font-weight: bold;
8
- font-size: 1.1em;
9
- line-height: 1.0em;
10
- margin-bottom: 10px;
11
- padding: 13px 30px 11px;
12
- position: relative;
13
- top: -15px;
1
+ body.logged_in {
2
+ .flashes{
3
+ .flash {
4
+ @include gradient(#f7f1d3, #f5edc5);
5
+ @include text-shadow(#fafafa);
6
+ border-bottom: 1px solid #eee098;
7
+ color: #cb9810;
8
+ font-weight: bold;
9
+ font-size: 1.1em;
10
+ line-height: 1.0em;
11
+ margin-bottom: 10px;
12
+ padding: 13px 30px 11px;
13
+ position: relative;
14
+ top: -15px;
14
15
 
15
- &.flash_notice {
16
- @include gradient(#dce9dd, #ccdfcd);
17
- border-bottom: 1px solid #adcbaf;
18
- color: #416347;
19
- }
20
- &.flash_error {
21
- @include gradient(#f5e4e4, #f1dcdc);
22
- border-bottom: 1px solid #e0c2c0;
23
- color: #b33c33;
16
+ &.flash_notice {
17
+ @include gradient(#dce9dd, #ccdfcd);
18
+ border-bottom: 1px solid #adcbaf;
19
+ color: #416347;
20
+ }
21
+ &.flash_error {
22
+ @include gradient(#f5e4e4, #f1dcdc);
23
+ border-bottom: 1px solid #e0c2c0;
24
+ color: #b33c33;
25
+ }
24
26
  }
25
27
  }
26
28
  }
27
29
 
28
- &.logged_out {
30
+ body.logged_out {
29
31
  .flash {
30
32
  @include no-shadow;
31
33
  @include text-shadow(#fff);
@@ -1,4 +1,4 @@
1
- // -------------------------------------- Index as Grid
1
+ // -------------------------------------- Index as Grid
2
2
  table.index_grid td { border: none; background: none; padding: 0 20px 20px 0; margin: 0;}
3
3
 
4
4
  // -------------------------------------- Columns
@@ -6,4 +6,4 @@ table.index_grid td { border: none; background: none; padding: 0 20px 20px 0; ma
6
6
  clear: both;
7
7
  padding: 0;
8
8
  .column { float: left; }
9
- }
9
+ }
@@ -9,4 +9,4 @@
9
9
  line-height: 10px;
10
10
  }
11
11
  }
12
- }
12
+ }
@@ -1,28 +1,28 @@
1
- .paginated_collection_contents {
1
+ .paginated_collection_contents {
2
2
  clear: both;
3
3
  }
4
4
 
5
- .pagination {
6
- float: right;
7
- font-size: 0.9em;
8
- margin-left: 10px;
5
+ .pagination {
6
+ float: right;
7
+ font-size: 0.9em;
8
+ margin-left: 10px;
9
9
 
10
10
  a {
11
11
  @include light-button;
12
12
  }
13
-
13
+
14
14
  span.page.current {
15
15
  @include default-button;
16
16
  }
17
-
18
- a, span.page.current {
17
+
18
+ a, span.page.current {
19
19
  @include rounded(0px);
20
- margin-right: 4px;
20
+ margin-right: 4px;
21
21
  padding: 2px 5px;
22
22
  }
23
23
  }
24
24
 
25
- .pagination_information {
25
+ .pagination_information {
26
26
  float: right;
27
27
  margin-bottom: 5px;
28
28
  color: #b3bcc1;
@@ -1,6 +1,6 @@
1
1
  // ----------------------------------- Helper class to apply to elements to make them sections
2
2
  .section, .panel{ @include section; }
3
3
 
4
- // ----------------------------------- Sidebar Sections
4
+ // ----------------------------------- Sidebar Sections
5
5
 
6
6
  .sidebar_section { @include section; }
@@ -11,28 +11,28 @@
11
11
  border-bottom-color: darken($primary-color, 17%);
12
12
 
13
13
  border-radius: 4px;
14
-
14
+
15
15
  .popover_nipple{
16
16
 
17
- // The nipple's border
17
+ // The nipple's border
18
18
  content: "";
19
19
  position: absolute;
20
20
  top: -6px;
21
21
  display: block;
22
- width: 0;
23
- height: 0;
22
+ width: 0;
23
+ height: 0;
24
24
  border-width: 0 6px 6px;
25
25
  border-style: solid;
26
- border-color: darken($primary-color, 4%) transparent;
26
+ border-color: darken($primary-color, 4%) transparent;
27
27
  z-index: 100;
28
28
 
29
- // The nipple's inner shadow
29
+ // The nipple's inner shadow
30
30
 
31
31
  &:before {
32
- content: ' ';
33
- position: absolute;
34
- width: 0;
35
- height: 0;
32
+ content: ' ';
33
+ position: absolute;
34
+ width: 0;
35
+ height: 0;
36
36
  border-width: 0 5px 5px;
37
37
  border-style: solid;
38
38
  border-color: lighten($primary-color, 15%) transparent;
@@ -43,10 +43,10 @@
43
43
  // The nipple's background color
44
44
 
45
45
  &:after {
46
- content: ' ';
47
- position: absolute;
48
- width: 0;
49
- height: 0;
46
+ content: ' ';
47
+ position: absolute;
48
+ width: 0;
49
+ height: 0;
50
50
  border-width: 0 5px 5px;
51
51
  border-style: solid;
52
52
  border-color: lighten($primary-color, 4%) transparent;
@@ -54,53 +54,53 @@
54
54
  top: 2px;
55
55
  }
56
56
  }
57
-
57
+
58
58
  .popover_contents {
59
59
  display: block;
60
60
  background-color: #FFF;
61
- border: solid 1px darken($primary-color, 10%);
62
- box-shadow: lighten($primary-color, 5%) 0px 1px 0px 0px;
61
+ border: solid 1px darken($primary-color, 10%);
62
+ box-shadow: lighten($primary-color, 5%) 0px 1px 0px 0px;
63
63
  border-radius: 3px;
64
64
  margin: 0;
65
65
  overflow: hidden;
66
66
  padding: 8px;
67
67
  }
68
-
68
+
69
69
  }
70
-
70
+
71
71
  //-------------------------------------- Popover with action list
72
72
 
73
73
  .popover {
74
74
  ul.popover_contents {
75
75
  list-style-type: none;
76
76
  padding: 0;
77
-
77
+
78
78
  li {
79
79
  display: block;
80
80
  border-bottom: solid 1px #ebebeb;
81
81
  @include box-sizing(border-box);
82
-
82
+
83
83
  a {
84
84
  display: block;
85
- @include box-sizing(padding-box);
85
+ @include 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
91
  -webkit-font-smoothing: antialiased;
92
-
92
+
93
93
  &:hover {
94
94
  @include highlight-gradient;
95
95
  @include text-shadow(#5a83aa);
96
96
  color: #FFF;
97
97
  }
98
-
98
+
99
99
  &:active {
100
100
  @include reverse-highlight-gradient;
101
101
  color: #FFF;
102
102
  }
103
-
103
+
104
104
  }
105
105
 
106
106
  &:first-child {
@@ -108,9 +108,9 @@
108
108
  border-top-left-radius: 2px;
109
109
  border-top-right-radius: 2px;
110
110
  }
111
-
111
+
112
112
  }
113
-
113
+
114
114
  &:last-child {
115
115
  a {
116
116
  border-bottom-left-radius: 2px;
@@ -7,4 +7,4 @@
7
7
  line-height: 10px;
8
8
  }
9
9
  }
10
- }
10
+ }
@@ -9,11 +9,11 @@
9
9
  .table_tools_button + .table_tools_button {
10
10
  margin-left: 6px;
11
11
  }
12
-
12
+
13
13
  .table_tools_button + .table_tools_segmented_control {
14
14
  margin-left: 6px;
15
15
  }
16
-
16
+
17
17
  .table_tools_segmented_control + .table_tools_button {
18
18
  margin-left: 6px;
19
19
  }
@@ -24,7 +24,7 @@
24
24
  a.table_tools_button, .table_tools .dropdown_menu_button {
25
25
  @include light-button;
26
26
  @include gradient(#FFFFFF, #F0F0F0);
27
- @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
27
+ @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
28
28
  font-size: 0.9em;
29
29
  text-decoration: none;
30
30
  padding: 4px 14px 4px;
@@ -49,27 +49,27 @@ a.table_tools_button, .table_tools .dropdown_menu_button {
49
49
  list-style-type: none;
50
50
  margin: 0;
51
51
  padding: 0;
52
-
52
+
53
53
  li {
54
54
  display: inline-block;
55
55
  list-style-image: none;
56
56
  list-style-type: none;
57
57
  margin-left: -7px;
58
58
  white-space: nowrap;
59
-
59
+
60
60
  a {
61
61
  border-radius: 0px;
62
62
  }
63
-
63
+
64
64
  &:first-child {
65
65
  margin-left: 0;
66
-
66
+
67
67
  a {
68
68
  border-top-left-radius: 12px;
69
69
  border-bottom-left-radius: 12px;
70
70
  }
71
71
  }
72
-
72
+
73
73
  &:last-child {
74
74
  a {
75
75
  border-top-right-radius: 12px;
@@ -83,7 +83,7 @@ a.table_tools_button, .table_tools .dropdown_menu_button {
83
83
  @include gradient(#F0F0F0, #FDFDFD);
84
84
  box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1) inset;
85
85
  cursor: default;
86
-
86
+
87
87
  &:hover {
88
88
  @include gradient(#F0F0F0, #FDFDFD);
89
89
  }
@@ -91,5 +91,5 @@ a.table_tools_button, .table_tools .dropdown_menu_button {
91
91
  }
92
92
 
93
93
  }
94
-
94
+
95
95
  }
@@ -1,4 +1,4 @@
1
- // ----------------------------------- Tables
1
+ // ----------------------------------- Tables
2
2
 
3
3
  table tr {
4
4
  td {
@@ -6,7 +6,7 @@ table tr {
6
6
  }
7
7
  }
8
8
 
9
- // --------- Index Tables
9
+ // --------- Index Tables
10
10
 
11
11
  table.index_table {
12
12
  width: 100%;
@@ -14,7 +14,7 @@ table.index_table {
14
14
  border: 0;
15
15
  border-spacing: 0;
16
16
 
17
- th {
17
+ th {
18
18
  @include section-header;
19
19
  border-right: none;
20
20
  text-align: left;
@@ -39,11 +39,11 @@ table.index_table {
39
39
  &.sorted-asc, &.sorted-desc {
40
40
  @include gradient(darken($secondary-gradient-start, 5%), darken($secondary-gradient-stop, 5%));
41
41
  }
42
-
42
+
43
43
  &:last-child {
44
44
  border-right: solid 1px #d4d4d4;
45
45
  }
46
-
46
+
47
47
  }
48
48
 
49
49
  tr.even td { background: $table-stripe-color; }
@@ -63,7 +63,7 @@ table.index_table {
63
63
 
64
64
  .panel_contents table {
65
65
  margin-top: 5px;
66
- th {
66
+ th {
67
67
  padding-top: 10px;
68
68
  background: none;
69
69
  color: $primary-color;
@@ -76,14 +76,14 @@ table.index_table {
76
76
  tr.even td { background: $table-stripe-color; }
77
77
  }
78
78
 
79
- // -------------------------------------- Resource Attributes Table
79
+ // -------------------------------------- Resource Attributes Table
80
80
  .attributes_table { overflow: hidden; }
81
81
 
82
82
  .attributes_table table {
83
83
  th, td {
84
84
  padding: 8px $cell-horizontal-padding 6px $cell-horizontal-padding;
85
85
  vertical-align: top;
86
- border-bottom: 1px solid #e8e8e8;
86
+ border-bottom: 1px solid #e8e8e8;
87
87
  }
88
88
  th {
89
89
  @include no-shadow;
@@ -105,4 +105,4 @@ table.index_table {
105
105
  }
106
106
  }
107
107
 
108
- .sidebar_section .attributes_table th { width: 50px; }
108
+ .sidebar_section .attributes_table th { width: 50px; }
@@ -25,12 +25,12 @@
25
25
  border: solid 1px #484e53;
26
26
  @include border-colors(#616a71, #484e53, #363b3f);
27
27
  color: #efefef;
28
-
28
+
29
29
  &:not(.disabled) {
30
30
  &:hover{
31
31
  @include gradient(lighten($primary-color, 18%), darken($primary-color, 9%));
32
32
  }
33
-
33
+
34
34
  &:active {
35
35
  box-shadow: 0 1px 3px rgba(0,0,0,0.40) inset, 0 1px 0 0px #FFF;
36
36
  @include gradient(lighten($primary-color, 8%), darken($primary-color, 17%));
@@ -39,7 +39,7 @@
39
39
  }
40
40
 
41
41
  @mixin light-button {
42
- @include basic-button;
42
+ @include basic-button;
43
43
  @include gradient(#FFFFFF, #E7E7E7);
44
44
  box-shadow: 0 1px 1px rgba(0,0,0,0.10), 0 1px 0 0 rgba(255,255,255, 0.8) inset;
45
45
  border: solid 1px #c7c7c7;
@@ -1,8 +1,8 @@
1
1
  $secondary-gradient-start: #efefef !default;
2
2
  $secondary-gradient-stop: #dfe1e2 !default;
3
3
 
4
- @mixin gradient($start, $end){
5
- background: $start;
4
+ @mixin gradient($start, $end){
5
+ background: $start;
6
6
  background: -webkit-linear-gradient(-90deg, $start, $end);
7
7
  background: -moz-linear-gradient(-90deg, $start, $end);
8
8
  background: linear-gradient(-90deg, $start, $end);
@@ -12,12 +12,12 @@ $secondary-gradient-stop: #dfe1e2 !default;
12
12
  -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start)}', endColorstr='#{ie-hex-str($end)}');
13
13
  }
14
14
 
15
- @mixin primary-gradient {
15
+ @mixin primary-gradient {
16
16
  @include gradient(lighten($primary-color, 5%), darken($primary-color, 7%));
17
17
  border-bottom: 1px solid darken($primary-color, 11%);
18
18
  }
19
19
 
20
- @mixin secondary-gradient {
20
+ @mixin secondary-gradient {
21
21
  @include gradient($secondary-gradient-start, $secondary-gradient-stop);
22
22
  }
23
23