alchemy_cms 4.0.6 → 4.1.0.beta

Sign up to get free protection for your applications and to get access to all the features.
Files changed (340) hide show
  1. checksums.yaml +4 -4
  2. data/.codeclimate.yml +1 -0
  3. data/.gitignore +1 -0
  4. data/.localeapp/config.rb +8 -0
  5. data/.rubocop.yml +26 -13
  6. data/.travis.yml +12 -14
  7. data/CHANGELOG.md +5 -24
  8. data/Gemfile +10 -7
  9. data/README.md +16 -14
  10. data/Rakefile +1 -1
  11. data/alchemy_cms.gemspec +6 -7
  12. data/app/assets/images/alchemy/alchemy-logo.png +0 -0
  13. data/app/assets/images/alchemy/alchemy-logo.svg +1 -70
  14. data/app/assets/images/alchemy/favicon.ico +0 -0
  15. data/app/assets/images/alchemy/icon.svg +1 -14
  16. data/app/assets/javascripts/alchemy/admin.js +0 -7
  17. data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +2 -2
  18. data/app/assets/javascripts/alchemy/alchemy.buttons.js.coffee +1 -1
  19. data/app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee +1 -1
  20. data/app/assets/javascripts/alchemy/alchemy.datepicker.js.coffee +1 -0
  21. data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +19 -6
  22. data/app/assets/javascripts/alchemy/alchemy.dirty.js.coffee +2 -7
  23. data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +36 -26
  24. data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +6 -15
  25. data/app/assets/javascripts/alchemy/alchemy.file_progress.js.coffee +1 -1
  26. data/app/assets/javascripts/alchemy/alchemy.growler.js.coffee +8 -11
  27. data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +4 -1
  28. data/app/assets/javascripts/alchemy/alchemy.image_overlay.coffee +1 -1
  29. data/app/assets/javascripts/alchemy/alchemy.initializer.js.coffee +5 -14
  30. data/app/assets/javascripts/alchemy/alchemy.preview.js.coffee +54 -75
  31. data/app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee +4 -13
  32. data/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee +1 -0
  33. data/app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee +12 -6
  34. data/app/assets/javascripts/alchemy/alchemy.translations.js.coffee +0 -158
  35. data/app/assets/stylesheets/alchemy/_defaults.scss +0 -2
  36. data/app/assets/stylesheets/alchemy/_extends.scss +13 -18
  37. data/app/assets/stylesheets/alchemy/_mixins.scss +72 -46
  38. data/app/assets/stylesheets/alchemy/_variables.scss +128 -59
  39. data/app/assets/stylesheets/alchemy/admin.scss +7 -1
  40. data/app/assets/stylesheets/alchemy/archive.scss +23 -27
  41. data/app/assets/stylesheets/alchemy/base.scss +5 -355
  42. data/app/assets/stylesheets/alchemy/buttons.scss +23 -60
  43. data/app/assets/stylesheets/alchemy/clipboard.scss +26 -0
  44. data/app/assets/stylesheets/alchemy/dashboard.scss +7 -40
  45. data/app/assets/stylesheets/alchemy/dialogs.scss +23 -36
  46. data/app/assets/stylesheets/alchemy/elements.scss +80 -156
  47. data/app/assets/stylesheets/alchemy/errors.scss +2 -2
  48. data/app/assets/stylesheets/alchemy/flash.scss +19 -10
  49. data/app/assets/stylesheets/alchemy/fonts.scss +13 -0
  50. data/app/assets/stylesheets/alchemy/forms.scss +6 -1
  51. data/app/assets/stylesheets/alchemy/frame.scss +24 -65
  52. data/app/assets/stylesheets/alchemy/hints.scss +2 -2
  53. data/app/assets/stylesheets/alchemy/icons.scss +3 -337
  54. data/app/assets/stylesheets/alchemy/image_library.scss +9 -10
  55. data/app/assets/stylesheets/alchemy/jquery-ui.scss +21 -839
  56. data/app/assets/stylesheets/alchemy/jquery.datetimepicker.scss +32 -57
  57. data/app/assets/stylesheets/alchemy/lists.scss +4 -8
  58. data/app/assets/stylesheets/alchemy/menubar.scss +26 -29
  59. data/app/assets/stylesheets/alchemy/navigation.scss +23 -25
  60. data/app/assets/stylesheets/alchemy/notices.scss +25 -25
  61. data/app/assets/stylesheets/alchemy/pagination.scss +12 -7
  62. data/app/assets/stylesheets/alchemy/preview_window.scss +20 -0
  63. data/app/assets/stylesheets/alchemy/resource_info.scss +1 -1
  64. data/app/assets/stylesheets/alchemy/search.scss +19 -15
  65. data/app/assets/stylesheets/alchemy/selects.scss +63 -32
  66. data/app/assets/stylesheets/alchemy/sitemap.scss +70 -148
  67. data/app/assets/stylesheets/alchemy/tables.scss +16 -59
  68. data/app/assets/stylesheets/alchemy/toolbar.scss +9 -36
  69. data/app/assets/stylesheets/alchemy/trash.scss +8 -0
  70. data/app/assets/stylesheets/alchemy/upload.scss +5 -6
  71. data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss +1 -0
  72. data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +78 -43
  73. data/app/controllers/alchemy/admin/attachments_controller.rb +6 -6
  74. data/app/controllers/alchemy/admin/base_controller.rb +9 -9
  75. data/app/controllers/alchemy/admin/contents_controller.rb +0 -17
  76. data/app/controllers/alchemy/admin/elements_controller.rb +1 -4
  77. data/app/controllers/alchemy/admin/essence_files_controller.rb +1 -3
  78. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +1 -3
  79. data/app/controllers/alchemy/admin/languages_controller.rb +1 -1
  80. data/app/controllers/alchemy/admin/pictures_controller.rb +5 -5
  81. data/app/controllers/alchemy/admin/resources_controller.rb +10 -10
  82. data/app/controllers/alchemy/admin/tags_controller.rb +7 -7
  83. data/app/controllers/alchemy/api/contents_controller.rb +6 -1
  84. data/app/controllers/alchemy/api/elements_controller.rb +5 -1
  85. data/app/controllers/alchemy/api/pages_controller.rb +6 -1
  86. data/app/controllers/alchemy/base_controller.rb +5 -3
  87. data/app/controllers/alchemy/pages_controller.rb +1 -1
  88. data/app/helpers/alchemy/admin/base_helper.rb +14 -15
  89. data/app/helpers/alchemy/admin/contents_helper.rb +1 -2
  90. data/app/helpers/alchemy/admin/elements_helper.rb +7 -6
  91. data/app/helpers/alchemy/admin/tags_helper.rb +3 -4
  92. data/app/helpers/alchemy/base_helper.rb +35 -5
  93. data/app/helpers/alchemy/elements_helper.rb +2 -2
  94. data/app/helpers/alchemy/pages_helper.rb +4 -2
  95. data/app/models/alchemy/attachment.rb +14 -23
  96. data/app/models/alchemy/base_record.rb +13 -0
  97. data/app/models/alchemy/cell.rb +1 -1
  98. data/app/models/alchemy/content.rb +1 -2
  99. data/app/models/alchemy/content/factory.rb +1 -1
  100. data/app/models/alchemy/element.rb +10 -12
  101. data/app/models/alchemy/essence_boolean.rb +1 -1
  102. data/app/models/alchemy/essence_date.rb +2 -2
  103. data/app/models/alchemy/essence_file.rb +1 -1
  104. data/app/models/alchemy/essence_html.rb +1 -1
  105. data/app/models/alchemy/essence_link.rb +1 -1
  106. data/app/models/alchemy/essence_picture.rb +1 -1
  107. data/app/models/alchemy/essence_richtext.rb +1 -1
  108. data/app/models/alchemy/essence_select.rb +1 -1
  109. data/app/models/alchemy/essence_text.rb +1 -1
  110. data/app/models/alchemy/folded_page.rb +1 -1
  111. data/app/models/alchemy/language.rb +21 -5
  112. data/app/models/alchemy/page.rb +17 -5
  113. data/app/models/alchemy/page/page_elements.rb +14 -2
  114. data/app/models/alchemy/page/page_naming.rb +17 -4
  115. data/app/models/alchemy/picture.rb +4 -7
  116. data/app/models/alchemy/site.rb +3 -3
  117. data/app/models/alchemy/tag.rb +3 -3
  118. data/app/models/concerns/alchemy/content_touching.rb +23 -0
  119. data/app/serializers/alchemy/element_serializer.rb +2 -0
  120. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -1
  121. data/app/views/alchemy/admin/attachments/_attachment.html.erb +11 -21
  122. data/app/views/alchemy/admin/attachments/_files_list.html.erb +26 -29
  123. data/app/views/alchemy/admin/attachments/_filter_bar.html.erb +2 -3
  124. data/app/views/alchemy/admin/attachments/_overlay_file_list.html.erb +3 -4
  125. data/app/views/alchemy/admin/attachments/_replace_button.html.erb +2 -3
  126. data/app/views/alchemy/admin/attachments/_tag_list.html.erb +3 -3
  127. data/app/views/alchemy/admin/attachments/destroy.js.erb +1 -1
  128. data/app/views/alchemy/admin/attachments/edit.html.erb +2 -2
  129. data/app/views/alchemy/admin/attachments/index.html.erb +3 -2
  130. data/app/views/alchemy/admin/attachments/show.html.erb +7 -8
  131. data/app/views/alchemy/admin/clipboard/clear.js.erb +1 -1
  132. data/app/views/alchemy/admin/clipboard/index.html.erb +23 -7
  133. data/app/views/alchemy/admin/clipboard/insert.js.erb +1 -1
  134. data/app/views/alchemy/admin/clipboard/remove.js.erb +2 -2
  135. data/app/views/alchemy/admin/contents/create.js.erb +1 -1
  136. data/app/views/alchemy/admin/dashboard/_locked_pages.html.erb +9 -6
  137. data/app/views/alchemy/admin/dashboard/_recent_pages.html.erb +6 -4
  138. data/app/views/alchemy/admin/dashboard/_sites.html.erb +4 -2
  139. data/app/views/alchemy/admin/dashboard/_users.html.erb +6 -4
  140. data/app/views/alchemy/admin/dashboard/index.html.erb +3 -3
  141. data/app/views/alchemy/admin/dashboard/info.html.erb +6 -7
  142. data/app/views/alchemy/admin/elements/_add_picture.html.erb +1 -1
  143. data/app/views/alchemy/admin/elements/_element.html.erb +1 -1
  144. data/app/views/alchemy/admin/elements/_element_header.html.erb +14 -14
  145. data/app/views/alchemy/admin/elements/_element_toolbar.html.erb +3 -3
  146. data/app/views/alchemy/admin/elements/_new_element_form.html.erb +2 -3
  147. data/app/views/alchemy/admin/elements/index.html.erb +2 -4
  148. data/app/views/alchemy/admin/elements/new.html.erb +1 -2
  149. data/app/views/alchemy/admin/elements/publish.js.erb +5 -5
  150. data/app/views/alchemy/admin/languages/_language.html.erb +4 -9
  151. data/app/views/alchemy/admin/languages/_table.html.erb +1 -1
  152. data/app/views/alchemy/admin/languages/index.html.erb +1 -1
  153. data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb +5 -5
  154. data/app/views/alchemy/admin/layoutpages/index.html.erb +5 -4
  155. data/app/views/alchemy/admin/leave.html.erb +1 -1
  156. data/app/views/alchemy/admin/legacy_page_urls/_legacy_page_url.html.erb +1 -1
  157. data/app/views/alchemy/admin/legacy_page_urls/_new.html.erb +1 -1
  158. data/app/views/alchemy/admin/pages/_form.html.erb +1 -1
  159. data/app/views/alchemy/admin/pages/_locked_page.html.erb +1 -1
  160. data/app/views/alchemy/admin/pages/_page.html.erb +31 -23
  161. data/app/views/alchemy/admin/pages/_page_for_links.html.erb +5 -5
  162. data/app/views/alchemy/admin/pages/_page_infos.html.erb +3 -3
  163. data/app/views/alchemy/admin/pages/_publication_fields.html.erb +1 -1
  164. data/app/views/alchemy/admin/pages/edit.html.erb +22 -21
  165. data/app/views/alchemy/admin/pages/index.html.erb +5 -21
  166. data/app/views/alchemy/admin/pages/info.html.erb +5 -5
  167. data/app/views/alchemy/admin/pages/sort.html.erb +1 -1
  168. data/app/views/alchemy/admin/pages/unlock.js.erb +2 -4
  169. data/app/views/alchemy/admin/partials/_flash.html.erb +1 -1
  170. data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb +7 -3
  171. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -2
  172. data/app/views/alchemy/admin/partials/_search_form.html.erb +3 -3
  173. data/app/views/alchemy/admin/pictures/_archive.html.erb +19 -17
  174. data/app/views/alchemy/admin/pictures/_archive_overlay.html.erb +1 -1
  175. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +13 -13
  176. data/app/views/alchemy/admin/pictures/_filter_bar.html.erb +2 -3
  177. data/app/views/alchemy/admin/pictures/_form.html.erb +3 -3
  178. data/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb +2 -3
  179. data/app/views/alchemy/admin/pictures/_picture.html.erb +7 -7
  180. data/app/views/alchemy/admin/pictures/_tag_list.html.erb +3 -3
  181. data/app/views/alchemy/admin/pictures/edit_multiple.html.erb +6 -7
  182. data/app/views/alchemy/admin/pictures/index.html.erb +12 -12
  183. data/app/views/alchemy/admin/pictures/index.js.erb +0 -1
  184. data/app/views/alchemy/admin/pictures/show.html.erb +9 -9
  185. data/app/views/alchemy/admin/resources/_filter_bar.html.erb +2 -3
  186. data/app/views/alchemy/admin/resources/_form.html.erb +10 -2
  187. data/app/views/alchemy/admin/resources/_resource.html.erb +9 -14
  188. data/app/views/alchemy/admin/resources/_table.html.erb +1 -1
  189. data/app/views/alchemy/admin/resources/_tag_list.html.erb +4 -4
  190. data/app/views/alchemy/admin/resources/index.html.erb +2 -3
  191. data/app/views/alchemy/admin/sites/index.html.erb +1 -1
  192. data/app/views/alchemy/admin/tags/_tag.html.erb +7 -11
  193. data/app/views/alchemy/admin/tags/index.html.erb +4 -4
  194. data/app/views/alchemy/admin/trash/index.html.erb +2 -3
  195. data/app/views/alchemy/admin/uploader/_button.html.erb +1 -2
  196. data/app/views/alchemy/base/500.html.erb +1 -1
  197. data/app/views/alchemy/base/permission_denied.js.erb +1 -1
  198. data/app/views/alchemy/base/redirect.js.erb +1 -2
  199. data/app/views/alchemy/elements/_editor_not_found.html.erb +2 -3
  200. data/app/views/alchemy/essences/_essence_date_editor.html.erb +1 -1
  201. data/app/views/alchemy/essences/_essence_file_editor.html.erb +7 -11
  202. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +9 -7
  203. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +1 -1
  204. data/app/views/alchemy/pages/_meta_data.html.erb +1 -1
  205. data/app/views/kaminari/alchemy/_first_page.html.erb +7 -3
  206. data/app/views/kaminari/alchemy/_gap.html.erb +1 -1
  207. data/app/views/kaminari/alchemy/_last_page.html.erb +7 -3
  208. data/app/views/kaminari/alchemy/_next_page.html.erb +4 -2
  209. data/app/views/kaminari/alchemy/_page.html.erb +1 -1
  210. data/app/views/kaminari/alchemy/_prev_page.html.erb +4 -2
  211. data/app/views/layouts/alchemy/admin.html.erb +8 -6
  212. data/bin/rails +2 -2
  213. data/bin/rspec +1 -1
  214. data/config/alchemy/config.yml +0 -2
  215. data/config/alchemy/modules.yml +5 -5
  216. data/config/initializers/simple_form.rb +45 -8
  217. data/config/locales/alchemy.en.yml +66 -179
  218. data/config/routes.rb +1 -1
  219. data/db/migrate/20180226123013_alchemy_four_point_zero.rb +392 -0
  220. data/db/migrate/20180227224537_migrate_tags_to_gutentag.rb +41 -0
  221. data/lib/alchemy/config.rb +0 -2
  222. data/lib/alchemy/engine.rb +5 -9
  223. data/lib/alchemy/essence.rb +6 -6
  224. data/lib/alchemy/filetypes.rb +13 -1
  225. data/lib/alchemy/forms/builder.rb +5 -3
  226. data/lib/alchemy/i18n.rb +8 -6
  227. data/lib/alchemy/modules.rb +1 -1
  228. data/lib/alchemy/name_conversions.rb +0 -2
  229. data/lib/alchemy/page_layout.rb +3 -2
  230. data/lib/alchemy/paths.rb +5 -5
  231. data/lib/alchemy/resource.rb +9 -9
  232. data/lib/alchemy/resources_helper.rb +11 -15
  233. data/lib/alchemy/routing_constraints.rb +2 -2
  234. data/lib/alchemy/shell.rb +0 -1
  235. data/lib/alchemy/taggable.rb +40 -0
  236. data/lib/alchemy/tasks/tidy.rb +1 -9
  237. data/lib/alchemy/test_support/factories/content_factory.rb +10 -0
  238. data/lib/alchemy/test_support/factories/element_factory.rb +5 -0
  239. data/lib/alchemy/test_support/shared_contexts.rb +1 -1
  240. data/lib/alchemy/tinymce.rb +2 -2
  241. data/lib/alchemy/upgrader/four_point_one.rb +42 -0
  242. data/lib/alchemy/upgrader/tasks/harden_acts_as_taggable_on_migrations.rb +27 -0
  243. data/lib/alchemy/version.rb +1 -1
  244. data/lib/alchemy_cms.rb +2 -3
  245. data/lib/rails/generators/alchemy/elements/elements_generator.rb +2 -2
  246. data/lib/rails/generators/alchemy/essence/essence_generator.rb +1 -1
  247. data/lib/rails/generators/alchemy/install/install_generator.rb +4 -8
  248. data/lib/rails/generators/alchemy/module/module_generator.rb +1 -1
  249. data/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb +2 -2
  250. data/lib/rails/generators/alchemy/site_layouts/site_layouts_generator.rb +2 -2
  251. data/lib/rails/generators/alchemy/views/views_generator.rb +1 -1
  252. data/lib/tasks/alchemy/db.rake +2 -1
  253. data/lib/tasks/alchemy/tidy.rake +0 -6
  254. data/lib/tasks/alchemy/upgrade.rake +11 -144
  255. data/vendor/assets/fonts/fa-regular-400.eot +0 -0
  256. data/vendor/assets/fonts/fa-regular-400.svg +363 -0
  257. data/vendor/assets/fonts/fa-regular-400.ttf +0 -0
  258. data/vendor/assets/fonts/fa-regular-400.woff +0 -0
  259. data/vendor/assets/fonts/fa-regular-400.woff2 +0 -0
  260. data/vendor/assets/fonts/fa-solid-900.eot +0 -0
  261. data/vendor/assets/fonts/fa-solid-900.svg +1413 -0
  262. data/vendor/assets/fonts/fa-solid-900.ttf +0 -0
  263. data/vendor/assets/fonts/fa-solid-900.woff +0 -0
  264. data/vendor/assets/fonts/fa-solid-900.woff2 +0 -0
  265. data/vendor/assets/javascripts/tinymce/license.txt +6 -6
  266. data/vendor/assets/javascripts/tinymce/tinymce.min.js +2 -15
  267. data/vendor/assets/stylesheets/fontawesome/_animated.scss +20 -0
  268. data/vendor/assets/stylesheets/fontawesome/_bordered-pulled.scss +20 -0
  269. data/vendor/assets/stylesheets/fontawesome/_core.scss +16 -0
  270. data/vendor/assets/stylesheets/fontawesome/_fixed-width.scss +6 -0
  271. data/vendor/assets/stylesheets/fontawesome/_icons.scss +792 -0
  272. data/vendor/assets/stylesheets/fontawesome/_larger.scss +23 -0
  273. data/vendor/assets/stylesheets/fontawesome/_list.scss +18 -0
  274. data/vendor/assets/stylesheets/fontawesome/_mixins.scss +57 -0
  275. data/vendor/assets/stylesheets/fontawesome/_rotated-flipped.scss +23 -0
  276. data/vendor/assets/stylesheets/fontawesome/_screen-reader.scss +5 -0
  277. data/vendor/assets/stylesheets/fontawesome/_stacked.scss +31 -0
  278. data/vendor/assets/stylesheets/fontawesome/_variables.scss +805 -0
  279. data/vendor/assets/stylesheets/fontawesome/fa-regular.scss +22 -0
  280. data/vendor/assets/stylesheets/fontawesome/fa-solid.scss +23 -0
  281. data/vendor/assets/stylesheets/fontawesome/fontawesome.scss +16 -0
  282. metadata +78 -112
  283. data/app/assets/fonts/alchemy/icons.eot +0 -0
  284. data/app/assets/fonts/alchemy/icons.svg +0 -33
  285. data/app/assets/fonts/alchemy/icons.ttf +0 -0
  286. data/app/assets/fonts/alchemy/icons.woff +0 -0
  287. data/app/assets/images/alchemy/icons.png +0 -0
  288. data/app/assets/images/alchemy/ui-icons_666666_256x240.png +0 -0
  289. data/app/assets/images/sassy-ie-overlay.png +0 -0
  290. data/app/assets/javascripts/alchemy/alchemy.jquery_loader.js +0 -42
  291. data/app/assets/stylesheets/alchemy/icon-font.scss +0 -75
  292. data/app/assets/stylesheets/alchemy/modules.scss +0 -27
  293. data/app/models/alchemy.rb +0 -7
  294. data/app/views/alchemy/admin/contents/destroy.js.erb +0 -4
  295. data/app/views/alchemy/admin/pictures/flush.js.erb +0 -2
  296. data/config/locales/alchemy.de.yml +0 -932
  297. data/config/locales/alchemy.es.yml +0 -960
  298. data/config/locales/alchemy.fr.yml +0 -938
  299. data/config/locales/alchemy.it.yml +0 -938
  300. data/config/locales/alchemy.nl.yml +0 -918
  301. data/config/locales/alchemy.ru.yml +0 -830
  302. data/config/locales/simple_form.de.yml +0 -26
  303. data/config/locales/simple_form.en.yml +0 -25
  304. data/config/locales/simple_form.es.yml +0 -6
  305. data/config/locales/simple_form.fr.yml +0 -26
  306. data/config/locales/simple_form.it.yml +0 -25
  307. data/config/locales/simple_form.nl.yml +0 -25
  308. data/config/locales/simple_form.ru.yml +0 -25
  309. data/db/migrate/20130827094554_alchemy_two_point_six.rb +0 -378
  310. data/db/migrate/20130828121054_remove_do_not_index_from_alchemy_essence_texts.rb +0 -5
  311. data/db/migrate/20130828121120_remove_do_not_index_from_alchemy_essence_richtexts.rb +0 -5
  312. data/db/migrate/20130918201742_add_published_at_to_alchemy_pages.rb +0 -5
  313. data/db/migrate/20150608204610_add_parent_element_id_to_alchemy_elements.rb +0 -6
  314. data/db/migrate/20150729151825_add_link_text_to_alchemy_essence_files.rb +0 -5
  315. data/db/migrate/20150906195818_add_locale_to_alchemy_languages.rb +0 -7
  316. data/db/migrate/20160108174834_add_timebased_publishing_columns_to_pages.rb +0 -32
  317. data/db/migrate/20160422195310_add_image_file_format_to_alchemy_pictures.rb +0 -9
  318. data/db/migrate/20160617224938_change_alchemy_pages_locked_to_locked_at.rb +0 -22
  319. data/db/migrate/20160912223112_add_index_to_alchemy_pages_rgt.rb +0 -9
  320. data/db/migrate/20160927205604_add_foreign_key_indices_and_null_constraints.rb +0 -20
  321. data/db/migrate/20160928080104_add_foreign_keys.rb +0 -27
  322. data/lib/alchemy/touching.rb +0 -42
  323. data/lib/alchemy/upgrader/tasks/available_contents_upgrader.rb +0 -161
  324. data/lib/alchemy/upgrader/tasks/install_asset_manifests.rb +0 -15
  325. data/lib/alchemy/upgrader/tasks/install_dragonfly_config.rb +0 -14
  326. data/lib/alchemy/upgrader/tasks/nestable_elements_migration.rb +0 -71
  327. data/lib/alchemy/upgrader/tasks/three_point_two_task.rb +0 -31
  328. data/lib/alchemy/upgrader/three_point_five.rb +0 -32
  329. data/lib/alchemy/upgrader/three_point_four.rb +0 -52
  330. data/lib/alchemy/upgrader/three_point_one.rb +0 -54
  331. data/lib/alchemy/upgrader/three_point_three.rb +0 -50
  332. data/lib/alchemy/upgrader/three_point_two.rb +0 -40
  333. data/lib/alchemy/upgrader/three_point_zero.rb +0 -92
  334. data/vendor/assets/javascripts/jquery_plugins/jquery.floatThead.min.js +0 -3
  335. data/vendor/assets/javascripts/tinymce/langs/de.js +0 -219
  336. data/vendor/assets/javascripts/tinymce/langs/es.js +0 -219
  337. data/vendor/assets/javascripts/tinymce/langs/fr.js +0 -219
  338. data/vendor/assets/javascripts/tinymce/langs/it.js +0 -219
  339. data/vendor/assets/javascripts/tinymce/langs/nl.js +0 -219
  340. data/vendor/assets/javascripts/tinymce/langs/ru.js +0 -219
@@ -41,7 +41,7 @@ $image-overlay-transition-easing: ease-in;
41
41
  .picture-overlay-handle {
42
42
  right: 0;
43
43
 
44
- .icon-angle-double-right {
44
+ .icon {
45
45
  transform: rotate(180deg) translate(50%, 50%);
46
46
  }
47
47
  }
@@ -66,8 +66,8 @@ $image-overlay-transition-easing: ease-in;
66
66
  cursor: pointer;
67
67
  transition: right $image-overlay-transition-duration $image-overlay-transition-easing;
68
68
 
69
- .icon.close.small {
70
- font-size: 32px;
69
+ .icon {
70
+ font-size: 2em;
71
71
  color: $medium-gray;
72
72
  text-shadow: 0 0 $default-padding $text-color;
73
73
  transition: color $image-overlay-transition-duration linear;
@@ -121,12 +121,12 @@ $image-overlay-transition-easing: ease-in;
121
121
  right: $image-overlay-form-width;
122
122
  cursor: pointer;
123
123
 
124
- .icon-angle-double-right {
124
+ .icon {
125
125
  position: absolute;
126
126
  top: 50%;
127
127
  left: 50%;
128
128
  transform: translate(-50%, -50%);
129
- font-size: 14px;
129
+ font-size: 1.2em;
130
130
  color: $text-color;
131
131
  transition: transform $image-overlay-transition-duration $image-overlay-transition-easing;
132
132
  }
@@ -224,20 +224,19 @@ $image-overlay-transition-easing: ease-in;
224
224
  &:hover {
225
225
  background-color: rgba(0,0,0, 0.3);
226
226
 
227
- .icon-angle-left,
228
- .icon-angle-right {
227
+ .icon {
229
228
  color: $white;
230
229
  text-shadow: none;
231
230
  }
232
231
  }
233
232
  }
234
233
 
235
- .icon-angle-left,
236
- .icon-angle-right {
237
- font-size: 48px;
234
+ .icon {
235
+ font-size: 4em;
238
236
  color: $medium-gray;
239
237
  text-shadow: 0 0 $default-padding $text-color;
240
238
  transition: all $image-overlay-transition-duration linear;
239
+ vertical-align: middle;
241
240
  }
242
241
 
243
242
  .previous-picture {
@@ -74,18 +74,6 @@
74
74
  cursor: default !important;
75
75
  }
76
76
 
77
- /* Icons
78
- ----------------------------------*/
79
-
80
- /* states and images */
81
-
82
- .ui-icon {
83
- display: block;
84
- text-indent: -99999px;
85
- overflow: hidden;
86
- background-repeat: no-repeat;
87
- }
88
-
89
77
  /* Misc visuals
90
78
  ----------------------------------*/
91
79
 
@@ -116,7 +104,7 @@
116
104
  ----------------------------------*/
117
105
 
118
106
  .ui-widget {
119
- font-family: $default-font-face;
107
+ font-family: $default-font-family;
120
108
  font-size: $default-font-size;
121
109
  }
122
110
 
@@ -130,12 +118,6 @@
130
118
  color: $text-color;
131
119
  }
132
120
 
133
- .ui-widget-content a {
134
- color: $text-color;
135
-
136
- &:hover { color: #000 }
137
- }
138
-
139
121
  .ui-widget-header {
140
122
  border: 1px none #afafaf;
141
123
  background: $light-blue;
@@ -149,10 +131,6 @@
149
131
  border-bottom-right-radius: 0;
150
132
  }
151
133
 
152
- .ui-widget-header a {
153
- color: $text-color;
154
- }
155
-
156
134
  /* Interaction states
157
135
  ----------------------------------*/
158
136
 
@@ -161,7 +139,6 @@
161
139
  background-color: #ededed;
162
140
  font-weight: normal;
163
141
  color: $text-color;
164
- text-shadow: $button-text-shadow;
165
142
  }
166
143
 
167
144
  .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited {
@@ -253,790 +230,6 @@
253
230
  background-image: none;
254
231
  }
255
232
 
256
- /* Icons
257
- ----------------------------------*/
258
-
259
- /* states and images */
260
-
261
- .ui-icon {
262
- width: 16px;
263
- height: 16px;
264
- background-image: image-url('alchemy/ui-icons_666666_256x240.png');
265
- }
266
-
267
- .ui-widget-content .ui-icon {
268
- background-image: image-url('alchemy/ui-icons_666666_256x240.png');
269
- }
270
-
271
- .ui-widget-header .ui-icon {
272
- background-image: image-url('alchemy/ui-icons_666666_256x240.png');
273
- }
274
-
275
- .ui-state-default .ui-icon {
276
- background-image: image-url('alchemy/ui-icons_666666_256x240.png');
277
- }
278
-
279
- .ui-state-hover .ui-icon, .ui-state-focus .ui-icon {
280
- background-image: image-url('alchemy/ui-icons_666666_256x240.png');
281
- }
282
-
283
- .ui-state-active .ui-icon {
284
- background-image: image-url('alchemy/ui-icons_666666_256x240.png');
285
- }
286
-
287
- .ui-state-highlight .ui-icon {
288
- background-image: image-url('alchemy/ui-icons_666666_256x240.png');
289
- }
290
-
291
- .ui-state-error .ui-icon, .ui-state-error-text .ui-icon {
292
- background-image: image-url('alchemy/ui-icons_666666_256x240.png');
293
- }
294
-
295
- /* positioning */
296
-
297
- .ui-icon-carat-1-n {
298
- background-position: 0 0;
299
- }
300
-
301
- .ui-icon-carat-1-ne {
302
- background-position: -16px 0;
303
- }
304
-
305
- .ui-icon-carat-1-e {
306
- background-position: -32px 0;
307
- }
308
-
309
- .ui-icon-carat-1-se {
310
- background-position: -48px 0;
311
- }
312
-
313
- .ui-icon-carat-1-s {
314
- background-position: -64px 0;
315
- }
316
-
317
- .ui-icon-carat-1-sw {
318
- background-position: -80px 0;
319
- }
320
-
321
- .ui-icon-carat-1-w {
322
- background-position: -96px 0;
323
- }
324
-
325
- .ui-icon-carat-1-nw {
326
- background-position: -112px 0;
327
- }
328
-
329
- .ui-icon-carat-2-n-s {
330
- background-position: -128px 0;
331
- }
332
-
333
- .ui-icon-carat-2-e-w {
334
- background-position: -144px 0;
335
- }
336
-
337
- .ui-icon-triangle-1-n {
338
- background-position: 0 -16px;
339
- }
340
-
341
- .ui-icon-triangle-1-ne {
342
- background-position: -16px -16px;
343
- }
344
-
345
- .ui-icon-triangle-1-e {
346
- background-position: -32px -16px;
347
- }
348
-
349
- .ui-icon-triangle-1-se {
350
- background-position: -48px -16px;
351
- }
352
-
353
- .ui-icon-triangle-1-s {
354
- background-position: -64px -16px;
355
- }
356
-
357
- .ui-icon-triangle-1-sw {
358
- background-position: -80px -16px;
359
- }
360
-
361
- .ui-icon-triangle-1-w {
362
- background-position: -96px -16px;
363
- }
364
-
365
- .ui-icon-triangle-1-nw {
366
- background-position: -112px -16px;
367
- }
368
-
369
- .ui-icon-triangle-2-n-s {
370
- background-position: -128px -16px;
371
- }
372
-
373
- .ui-icon-triangle-2-e-w {
374
- background-position: -144px -16px;
375
- }
376
-
377
- .ui-icon-arrow-1-n {
378
- background-position: 0 -32px;
379
- }
380
-
381
- .ui-icon-arrow-1-ne {
382
- background-position: -16px -32px;
383
- }
384
-
385
- .ui-icon-arrow-1-e {
386
- background-position: -32px -32px;
387
- }
388
-
389
- .ui-icon-arrow-1-se {
390
- background-position: -48px -32px;
391
- }
392
-
393
- .ui-icon-arrow-1-s {
394
- background-position: -64px -32px;
395
- }
396
-
397
- .ui-icon-arrow-1-sw {
398
- background-position: -80px -32px;
399
- }
400
-
401
- .ui-icon-arrow-1-w {
402
- background-position: -96px -32px;
403
- }
404
-
405
- .ui-icon-arrow-1-nw {
406
- background-position: -112px -32px;
407
- }
408
-
409
- .ui-icon-arrow-2-n-s {
410
- background-position: -128px -32px;
411
- }
412
-
413
- .ui-icon-arrow-2-ne-sw {
414
- background-position: -144px -32px;
415
- }
416
-
417
- .ui-icon-arrow-2-e-w {
418
- background-position: -160px -32px;
419
- }
420
-
421
- .ui-icon-arrow-2-se-nw {
422
- background-position: -176px -32px;
423
- }
424
-
425
- .ui-icon-arrowstop-1-n {
426
- background-position: -192px -32px;
427
- }
428
-
429
- .ui-icon-arrowstop-1-e {
430
- background-position: -208px -32px;
431
- }
432
-
433
- .ui-icon-arrowstop-1-s {
434
- background-position: -224px -32px;
435
- }
436
-
437
- .ui-icon-arrowstop-1-w {
438
- background-position: -240px -32px;
439
- }
440
-
441
- .ui-icon-arrowthick-1-n {
442
- background-position: 0 -48px;
443
- }
444
-
445
- .ui-icon-arrowthick-1-ne {
446
- background-position: -16px -48px;
447
- }
448
-
449
- .ui-icon-arrowthick-1-e {
450
- background-position: -32px -48px;
451
- }
452
-
453
- .ui-icon-arrowthick-1-se {
454
- background-position: -48px -48px;
455
- }
456
-
457
- .ui-icon-arrowthick-1-s {
458
- background-position: -64px -48px;
459
- }
460
-
461
- .ui-icon-arrowthick-1-sw {
462
- background-position: -80px -48px;
463
- }
464
-
465
- .ui-icon-arrowthick-1-w {
466
- background-position: -96px -48px;
467
- }
468
-
469
- .ui-icon-arrowthick-1-nw {
470
- background-position: -112px -48px;
471
- }
472
-
473
- .ui-icon-arrowthick-2-n-s {
474
- background-position: -128px -48px;
475
- }
476
-
477
- .ui-icon-arrowthick-2-ne-sw {
478
- background-position: -144px -48px;
479
- }
480
-
481
- .ui-icon-arrowthick-2-e-w {
482
- background-position: -160px -48px;
483
- }
484
-
485
- .ui-icon-arrowthick-2-se-nw {
486
- background-position: -176px -48px;
487
- }
488
-
489
- .ui-icon-arrowthickstop-1-n {
490
- background-position: -192px -48px;
491
- }
492
-
493
- .ui-icon-arrowthickstop-1-e {
494
- background-position: -208px -48px;
495
- }
496
-
497
- .ui-icon-arrowthickstop-1-s {
498
- background-position: -224px -48px;
499
- }
500
-
501
- .ui-icon-arrowthickstop-1-w {
502
- background-position: -240px -48px;
503
- }
504
-
505
- .ui-icon-arrowreturnthick-1-w {
506
- background-position: 0 -64px;
507
- }
508
-
509
- .ui-icon-arrowreturnthick-1-n {
510
- background-position: -16px -64px;
511
- }
512
-
513
- .ui-icon-arrowreturnthick-1-e {
514
- background-position: -32px -64px;
515
- }
516
-
517
- .ui-icon-arrowreturnthick-1-s {
518
- background-position: -48px -64px;
519
- }
520
-
521
- .ui-icon-arrowreturn-1-w {
522
- background-position: -64px -64px;
523
- }
524
-
525
- .ui-icon-arrowreturn-1-n {
526
- background-position: -80px -64px;
527
- }
528
-
529
- .ui-icon-arrowreturn-1-e {
530
- background-position: -96px -64px;
531
- }
532
-
533
- .ui-icon-arrowreturn-1-s {
534
- background-position: -112px -64px;
535
- }
536
-
537
- .ui-icon-arrowrefresh-1-w {
538
- background-position: -128px -64px;
539
- }
540
-
541
- .ui-icon-arrowrefresh-1-n {
542
- background-position: -144px -64px;
543
- }
544
-
545
- .ui-icon-arrowrefresh-1-e {
546
- background-position: -160px -64px;
547
- }
548
-
549
- .ui-icon-arrowrefresh-1-s {
550
- background-position: -176px -64px;
551
- }
552
-
553
- .ui-icon-arrow-4 {
554
- background-position: 0 -80px;
555
- }
556
-
557
- .ui-icon-arrow-4-diag {
558
- background-position: -16px -80px;
559
- }
560
-
561
- .ui-icon-extlink {
562
- background-position: -32px -80px;
563
- }
564
-
565
- .ui-icon-newwin {
566
- background-position: -48px -80px;
567
- }
568
-
569
- .ui-icon-refresh {
570
- background: none !important;
571
- @extend .icon-ccw;
572
-
573
- &:before {
574
- text-indent: 0;
575
- position: absolute;
576
- right: 4px;
577
- top: 3px;
578
- }
579
- }
580
-
581
- .ui-icon-fullscreen {
582
- background: none !important;
583
- position: relative;
584
- @extend .icon-fullscreen;
585
-
586
- &:before {
587
- text-indent: 0;
588
- position: absolute;
589
- right: 2px;
590
- top: 2px;
591
- font-size: 10px;
592
- }
593
- }
594
-
595
- .ui-icon-exit-fullscreen {
596
- background: none !important;
597
- position: relative;
598
- @extend .icon-fullscreen-exit;
599
-
600
- &:before {
601
- text-indent: 0;
602
- position: absolute;
603
- right: 1px;
604
- top: 2px;
605
- }
606
- }
607
-
608
- .ui-icon-shuffle {
609
- background-position: -80px -80px;
610
- }
611
-
612
- .ui-icon-transfer-e-w {
613
- background-position: -96px -80px;
614
- }
615
-
616
- .ui-icon-transferthick-e-w {
617
- background-position: -112px -80px;
618
- }
619
-
620
- .ui-icon-folder-collapsed {
621
- background-position: 0 -96px;
622
- }
623
-
624
- .ui-icon-folder-open {
625
- background-position: -16px -96px;
626
- }
627
-
628
- .ui-icon-document {
629
- background-position: -32px -96px;
630
- }
631
-
632
- .ui-icon-document-b {
633
- background-position: -48px -96px;
634
- }
635
-
636
- .ui-icon-note {
637
- background-position: -64px -96px;
638
- }
639
-
640
- .ui-icon-mail-closed {
641
- background-position: -80px -96px;
642
- }
643
-
644
- .ui-icon-mail-open {
645
- background-position: -96px -96px;
646
- }
647
-
648
- .ui-icon-suitcase {
649
- background-position: -112px -96px;
650
- }
651
-
652
- .ui-icon-comment {
653
- background-position: -128px -96px;
654
- }
655
-
656
- .ui-icon-person {
657
- background-position: -144px -96px;
658
- }
659
-
660
- .ui-icon-print {
661
- background-position: -160px -96px;
662
- }
663
-
664
- .ui-icon-trash {
665
- background-position: -176px -96px;
666
- }
667
-
668
- .ui-icon-locked {
669
- background-position: -192px -96px;
670
- }
671
-
672
- .ui-icon-unlocked {
673
- background-position: -208px -96px;
674
- }
675
-
676
- .ui-icon-bookmark {
677
- background-position: -224px -96px;
678
- }
679
-
680
- .ui-icon-tag {
681
- background-position: -240px -96px;
682
- }
683
-
684
- .ui-icon-home {
685
- background-position: 0 -112px;
686
- }
687
-
688
- .ui-icon-flag {
689
- background-position: -16px -112px;
690
- }
691
-
692
- .ui-icon-calendar {
693
- background-position: -32px -112px;
694
- }
695
-
696
- .ui-icon-cart {
697
- background-position: -48px -112px;
698
- }
699
-
700
- .ui-icon-pencil {
701
- background-position: -64px -112px;
702
- }
703
-
704
- .ui-icon-clock {
705
- background-position: -80px -112px;
706
- }
707
-
708
- .ui-icon-disk {
709
- background-position: -96px -112px;
710
- }
711
-
712
- .ui-icon-calculator {
713
- background-position: -112px -112px;
714
- }
715
-
716
- .ui-icon-zoomin {
717
- background-position: -128px -112px;
718
- }
719
-
720
- .ui-icon-zoomout {
721
- background-position: -144px -112px;
722
- }
723
-
724
- .ui-icon-search {
725
- background-position: -160px -112px;
726
- }
727
-
728
- .ui-icon-wrench {
729
- background-position: -176px -112px;
730
- }
731
-
732
- .ui-icon-gear {
733
- background-position: -192px -112px;
734
- }
735
-
736
- .ui-icon-heart {
737
- background-position: -208px -112px;
738
- }
739
-
740
- .ui-icon-star {
741
- background-position: -224px -112px;
742
- }
743
-
744
- .ui-icon-link {
745
- background-position: -240px -112px;
746
- }
747
-
748
- .ui-icon-cancel {
749
- background-position: 0 -128px;
750
- }
751
-
752
- .ui-icon-plus {
753
- background-position: -16px -128px;
754
- }
755
-
756
- .ui-icon-plusthick {
757
- background-position: -32px -128px;
758
- }
759
-
760
- .ui-icon-minus {
761
- background-position: -48px -128px;
762
- }
763
-
764
- .ui-icon-minusthick {
765
- background-position: -64px -128px;
766
- }
767
-
768
- .ui-icon-close {
769
- background-position: -80px -128px;
770
- }
771
-
772
- .ui-icon-closethick {
773
- background: none !important;
774
- position: relative;
775
- @extend .icon-cross;
776
-
777
- &:before {
778
- text-indent: 0;
779
- position: absolute;
780
- left: 1px;
781
- top: 3px;
782
- font-size: 16px;
783
- }
784
- }
785
-
786
- .ui-icon-key {
787
- background-position: -112px -128px;
788
- }
789
-
790
- .ui-icon-lightbulb {
791
- background-position: -128px -128px;
792
- }
793
-
794
- .ui-icon-scissors {
795
- background-position: -144px -128px;
796
- }
797
-
798
- .ui-icon-clipboard {
799
- background-position: -160px -128px;
800
- }
801
-
802
- .ui-icon-copy {
803
- background-position: -176px -128px;
804
- }
805
-
806
- .ui-icon-contact {
807
- background-position: -192px -128px;
808
- }
809
-
810
- .ui-icon-image {
811
- background-position: -208px -128px;
812
- }
813
-
814
- .ui-icon-video {
815
- background-position: -224px -128px;
816
- }
817
-
818
- .ui-icon-script {
819
- background-position: -240px -128px;
820
- }
821
-
822
- .ui-icon-alert {
823
- background-position: 0 -144px;
824
- }
825
-
826
- .ui-icon-info {
827
- background-position: -16px -144px;
828
- }
829
-
830
- .ui-icon-notice {
831
- background-position: -32px -144px;
832
- }
833
-
834
- .ui-icon-help {
835
- background-position: -48px -144px;
836
- }
837
-
838
- .ui-icon-check {
839
- background-position: -64px -144px;
840
- }
841
-
842
- .ui-icon-bullet {
843
- background-position: -80px -144px;
844
- }
845
-
846
- .ui-icon-radio-off {
847
- background-position: -96px -144px;
848
- }
849
-
850
- .ui-icon-radio-on {
851
- background-position: -112px -144px;
852
- }
853
-
854
- .ui-icon-pin-w {
855
- background-position: -128px -144px;
856
- }
857
-
858
- .ui-icon-pin-s {
859
- background-position: -144px -144px;
860
- }
861
-
862
- .ui-icon-play {
863
- background-position: 0 -160px;
864
- }
865
-
866
- .ui-icon-pause {
867
- background-position: -16px -160px;
868
- }
869
-
870
- .ui-icon-seek-next {
871
- background-position: -32px -160px;
872
- }
873
-
874
- .ui-icon-seek-prev {
875
- background-position: -48px -160px;
876
- }
877
-
878
- .ui-icon-seek-end {
879
- background-position: -64px -160px;
880
- }
881
-
882
- .ui-icon-seek-start {
883
- background-position: -80px -160px;
884
- }
885
-
886
- /* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
887
-
888
- .ui-icon-seek-first {
889
- background-position: -80px -160px;
890
- }
891
-
892
- .ui-icon-stop {
893
- background-position: -96px -160px;
894
- }
895
-
896
- .ui-icon-eject {
897
- background-position: -112px -160px;
898
- }
899
-
900
- .ui-icon-volume-off {
901
- background-position: -128px -160px;
902
- }
903
-
904
- .ui-icon-volume-on {
905
- background-position: -144px -160px;
906
- }
907
-
908
- .ui-icon-power {
909
- background-position: 0 -176px;
910
- }
911
-
912
- .ui-icon-signal-diag {
913
- background-position: -16px -176px;
914
- }
915
-
916
- .ui-icon-signal {
917
- background-position: -32px -176px;
918
- }
919
-
920
- .ui-icon-battery-0 {
921
- background-position: -48px -176px;
922
- }
923
-
924
- .ui-icon-battery-1 {
925
- background-position: -64px -176px;
926
- }
927
-
928
- .ui-icon-battery-2 {
929
- background-position: -80px -176px;
930
- }
931
-
932
- .ui-icon-battery-3 {
933
- background-position: -96px -176px;
934
- }
935
-
936
- .ui-icon-circle-plus {
937
- background-position: 0 -192px;
938
- }
939
-
940
- .ui-icon-circle-minus {
941
- background-position: -16px -192px;
942
- }
943
-
944
- .ui-icon-circle-close {
945
- background-position: -32px -192px;
946
- }
947
-
948
- .ui-icon-circle-triangle-e {
949
- background-position: -48px -192px;
950
- }
951
-
952
- .ui-icon-circle-triangle-s {
953
- background-position: -64px -192px;
954
- }
955
-
956
- .ui-icon-circle-triangle-w {
957
- background-position: -80px -192px;
958
- }
959
-
960
- .ui-icon-circle-triangle-n {
961
- background-position: -96px -192px;
962
- }
963
-
964
- .ui-icon-circle-arrow-e {
965
- background-position: -112px -192px;
966
- }
967
-
968
- .ui-icon-circle-arrow-s {
969
- background-position: -128px -192px;
970
- }
971
-
972
- .ui-icon-circle-arrow-w {
973
- background-position: -144px -192px;
974
- }
975
-
976
- .ui-icon-circle-arrow-n {
977
- background-position: -160px -192px;
978
- }
979
-
980
- .ui-icon-circle-zoomin {
981
- background-position: -176px -192px;
982
- }
983
-
984
- .ui-icon-circle-zoomout {
985
- background-position: -192px -192px;
986
- }
987
-
988
- .ui-icon-circle-check {
989
- background-position: -208px -192px;
990
- }
991
-
992
- .ui-icon-circlesmall-plus {
993
- background-position: 0 -208px;
994
- }
995
-
996
- .ui-icon-circlesmall-minus {
997
- background-position: -16px -208px;
998
- }
999
-
1000
- .ui-icon-circlesmall-close {
1001
- background-position: -32px -208px;
1002
- }
1003
-
1004
- .ui-icon-squaresmall-plus {
1005
- background-position: -48px -208px;
1006
- }
1007
-
1008
- .ui-icon-squaresmall-minus {
1009
- background-position: -64px -208px;
1010
- }
1011
-
1012
- .ui-icon-squaresmall-close {
1013
- background-position: -80px -208px;
1014
- }
1015
-
1016
- .ui-icon-grip-dotted-vertical {
1017
- background-position: 0 -224px;
1018
- }
1019
-
1020
- .ui-icon-grip-dotted-horizontal {
1021
- background-position: -16px -224px;
1022
- }
1023
-
1024
- .ui-icon-grip-solid-vertical {
1025
- background-position: -32px -224px;
1026
- }
1027
-
1028
- .ui-icon-grip-solid-horizontal {
1029
- background-position: -48px -224px;
1030
- }
1031
-
1032
- .ui-icon-gripsmall-diagonal-se {
1033
- background-position: -64px -224px;
1034
- }
1035
-
1036
- .ui-icon-grip-diagonal-se {
1037
- background-position: -80px -224px;
1038
- }
1039
-
1040
233
  /* Misc visuals
1041
234
  ----------------------------------*/
1042
235
 
@@ -1131,40 +324,41 @@
1131
324
 
1132
325
  .ui-tabs .ui-tabs-nav {
1133
326
  padding: 4px 8px 0;
1134
- background: transparent;
327
+ background: $toolbar-bg-color;
1135
328
  border-radius: 0;
1136
329
  border-bottom: $default-border;
1137
330
  margin: 0;
331
+ padding: 0;
332
+ height: $tabs-height;
1138
333
  }
1139
334
 
1140
335
  .ui-tabs .ui-tabs-nav li {
1141
336
  list-style: none;
1142
337
  float: left;
1143
338
  position: relative;
1144
- top: 1px;
1145
- margin: 0 .2em 1px 0;
339
+ height: $tabs-height - $default-border-width;
340
+ margin: 0;
1146
341
  border-color: $default-border-color;
1147
- border-bottom: 0 !important;
1148
- border-bottom-left-radius: 0;
1149
- border-bottom-right-radius: 0;
342
+ border-width: 0;
343
+ border-right-width: $default-border-width;
344
+ border-radius: 0;
1150
345
  padding: 0;
1151
346
  white-space: nowrap;
1152
- background-color: $medium-gray;
347
+ background-color: transparent;
1153
348
  font-weight: normal;
1154
349
 
1155
350
  &.ui-tabs-active {
1156
351
  background-color: $light-gray;
1157
- margin-bottom: 0px;
1158
- height: 28px;
352
+ height: $tabs-height;
1159
353
 
1160
354
  a { cursor: default }
1161
355
  }
1162
356
  }
1163
357
 
1164
358
  .ui-tabs .ui-tabs-nav li a {
1165
- float: left;
359
+ display: block;
1166
360
  text-decoration: none;
1167
- padding: 6px 12px 5px;
361
+ padding: 8px 12px 7px;
1168
362
  }
1169
363
 
1170
364
  .ui-tabs .ui-tabs-nav li.ui-tabs-selected {
@@ -1195,41 +389,29 @@
1195
389
 
1196
390
  /* UI Tabs Paging */
1197
391
 
392
+ .ui-tabs li.ui-tabs-paging-prev {
393
+ border-right-width: 1px;
394
+ }
395
+
1198
396
  .ui-tabs li.ui-tabs-paging-next {
1199
397
  float: right !important;
1200
398
  padding: 0 !important;
1201
- }
1202
-
1203
- .ui-tabs .ui-tabs-nav .ui-tabs-paging-prev,
1204
- .ui-tabs .ui-tabs-nav .ui-tabs-paging-next {
1205
- height: 26px;
399
+ border-right-width: 0;
1206
400
  }
1207
401
 
1208
402
  .ui-tabs .ui-tabs-nav .ui-tabs-paging-prev a,
1209
403
  .ui-tabs .ui-tabs-nav .ui-tabs-paging-next a {
1210
404
  display: block;
1211
- position: relative;
1212
- top: 1px;
1213
405
  border: 0;
1214
406
  z-index: 2;
1215
- padding: 5px;
1216
- color: #444;
407
+ padding: 8px;
408
+ color: $icon-color;
1217
409
  text-decoration: none;
1218
- background: #eee;
1219
410
  cursor: pointer;
1220
411
  }
1221
412
 
1222
- .ui-tabs .ui-tabs-paging-next a:hover,
1223
- .ui-tabs .ui-tabs-paging-next a:focus,
1224
- .ui-tabs .ui-tabs-paging-next a:active,
1225
- .ui-tabs .ui-tabs-paging-prev a:hover,
1226
- .ui-tabs .ui-tabs-paging-prev a:focus,
1227
- .ui-tabs .ui-tabs-paging-prev a:active {
1228
- background: #eee;
1229
- }
1230
-
1231
413
  .ui-tabs .ui-tabs-nav .ui-tabs-paging-disabled {
1232
- visibility: hidden;
414
+ display: none;
1233
415
  }
1234
416
 
1235
417
  /*