alchemy_cms 3.4.2 → 3.5.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (247) hide show
  1. checksums.yaml +4 -4
  2. data/.codeclimate.yml +9 -3
  3. data/.teatro.yml +1 -0
  4. data/.travis.yml +14 -17
  5. data/CHANGELOG.md +44 -6
  6. data/Gemfile +7 -4
  7. data/README.md +60 -10
  8. data/Rakefile +1 -1
  9. data/alchemy_cms.gemspec +5 -8
  10. data/app/assets/javascripts/alchemy/admin.js +2 -0
  11. data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +1 -0
  12. data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +1 -0
  13. data/app/assets/javascripts/alchemy/alchemy.hotkeys.js.coffee +1 -1
  14. data/app/assets/javascripts/alchemy/alchemy.initializer.js.coffee +9 -7
  15. data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +1 -0
  16. data/app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee +11 -7
  17. data/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee +1 -1
  18. data/app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee +8 -3
  19. data/app/assets/javascripts/alchemy/alchemy.tooltips.coffee +10 -0
  20. data/app/assets/javascripts/alchemy/alchemy.uploader.js.coffee +104 -73
  21. data/app/assets/stylesheets/alchemy/_defaults.scss +1 -4
  22. data/app/assets/stylesheets/alchemy/_extends.scss +13 -35
  23. data/app/assets/stylesheets/alchemy/_mixins.scss +82 -18
  24. data/app/assets/stylesheets/alchemy/_variables.scss +21 -8
  25. data/app/assets/stylesheets/alchemy/admin.scss +4 -0
  26. data/app/assets/stylesheets/alchemy/archive.scss +8 -12
  27. data/app/assets/stylesheets/alchemy/attachments.scss +39 -0
  28. data/app/assets/stylesheets/alchemy/base.scss +26 -15
  29. data/app/assets/stylesheets/alchemy/buttons.scss +59 -31
  30. data/app/assets/stylesheets/alchemy/dashboard.scss +3 -3
  31. data/app/assets/stylesheets/alchemy/dialogs.scss +10 -8
  32. data/app/assets/stylesheets/alchemy/elements.scss +65 -41
  33. data/app/assets/stylesheets/alchemy/errors.scss +7 -0
  34. data/app/assets/stylesheets/alchemy/flash.scss +1 -1
  35. data/app/assets/stylesheets/alchemy/form_fields.scss +0 -37
  36. data/app/assets/stylesheets/alchemy/forms.scss +18 -27
  37. data/app/assets/stylesheets/alchemy/frame.scss +104 -204
  38. data/app/assets/stylesheets/alchemy/hints.scss +62 -0
  39. data/app/assets/stylesheets/alchemy/icon-font.scss +2 -1
  40. data/app/assets/stylesheets/alchemy/icons.scss +9 -4
  41. data/app/assets/stylesheets/alchemy/image_library.scss +6 -6
  42. data/app/assets/stylesheets/alchemy/jquery-ui.scss +6 -4
  43. data/app/assets/stylesheets/alchemy/lists.scss +0 -1
  44. data/app/assets/stylesheets/alchemy/menubar.scss +3 -4
  45. data/app/assets/stylesheets/alchemy/modules.scss +0 -6
  46. data/app/assets/stylesheets/alchemy/navigation.scss +242 -0
  47. data/app/assets/stylesheets/alchemy/pagination.scss +3 -3
  48. data/app/assets/stylesheets/alchemy/print.scss +1 -0
  49. data/app/assets/stylesheets/alchemy/resource_info.scss +45 -0
  50. data/app/assets/stylesheets/alchemy/search.scss +72 -1
  51. data/app/assets/stylesheets/alchemy/selects.scss +38 -44
  52. data/app/assets/stylesheets/alchemy/sitemap.scss +89 -79
  53. data/app/assets/stylesheets/alchemy/tables.scss +6 -10
  54. data/app/assets/stylesheets/alchemy/toolbar.scss +7 -36
  55. data/app/assets/stylesheets/alchemy/upload.scss +12 -3
  56. data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss +6 -3
  57. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce-small.svg +58 -170
  58. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce-small.ttf +0 -0
  59. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce-small.woff +0 -0
  60. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce.svg +124 -148
  61. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce.ttf +0 -0
  62. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce.woff +0 -0
  63. data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +426 -144
  64. data/app/controllers/alchemy/admin/attachments_controller.rb +24 -16
  65. data/app/controllers/alchemy/admin/clipboard_controller.rb +1 -1
  66. data/app/controllers/alchemy/admin/essence_files_controller.rb +1 -1
  67. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +9 -8
  68. data/app/controllers/alchemy/admin/layoutpages_controller.rb +1 -0
  69. data/app/controllers/alchemy/admin/pages_controller.rb +2 -2
  70. data/app/controllers/alchemy/admin/resources_controller.rb +2 -2
  71. data/app/controllers/alchemy/admin/tags_controller.rb +1 -1
  72. data/app/controllers/alchemy/api/pages_controller.rb +16 -0
  73. data/app/controllers/alchemy/messages_controller.rb +1 -1
  74. data/app/controllers/concerns/alchemy/admin/uploader_responses.rb +2 -2
  75. data/app/helpers/alchemy/admin/attachments_helper.rb +11 -0
  76. data/app/helpers/alchemy/admin/base_helper.rb +37 -4
  77. data/app/helpers/alchemy/admin/contents_helper.rb +11 -4
  78. data/app/helpers/alchemy/admin/elements_helper.rb +0 -19
  79. data/app/helpers/alchemy/admin/essences_helper.rb +7 -30
  80. data/app/helpers/alchemy/admin/navigation_helper.rb +13 -51
  81. data/app/helpers/alchemy/admin/pages_helper.rb +21 -16
  82. data/app/helpers/alchemy/admin/pictures_helper.rb +9 -0
  83. data/app/helpers/alchemy/deprecated_pages_helper.rb +54 -0
  84. data/app/helpers/alchemy/essences_helper.rb +1 -1
  85. data/app/helpers/alchemy/pages_helper.rb +8 -109
  86. data/app/helpers/alchemy/url_helper.rb +8 -13
  87. data/app/models/alchemy/attachment.rb +7 -4
  88. data/app/models/alchemy/cell.rb +2 -2
  89. data/app/models/alchemy/content.rb +2 -2
  90. data/app/models/alchemy/content/factory.rb +12 -9
  91. data/app/models/alchemy/element.rb +6 -3
  92. data/app/models/alchemy/essence_file.rb +1 -1
  93. data/app/models/alchemy/essence_picture.rb +37 -47
  94. data/app/models/alchemy/essence_picture_view.rb +8 -1
  95. data/app/models/alchemy/folded_page.rb +3 -2
  96. data/app/models/alchemy/legacy_page_url.rb +3 -3
  97. data/app/models/alchemy/page.rb +50 -5
  98. data/app/models/alchemy/page/fixed_attributes.rb +63 -0
  99. data/app/models/alchemy/page/page_elements.rb +10 -7
  100. data/app/models/alchemy/page/page_natures.rb +19 -0
  101. data/app/models/alchemy/picture.rb +1 -0
  102. data/app/models/alchemy/picture/transformations.rb +1 -1
  103. data/app/models/alchemy/picture/url.rb +82 -0
  104. data/app/serializers/alchemy/page_tree_serializer.rb +29 -8
  105. data/app/views/alchemy/_edit_mode.html.erb +2 -0
  106. data/app/views/alchemy/_menubar.html.erb +1 -1
  107. data/app/views/alchemy/_preview_mode_code.html.erb +6 -0
  108. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -1
  109. data/app/views/alchemy/admin/attachments/_attachment.html.erb +25 -5
  110. data/app/views/alchemy/admin/attachments/_replace_button.html.erb +26 -0
  111. data/app/views/alchemy/admin/attachments/index.html.erb +1 -1
  112. data/app/views/alchemy/admin/attachments/show.html.erb +52 -0
  113. data/app/views/alchemy/admin/elements/_element_header.html.erb +6 -3
  114. data/app/views/alchemy/admin/elements/create.js.erb +0 -2
  115. data/app/views/alchemy/admin/elements/trash.js.erb +0 -1
  116. data/app/views/alchemy/admin/elements/update.js.erb +0 -2
  117. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +1 -4
  118. data/app/views/alchemy/admin/essence_pictures/edit.html.erb +1 -1
  119. data/app/views/alchemy/admin/languages/index.html.erb +1 -0
  120. data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb +26 -27
  121. data/app/views/alchemy/admin/layoutpages/edit.html.erb +1 -1
  122. data/app/views/alchemy/admin/pages/_form.html.erb +13 -40
  123. data/app/views/alchemy/admin/pages/_locked_page.html.erb +1 -1
  124. data/app/views/alchemy/admin/pages/_page.html.erb +119 -61
  125. data/app/views/alchemy/admin/pages/_page_for_links.html.erb +4 -2
  126. data/app/views/alchemy/admin/pages/_page_infos.html.erb +12 -12
  127. data/app/views/alchemy/admin/pages/_page_status.html.erb +1 -1
  128. data/app/views/alchemy/admin/pages/_publication_fields.html.erb +35 -0
  129. data/app/views/alchemy/admin/pages/edit.html.erb +13 -2
  130. data/app/views/alchemy/admin/pages/index.html.erb +3 -8
  131. data/app/views/alchemy/admin/pages/info.html.erb +15 -2
  132. data/app/views/alchemy/admin/pages/sort.js.erb +1 -1
  133. data/app/views/alchemy/admin/pages/update.js.erb +1 -14
  134. data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb +12 -8
  135. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +4 -4
  136. data/app/views/alchemy/admin/partials/_search_form.html.erb +1 -1
  137. data/app/views/alchemy/admin/partials/_sub_navigation.html.erb +9 -6
  138. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +1 -1
  139. data/app/views/alchemy/admin/pictures/_picture.html.erb +1 -6
  140. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +1 -6
  141. data/app/views/alchemy/admin/pictures/index.html.erb +1 -1
  142. data/app/views/alchemy/admin/pictures/show.html.erb +1 -6
  143. data/app/views/alchemy/admin/uploader/_button.html.erb +4 -4
  144. data/app/views/alchemy/base/500.html.erb +15 -1
  145. data/app/views/alchemy/essences/_essence_boolean_editor.html.erb +13 -15
  146. data/app/views/alchemy/essences/_essence_boolean_view.html.erb +1 -3
  147. data/app/views/alchemy/essences/_essence_date_editor.html.erb +0 -2
  148. data/app/views/alchemy/essences/_essence_date_view.html.erb +0 -2
  149. data/app/views/alchemy/essences/_essence_file_editor.html.erb +2 -7
  150. data/app/views/alchemy/essences/_essence_file_view.html.erb +1 -3
  151. data/app/views/alchemy/essences/_essence_html_editor.html.erb +0 -2
  152. data/app/views/alchemy/essences/_essence_html_view.html.erb +1 -3
  153. data/app/views/alchemy/essences/_essence_link_editor.html.erb +0 -2
  154. data/app/views/alchemy/essences/_essence_link_view.html.erb +0 -2
  155. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +47 -49
  156. data/app/views/alchemy/essences/_essence_picture_view.html.erb +1 -3
  157. data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +0 -2
  158. data/app/views/alchemy/essences/_essence_richtext_view.html.erb +1 -3
  159. data/app/views/alchemy/essences/_essence_select_editor.html.erb +27 -29
  160. data/app/views/alchemy/essences/_essence_select_view.html.erb +1 -3
  161. data/app/views/alchemy/essences/_essence_text_editor.html.erb +17 -19
  162. data/app/views/alchemy/essences/_essence_text_view.html.erb +0 -2
  163. data/app/views/alchemy/pages/_meta_data.html.erb +9 -0
  164. data/app/views/layouts/alchemy/admin.html.erb +9 -11
  165. data/bin/alchemy +1 -2
  166. data/config/alchemy/config.yml +1 -1
  167. data/config/alchemy/modules.yml +0 -16
  168. data/config/initializers/dragonfly.rb +0 -18
  169. data/config/initializers/mini_profiler.rb +6 -0
  170. data/config/locales/alchemy.de.yml +9 -1
  171. data/config/locales/alchemy.en.yml +7 -1
  172. data/config/locales/alchemy.es.yml +6 -0
  173. data/config/locales/alchemy.fr.yml +2 -0
  174. data/config/locales/alchemy.it.yml +3 -1
  175. data/config/locales/alchemy.nl.yml +2 -0
  176. data/config/locales/alchemy.ru.yml +2 -0
  177. data/config/routes.rb +3 -8
  178. data/db/migrate/20160912223112_add_index_to_alchemy_pages_rgt.rb +9 -0
  179. data/db/migrate/20160927205604_add_foreign_key_indices_and_null_constraints.rb +20 -0
  180. data/db/migrate/20160928080104_add_foreign_keys.rb +27 -0
  181. data/lib/alchemy/admin/locale.rb +4 -3
  182. data/lib/alchemy/engine.rb +2 -4
  183. data/lib/alchemy/errors.rb +9 -2
  184. data/lib/alchemy/forms/builder.rb +8 -0
  185. data/lib/alchemy/modules.rb +20 -19
  186. data/lib/alchemy/permissions.rb +15 -4
  187. data/lib/alchemy/resources_helper.rb +4 -2
  188. data/lib/alchemy/sass_support.rb +9 -0
  189. data/lib/alchemy/seeder.rb +89 -1
  190. data/lib/alchemy/test_support/essence_shared_examples.rb +2 -0
  191. data/lib/alchemy/test_support/factories/attachment_factory.rb +1 -1
  192. data/lib/alchemy/test_support/factories/content_factory.rb +1 -0
  193. data/lib/alchemy/test_support/factories/element_factory.rb +1 -0
  194. data/lib/alchemy/test_support/factories/picture_factory.rb +1 -1
  195. data/lib/alchemy/test_support/fixtures/image.png +0 -0
  196. data/lib/alchemy/tinymce.rb +2 -6
  197. data/lib/alchemy/upgrader.rb +4 -55
  198. data/lib/alchemy/upgrader/tasks/install_dragonfly_config.rb +14 -0
  199. data/lib/alchemy/upgrader/three_point_five.rb +32 -0
  200. data/lib/alchemy/upgrader/three_point_four.rb +2 -8
  201. data/lib/alchemy/upgrader/three_point_one.rb +30 -30
  202. data/lib/alchemy/upgrader/three_point_three.rb +31 -31
  203. data/lib/alchemy/upgrader/three_point_two.rb +25 -25
  204. data/lib/alchemy/upgrader/three_point_zero.rb +59 -59
  205. data/lib/alchemy/version.rb +1 -1
  206. data/lib/rails/generators/alchemy/elements/templates/view.html.erb +1 -1
  207. data/lib/rails/generators/alchemy/elements/templates/view.html.haml +1 -1
  208. data/lib/rails/generators/alchemy/elements/templates/view.html.slim +1 -1
  209. data/lib/rails/generators/alchemy/essence/templates/editor.html.erb +1 -3
  210. data/lib/rails/generators/alchemy/install/files/_article_view.html.erb +1 -1
  211. data/lib/rails/generators/alchemy/install/files/application.html.erb +3 -4
  212. data/lib/rails/generators/alchemy/install/install_generator.rb +4 -0
  213. data/lib/rails/generators/alchemy/install/templates/dragonfly.rb.tt +35 -0
  214. data/lib/rails/generators/alchemy/module/module_generator.rb +1 -1
  215. data/lib/tasks/alchemy/db.rake +6 -0
  216. data/lib/tasks/alchemy/tidy.rake +85 -0
  217. data/lib/tasks/alchemy/upgrade.rake +165 -16
  218. data/vendor/assets/javascripts/clipboard.min.js +7 -0
  219. data/vendor/assets/javascripts/fileupload/jquery.fileupload-process.js +4 -4
  220. data/vendor/assets/javascripts/fileupload/jquery.fileupload-validate.js +2 -2
  221. data/vendor/assets/javascripts/fileupload/jquery.fileupload.js +29 -14
  222. data/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js +2 -2
  223. data/vendor/assets/javascripts/tinymce/langs/es.js +2 -2
  224. data/vendor/assets/javascripts/tinymce/langs/fr.js +1 -1
  225. data/vendor/assets/javascripts/tinymce/langs/it.js +1 -1
  226. data/vendor/assets/javascripts/tinymce/langs/nl.js +3 -3
  227. data/vendor/assets/javascripts/tinymce/tinymce.min.js +15 -12
  228. metadata +44 -88
  229. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/readme.md +0 -1
  230. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce-small.eot +0 -0
  231. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce.eot +0 -0
  232. data/app/assets/stylesheets/tinymce/skins/alchemy/img/wline.gif +0 -0
  233. data/app/assets/stylesheets/tinymce/skins/alchemy/skin.ie7.min.css +0 -1
  234. data/app/controllers/alchemy/pictures_controller.rb +0 -97
  235. data/app/views/alchemy/admin/elements/_refresh_editor.js.erb +0 -8
  236. data/vendor/assets/javascripts/tinymce/plugins/anchor/plugin.min.js +0 -1
  237. data/vendor/assets/javascripts/tinymce/plugins/autoresize/plugin.min.js +0 -1
  238. data/vendor/assets/javascripts/tinymce/plugins/charmap/plugin.min.js +0 -1
  239. data/vendor/assets/javascripts/tinymce/plugins/code/plugin.min.js +0 -1
  240. data/vendor/assets/javascripts/tinymce/plugins/directionality/plugin.min.js +0 -1
  241. data/vendor/assets/javascripts/tinymce/plugins/fullscreen/plugin.min.js +0 -1
  242. data/vendor/assets/javascripts/tinymce/plugins/hr/plugin.min.js +0 -1
  243. data/vendor/assets/javascripts/tinymce/plugins/link/plugin.min.js +0 -1
  244. data/vendor/assets/javascripts/tinymce/plugins/paste/plugin.min.js +0 -1
  245. data/vendor/assets/javascripts/tinymce/plugins/tabfocus/plugin.min.js +0 -1
  246. data/vendor/assets/javascripts/tinymce/plugins/table/plugin.min.js +0 -1
  247. data/vendor/assets/javascripts/tinymce/themes/modern/theme.min.js +0 -1
@@ -1,6 +1,9 @@
1
1
  @import "alchemy/defaults";
2
2
 
3
- .mce-container, .mce-container *, .mce-widget, .mce-widget * {
3
+ .mce-container,
4
+ .mce-container *,
5
+ .mce-widget,
6
+ .mce-widget * {
4
7
  margin: 0;
5
8
  padding: 0;
6
9
  border: 0;
@@ -21,39 +24,40 @@
21
24
  line-height: normal;
22
25
  font-weight: normal;
23
26
  text-align: left;
24
- @include box-sizing(content-box);
27
+ box-sizing: content-box;
25
28
  direction: ltr;
26
29
  }
27
30
 
28
31
  .mce-widget button {
29
- @include box-sizing(border-box);
32
+ box-sizing: border-box;
30
33
  }
31
34
 
32
35
  .mce-container *[unselectable] {
33
36
  @include user-select(none);
34
37
  }
35
38
 
36
- .mce-container ::-webkit-scrollbar {
39
+ .mce-container::-webkit-scrollbar {
37
40
  width: 8px;
38
41
  height: 8px;
39
- -webkit-border-radius: $default-border-radius;
42
+ border-radius: $default-border-radius;
40
43
  }
41
44
 
42
- .mce-container ::-webkit-scrollbar-track,.mce-container ::-webkit-scrollbar-track-piece {
45
+ .mce-container ::-webkit-scrollbar-track-piece,
46
+ .mce-container::-webkit-scrollbar-track {
43
47
  background-color: transparent;
44
48
  }
45
49
 
46
- .mce-container ::-webkit-scrollbar-thumb {
50
+ .mce-container::-webkit-scrollbar-thumb {
47
51
  background-color: rgba(53,57,71,0.3);
48
52
  width: 6px;
49
53
  height: 6px;
50
- -webkit-border-radius: $default-border-radius;
54
+ border-radius: $default-border-radius;
51
55
  }
52
56
 
53
57
  .mce-fade {
54
58
  opacity: 0;
55
- -webkit-transition: opacity .15s linear;
56
- transition: opacity .15s linear;
59
+ -webkit-transition: opacity 0.15s linear;
60
+ transition: opacity 0.15s linear;
57
61
 
58
62
  &.mce-in {
59
63
  opacity: 1;
@@ -85,7 +89,7 @@ div.mce-fullscreen {
85
89
  visibility: visible!important;
86
90
  position: relative;
87
91
  display: block;
88
- @include border-radius($default-border-radius);
92
+ border-radius: $default-border-radius;
89
93
  }
90
94
 
91
95
  .mce-wordcount {
@@ -99,7 +103,7 @@ div.mce-edit-area {
99
103
  background: #FFF;
100
104
  filter: none;
101
105
  border-top: 0;
102
- @include border-radius($default-border-radius);
106
+ border-radius: $default-border-radius;
103
107
  }
104
108
 
105
109
  .mce-statusbar {
@@ -156,14 +160,15 @@ div.mce-edit-area {
156
160
  }
157
161
 
158
162
  .mce-grid-border {
159
- margin: 0 4px 0 4px;
163
+ margin: 0 4px;
160
164
 
161
165
  a {
162
166
  border-color: #d6d6d6;
163
167
  width: 13px;
164
168
  height: 13px;
165
169
 
166
- &:hover, &.mce-active {
170
+ &.mce-active,
171
+ &:hover {
167
172
  border-color: #a1a1a1;
168
173
  background: #c8def4;
169
174
  }
@@ -186,7 +191,8 @@ div.mce-tinymce-inline {
186
191
  right: auto;
187
192
  }
188
193
 
189
- .mce-container, .mce-container-body {
194
+ .mce-container,
195
+ .mce-container-body {
190
196
  display: block;
191
197
  }
192
198
 
@@ -200,7 +206,7 @@ div.mce-tinymce-inline {
200
206
  height: 100%;
201
207
  top: 2px;
202
208
  right: 2px;
203
- opacity: .4;
209
+ opacity: 0.4;
204
210
  filter: alpha(opacity=40);
205
211
  zoom: 1;
206
212
  }
@@ -231,9 +237,10 @@ div.mce-tinymce-inline {
231
237
  height: 5px;
232
238
  }
233
239
 
234
- .mce-scrollbar:hover, .mce-scrollbar.mce-active {
240
+ .mce-scrollbar.mce-active,
241
+ .mce-scrollbar:hover {
235
242
  background-color: #AAA;
236
- opacity: .6;
243
+ opacity: 0.6;
237
244
  filter: alpha(opacity=60);
238
245
  zoom: 1;
239
246
  -webkit-border-radius: 7px;
@@ -248,7 +255,7 @@ div.mce-tinymce-inline {
248
255
  .mce-panel {
249
256
  border: 0 solid $default-border-color;
250
257
  background-color: $medium-gray;
251
- @include box-sizing(border-box);
258
+ box-sizing: border-box;
252
259
  }
253
260
 
254
261
  .mce-toolbar-grp {
@@ -262,7 +269,8 @@ div.mce-tinymce-inline {
262
269
  position: fixed;
263
270
  }
264
271
 
265
- .mce-arrow, .mce-arrow:after {
272
+ .mce-arrow,
273
+ .mce-arrow:after {
266
274
  position: absolute;
267
275
  display: block;
268
276
  width: 0;
@@ -283,8 +291,8 @@ div.mce-tinymce-inline {
283
291
  &.mce-popover {
284
292
  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
285
293
  background: transparent;
286
- @include border-radius($default-border-radius);
287
- @include box-shadow(0 5px 10px rgba(0,0,0,0.2));
294
+ border-radius: $default-border-radius;
295
+ box-shadow: 0 5px 10px rgba(0,0,0,0.2);
288
296
  top: 0;
289
297
  left: 0;
290
298
  background: #fff;
@@ -297,7 +305,7 @@ div.mce-tinymce-inline {
297
305
  *margin-top: 0;
298
306
  }
299
307
 
300
- &.mce-popover.mce-bottom>.mce-arrow {
308
+ &.mce-popover.mce-bottom > .mce-arrow {
301
309
  left: 50%;
302
310
  margin-left: -11px;
303
311
  border-top-width: 0;
@@ -306,7 +314,7 @@ div.mce-tinymce-inline {
306
314
  top: -11px;
307
315
  }
308
316
 
309
- &.mce-popover.mce-bottom>.mce-arrow:after {
317
+ &.mce-popover.mce-bottom > .mce-arrow:after {
310
318
  top: 1px;
311
319
  margin-left: -10px;
312
320
  border-top-width: 0;
@@ -317,7 +325,7 @@ div.mce-tinymce-inline {
317
325
  margin-left: -22px;
318
326
  }
319
327
 
320
- &.mce-popover.mce-bottom.mce-start>.mce-arrow {
328
+ &.mce-popover.mce-bottom.mce-start > .mce-arrow {
321
329
  left: 20px;
322
330
  }
323
331
 
@@ -325,7 +333,7 @@ div.mce-tinymce-inline {
325
333
  margin-left: 22px;
326
334
  }
327
335
 
328
- &.mce-popover.mce-bottom.mce-end>.mce-arrow {
336
+ &.mce-popover.mce-bottom.mce-end > .mce-arrow {
329
337
  right: 10px;
330
338
  left: auto;
331
339
  }
@@ -359,7 +367,7 @@ div.mce-fullscreen {
359
367
  }
360
368
 
361
369
  #mce-modal-block.mce-in {
362
- opacity: .4;
370
+ opacity: 0.4;
363
371
  filter: alpha(opacity=40);
364
372
  zoom: 1;
365
373
  }
@@ -369,7 +377,7 @@ div.mce-fullscreen {
369
377
  }
370
378
 
371
379
  .mce-window {
372
- @include border-radius($default-border-radius);
380
+ border-radius: $default-border-radius;
373
381
  border: $default-border;
374
382
  background-color: $light-gray;
375
383
  color: $text-color;
@@ -418,8 +426,8 @@ div.mce-fullscreen {
418
426
  cursor: pointer;
419
427
  height: 18px;
420
428
  overflow: hidden;
421
- @include border-radius(0);
422
- @include box-shadow(none);
429
+ border-radius: 0;
430
+ box-shadow: none;
423
431
 
424
432
  &:hover {
425
433
  color: #000;
@@ -439,9 +447,11 @@ div.mce-fullscreen {
439
447
  @include border-bottom-radius($default-border-radius);
440
448
 
441
449
  .mce-btn {
442
- @include border-radius($default-border-radius);
450
+ border-radius: $default-border-radius;
443
451
 
444
- button { padding: 0.5em 1.5em; }
452
+ button {
453
+ padding: 0.5em 1.5em;
454
+ }
445
455
  }
446
456
  }
447
457
 
@@ -450,8 +460,9 @@ div.mce-fullscreen {
450
460
  height: 100%;
451
461
  }
452
462
 
453
- .mce-window.mce-fullscreen,.mce-window.mce-fullscreen .mce-foot {
454
- @include border-radius($default-border-radius);
463
+ .mce-window.mce-fullscreen,
464
+ .mce-window.mce-fullscreen .mce-foot {
465
+ border-radius: $default-border-radius;
455
466
  }
456
467
 
457
468
  .mce-rtl .mce-window-head .mce-close {
@@ -474,7 +485,8 @@ div.mce-fullscreen {
474
485
  position: relative;
475
486
  }
476
487
 
477
- body .mce-abs-layout-item,.mce-abs-end {
488
+ .mce-abs-end,
489
+ body .mce-abs-layout-item {
478
490
  position: absolute;
479
491
  }
480
492
 
@@ -500,7 +512,7 @@ body .mce-abs-layout-item,.mce-abs-end {
500
512
  padding: $default-padding 2*$default-padding;
501
513
  text-align: center;
502
514
  white-space: normal;
503
- @include box-shadow(0 0 4px $default-border-color);
515
+ box-shadow: 0 0 4px $default-border-color;
504
516
  @extend %rounded-border;
505
517
  }
506
518
 
@@ -528,7 +540,8 @@ body .mce-abs-layout-item,.mce-abs-end {
528
540
  border-right-color: $dark-gray;
529
541
  }
530
542
 
531
- .mce-tooltip-nw,.mce-tooltip-sw {
543
+ .mce-tooltip-nw,
544
+ .mce-tooltip-sw {
532
545
  margin-left: -14px;
533
546
  }
534
547
 
@@ -616,12 +629,13 @@ body .mce-abs-layout-item,.mce-abs-end {
616
629
  display: inline-block;
617
630
  *display: inline;
618
631
  *zoom: 1;
619
- @include box-shadow(inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05));
620
- @include background(linear-gradient(color-stops($sb-base-color, darken($sb-base-color, 10%))));
632
+ box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);
633
+ @include background(linear-gradient($button-gradient-first-color, $button-gradient-second-color));
621
634
 
622
- &:hover, &:focus {
635
+ &:focus,
636
+ &:hover {
623
637
  color: #333;
624
- @include background(linear-gradient(color-stops(darken($sb-base-color, 10%), darken($sb-base-color, 20%))));
638
+ @include background(linear-gradient( darken($button-gradient-first-color, 5%), darken($button-gradient-second-color, 5%) ));
625
639
 
626
640
  button {
627
641
  @include background(inherit);
@@ -638,14 +652,18 @@ body .mce-abs-layout-item,.mce-abs-end {
638
652
  text-align: center;
639
653
  overflow: visible;
640
654
  -webkit-appearance: none;
641
- @include border-radius(inherit);
655
+ border-radius: inherit;
642
656
 
643
657
  &:focus {
644
- @include box-shadow(none);
658
+ box-shadow: none;
645
659
  border: 0 none;
646
660
  background: none;
647
661
  }
648
662
 
663
+ &:active {
664
+ border: 0 none;
665
+ }
666
+
649
667
  &::-moz-focus-inner {
650
668
  border: 0;
651
669
  padding: 0;
@@ -656,19 +674,24 @@ body .mce-abs-layout-item,.mce-abs-end {
656
674
  text-shadow: 1px 1px #fff;
657
675
  }
658
676
 
659
- &.mce-disabled button, &.mce-disabled:hover button {
677
+ &.mce-disabled button,
678
+ &.mce-disabled:hover button {
660
679
  cursor: default;
661
- @include box-shadow(none);
662
- opacity: .4;
680
+ box-shadow: none;
681
+ opacity: 0.4;
663
682
  filter: alpha(opacity=40);
664
683
  zoom: 1;
665
684
  }
666
685
 
667
- &.mce-active, &.mce-active:hover {
668
- @include background(linear-gradient(color-stops(darken($sb-base-color, 15%), darken($sb-base-color, 25%))));
669
- @include box-shadow(inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05));
686
+ &.mce-active,
687
+ &.mce-active:hover {
688
+ background-color: #e6f0f5;
689
+ background-image: linear-gradient(#e5e5e5, #cccccc);
690
+ box-shadow: #c4c4c4 0 1px 2px inset;
670
691
 
671
- button i { color: #000; }
692
+ button i {
693
+ color: #000;
694
+ }
672
695
  }
673
696
 
674
697
  &:not(.mce-disabled):active {
@@ -679,7 +702,7 @@ body .mce-abs-layout-item,.mce-abs-end {
679
702
  background-image: -o-linear-gradient(top,#e6e6e6,#c0c0c0);
680
703
  background-image: linear-gradient(to bottom,#e6e6e6,#c0c0c0);
681
704
  background-repeat: repeat-x;
682
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffc0c0c0',GradientType=0);
705
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr= '#ffe6e6e6',endColorstr='#ffc0c0c0',GradientType=0);
683
706
  zoom: 1;
684
707
  -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
685
708
  -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
@@ -687,53 +710,11 @@ body .mce-abs-layout-item,.mce-abs-end {
687
710
  }
688
711
  }
689
712
 
690
- .mce-primary {
691
- // min-width: 50px;
692
- // color: #fff;
693
- // border: 1px solid #b1b1b1;
694
- // border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25) rgba(0,0,0,0.25);
695
- // @include background(linear-gradient(color-stops(#0c0, darken(#0c0, 10%))));
696
-
697
- // &:hover, &:focus {
698
- // @include background(linear-gradient(color-stops(darken(#0c0, 10%), darken(#0c0, 20%))));
699
- // }
700
-
701
- // &.mce-disabled button, &.mce-disabled:hover button {
702
- // cursor: default;
703
- // -webkit-box-shadow: none;
704
- // -moz-box-shadow: none;
705
- // box-shadow: none;
706
- // opacity: .4;
707
- // filter: alpha(opacity=40);
708
- // zoom: 1;
709
- // }
710
-
711
- // &.mce-active, &.mce-active:hover, &:not(.mce-disabled):active {
712
- // background-color: #005299;
713
- // background-image: -moz-linear-gradient(top,#069,#039);
714
- // background-image: -webkit-gradient(linear,0 0,0 100%,from(#069),to(#039));
715
- // background-image: -webkit-linear-gradient(top,#069,#039);
716
- // background-image: -o-linear-gradient(top,#069,#039);
717
- // background-image: linear-gradient(to bottom,#069,#039);
718
- // background-repeat: repeat-x;
719
- // filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff006699',endColorstr='#ff003399',GradientType=0);
720
- // zoom: 1;
721
- // -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
722
- // -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
723
- // box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
724
- // }
725
-
726
- // button, button i {
727
- // color: #fff;
728
- // text-shadow: 1px 1px #333;
729
- // }
730
- }
731
-
732
713
  .mce-btn-large button {
733
714
  padding: 9px 14px;
734
715
  font-size: 16px;
735
716
  line-height: normal;
736
- @include border-radius($default-border-radius);
717
+ border-radius: $default-border-radius;
737
718
  }
738
719
 
739
720
  .mce-btn-large i {
@@ -791,7 +772,7 @@ body .mce-abs-layout-item,.mce-abs-end {
791
772
  .mce-btn-group .mce-btn {
792
773
  border-width: 1px 0 1px 0;
793
774
  margin: 0;
794
- @include border-radius(0);
775
+ border-radius: 0;
795
776
  }
796
777
 
797
778
  .mce-btn-group .mce-first {
@@ -807,7 +788,7 @@ body .mce-abs-layout-item,.mce-abs-end {
807
788
  }
808
789
 
809
790
  .mce-btn-group .mce-first.mce-last {
810
- @include border-radius($default-border-radius);
791
+ border-radius: $default-border-radius;
811
792
  }
812
793
 
813
794
  .mce-btn-group .mce-btn.mce-flow-layout-item {
@@ -821,8 +802,8 @@ body .mce-abs-layout-item,.mce-abs-end {
821
802
  i.mce-i-checkbox {
822
803
  margin: 0 3px 0 0;
823
804
  border: 1px solid #c5c5c5;
824
- @include border-radius($default-border-radius);
825
- @include box-shadow(inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05));
805
+ border-radius: $default-border-radius;
806
+ box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);
826
807
  background-color: #f0f0f0;
827
808
  background-image: -moz-linear-gradient(top,#fff,#d9d9d9);
828
809
  background-image: -webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));
@@ -830,7 +811,7 @@ i.mce-i-checkbox {
830
811
  background-image: -o-linear-gradient(top,#fff,#d9d9d9);
831
812
  background-image: linear-gradient(to bottom,#fff,#d9d9d9);
832
813
  background-repeat: repeat-x;
833
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);
814
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr= '#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);
834
815
  zoom: 1;
835
816
  text-indent: -10em;
836
817
  *font-size: 0;
@@ -846,12 +827,14 @@ i.mce-i-checkbox {
846
827
  text-indent: 0;
847
828
  }
848
829
 
849
- .mce-checkbox:focus i.mce-i-checkbox,.mce-checkbox.mce-focus i.mce-i-checkbox {
830
+ .mce-checkbox.mce-focus i.mce-i-checkbox,
831
+ .mce-checkbox:focus i.mce-i-checkbox {
850
832
  border: 1px solid rgba(82,168,236,0.8);
851
- @include box-shadow(inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65));
833
+ box-shadow: inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);
852
834
  }
853
835
 
854
- .mce-checkbox.mce-disabled .mce-label,.mce-checkbox.mce-disabled i.mce-i-checkbox {
836
+ .mce-checkbox.mce-disabled .mce-label,
837
+ .mce-checkbox.mce-disabled i.mce-i-checkbox {
855
838
  color: #acacac;
856
839
  }
857
840
 
@@ -908,7 +891,7 @@ i.mce-i-checkbox {
908
891
  }
909
892
 
910
893
  .mce-colorbutton.mce-btn-small .mce-open {
911
- padding: 0 3px 0 3px;
894
+ padding: 0 3px;
912
895
  }
913
896
 
914
897
  .mce-rtl .mce-colorbutton {
@@ -943,8 +926,8 @@ i.mce-i-checkbox {
943
926
  display: inline-block;
944
927
  *display: inline;
945
928
  *zoom: 1;
946
- @include border-radius($default-border-radius);
947
- @include box-shadow(inset 0 1px 1px rgba(0,0,0,0.075));
929
+ border-radius: $default-border-radius;
930
+ box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
948
931
  *height: 32px;
949
932
  }
950
933
 
@@ -977,7 +960,7 @@ i.mce-i-checkbox {
977
960
  -webkit-box-shadow: none;
978
961
  -moz-box-shadow: none;
979
962
  box-shadow: none;
980
- opacity: .4;
963
+ opacity: 0.4;
981
964
  filter: alpha(opacity=40);
982
965
  zoom: 1;
983
966
  }
@@ -1030,16 +1013,16 @@ i.mce-i-checkbox {
1030
1013
 
1031
1014
  .mce-fieldset {
1032
1015
  border: 0 solid $default-border-color;
1033
- @include border-radius($default-border-radius);
1016
+ border-radius: $default-border-radius;
1034
1017
  }
1035
1018
 
1036
- .mce-fieldset>.mce-container-body {
1019
+ .mce-fieldset > .mce-container-body {
1037
1020
  margin-top: -15px;
1038
1021
  }
1039
1022
 
1040
1023
  .mce-fieldset-title {
1041
1024
  margin-left: 5px;
1042
- padding: 0 5px 0 5px;
1025
+ padding: 0 5px;
1043
1026
  }
1044
1027
 
1045
1028
  .mce-fit-layout {
@@ -1122,7 +1105,7 @@ i.mce-i-checkbox {
1122
1105
  .mce-menubar .mce-menubtn {
1123
1106
  border-color: transparent;
1124
1107
  background: transparent;
1125
- @include border-radius(0);
1108
+ border-radius: 0;
1126
1109
  -webkit-box-shadow: none;
1127
1110
  -moz-box-shadow: none;
1128
1111
  box-shadow: none;
@@ -1141,7 +1124,9 @@ i.mce-i-checkbox {
1141
1124
  border-top-color: #333;
1142
1125
  }
1143
1126
 
1144
- .mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus {
1127
+ .mce-menubar .mce-menubtn.mce-active,
1128
+ .mce-menubar .mce-menubtn:focus,
1129
+ .mce-menubar .mce-menubtn:hover {
1145
1130
  border-color: transparent;
1146
1131
  background: #e6e6e6;
1147
1132
  filter: none;
@@ -1222,19 +1207,24 @@ i.mce-i-checkbox {
1222
1207
  margin-bottom: 1px;
1223
1208
  }
1224
1209
 
1225
- .mce-menu-item .mce-ico,.mce-menu-item .mce-text {
1210
+ .mce-menu-item .mce-ico,
1211
+ .mce-menu-item .mce-text {
1226
1212
  color: #333;
1227
1213
  }
1228
1214
 
1229
- .mce-menu-item.mce-disabled .mce-text,.mce-menu-item.mce-disabled .mce-ico {
1215
+ .mce-menu-item.mce-disabled .mce-ico,
1216
+ .mce-menu-item.mce-disabled .mce-text {
1230
1217
  color: #adadad;
1231
1218
  }
1232
1219
 
1233
- .mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text {
1220
+ .mce-menu-item.mce-selected .mce-text,
1221
+ .mce-menu-item:hover .mce-text {
1234
1222
  color: #fff;
1235
1223
  }
1236
1224
 
1237
- .mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico {
1225
+ .mce-menu-item.mce-selected .mce-ico,
1226
+ .mce-menu-item:focus .mce-ico,
1227
+ .mce-menu-item:hover .mce-ico {
1238
1228
  color: #fff;
1239
1229
  }
1240
1230
 
@@ -1254,7 +1244,9 @@ i.mce-i-checkbox {
1254
1244
  padding: 0 15px 0 20px;
1255
1245
  }
1256
1246
 
1257
- .mce-menu-item:hover .mce-menu-shortcut,.mce-menu-item.mce-selected .mce-menu-shortcut,.mce-menu-item:focus .mce-menu-shortcut {
1247
+ .mce-menu-item.mce-selected .mce-menu-shortcut,
1248
+ .mce-menu-item:focus .mce-menu-shortcut,
1249
+ .mce-menu-item:hover .mce-menu-shortcut {
1258
1250
  color: #fff;
1259
1251
  }
1260
1252
 
@@ -1267,7 +1259,9 @@ i.mce-i-checkbox {
1267
1259
  border-left: 4px solid #333;
1268
1260
  }
1269
1261
 
1270
- .mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret,.mce-menu-item:hover .mce-caret {
1262
+ .mce-menu-item.mce-selected .mce-caret,
1263
+ .mce-menu-item:focus .mce-caret,
1264
+ .mce-menu-item:hover .mce-caret {
1271
1265
  border-left-color: #fff;
1272
1266
  }
1273
1267
 
@@ -1275,7 +1269,8 @@ i.mce-i-checkbox {
1275
1269
  *margin-top: -2px;
1276
1270
  }
1277
1271
 
1278
- .mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret {
1272
+ .mce-menu-align .mce-caret,
1273
+ .mce-menu-align .mce-menu-shortcut {
1279
1274
  position: absolute;
1280
1275
  right: 0;
1281
1276
  }
@@ -1296,17 +1291,21 @@ i.mce-i-checkbox {
1296
1291
  color: #333;
1297
1292
  }
1298
1293
 
1299
- .mce-menu-item-normal.mce-active:hover .mce-text,.mce-menu-item-normal.mce-active:hover .mce-ico {
1294
+ .mce-menu-item-normal.mce-active:hover .mce-ico,
1295
+ .mce-menu-item-normal.mce-active:hover .mce-text {
1300
1296
  color: #fff;
1301
1297
  }
1302
1298
 
1303
- .mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus {
1299
+ .mce-menu-item.mce-selected,
1300
+ .mce-menu-item:focus,
1301
+ .mce-menu-item:hover {
1304
1302
  text-decoration: none;
1305
1303
  color: #fff;
1306
1304
  background: $button-hover-bg-color;
1307
1305
  }
1308
1306
 
1309
- div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover {
1307
+ .mce-menu-item-sep:hover,
1308
+ div.mce-menu .mce-menu-item-sep {
1310
1309
  border: 0;
1311
1310
  padding: 0;
1312
1311
  height: 1px;
@@ -1324,7 +1323,8 @@ div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover {
1324
1323
  padding: 6px 12px 6px 15px;
1325
1324
  }
1326
1325
 
1327
- .mce-menu-align.mce-rtl .mce-menu-shortcut,.mce-menu-align.mce-rtl .mce-caret {
1326
+ .mce-menu-align.mce-rtl .mce-caret,
1327
+ .mce-menu-align.mce-rtl .mce-menu-shortcut {
1328
1328
  right: auto;
1329
1329
  left: 0;
1330
1330
  }
@@ -1336,7 +1336,9 @@ div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover {
1336
1336
  border-left: 0;
1337
1337
  }
1338
1338
 
1339
- .mce-rtl .mce-menu-item.mce-selected .mce-caret,.mce-rtl .mce-menu-item:focus .mce-caret,.mce-rtl .mce-menu-item:hover .mce-caret {
1339
+ .mce-rtl .mce-menu-item.mce-selected .mce-caret,
1340
+ .mce-rtl .mce-menu-item:focus .mce-caret,
1341
+ .mce-rtl .mce-menu-item:hover .mce-caret {
1340
1342
  border-left-color: transparent;
1341
1343
  border-right-color: #fff;
1342
1344
  }
@@ -1348,15 +1350,15 @@ div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover {
1348
1350
  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
1349
1351
  background: transparent;
1350
1352
  z-index: 1000;
1351
- padding: 5px 0 5px 0;
1353
+ padding: 5px 0;
1352
1354
  margin: 2px 0 0;
1353
1355
  min-width: 160px;
1354
1356
  background: #fff;
1355
1357
  border: 1px solid #989898;
1356
1358
  border: 1px solid rgba(0,0,0,0.2);
1357
1359
  z-index: 1002;
1358
- @include border-radius($default-border-radius);
1359
- @include box-shadow(0 5px 10px rgba(0,0,0,0.2));
1360
+ border-radius: $default-border-radius;
1361
+ box-shadow: 0 5px 10px rgba(0,0,0,0.2);
1360
1362
  max-height: 400px;
1361
1363
  overflow: auto;
1362
1364
  overflow-x: hidden;
@@ -1436,7 +1438,7 @@ i.mce-i-resize {
1436
1438
  }
1437
1439
 
1438
1440
  .mce-splitbtn.mce-btn-small .mce-open {
1439
- padding: 0 3px 0 3px;
1441
+ padding: 0 3px;
1440
1442
  }
1441
1443
 
1442
1444
  .mce-rtl .mce-splitbtn {
@@ -1499,20 +1501,21 @@ i.mce-i-resize {
1499
1501
  .mce-textbox {
1500
1502
  background: #fff;
1501
1503
  border: 1px solid #c5c5c5;
1502
- @include border-radius($default-border-radius);
1503
- @include box-shadow(inset 0 1px 1px rgba(0,0,0,0.075));
1504
+ border-radius: $default-border-radius;
1505
+ box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
1504
1506
  display: inline-block;
1505
- -webkit-transition: border linear .2s,box-shadow linear .2s;
1506
- transition: border linear .2s,box-shadow linear .2s;
1507
+ -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
1508
+ transition: border linear 0.2s, box-shadow linear 0.2s;
1507
1509
  height: 28px;
1508
1510
  resize: none;
1509
- padding: 0 4px 0 4px;
1511
+ padding: 0 4px;
1510
1512
  white-space: pre-wrap;
1511
1513
  *white-space: pre;
1512
1514
  color: #333;
1513
1515
  }
1514
1516
 
1515
- .mce-textbox:focus,.mce-textbox.mce-focus {
1517
+ .mce-textbox.mce-focus,
1518
+ .mce-textbox:focus {
1516
1519
  border-color: rgba(82,168,236,0.8);
1517
1520
  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);
1518
1521
  -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);
@@ -1542,22 +1545,32 @@ i.mce-i-resize {
1542
1545
  left: 0;
1543
1546
  width: 100%;
1544
1547
  height: 100%;
1545
- opacity: .6;
1548
+ opacity: 0.6;
1546
1549
  filter: alpha(opacity=60);
1547
1550
  zoom: 1;
1548
1551
  background: #fff url('img/loader.gif') no-repeat center center;
1549
1552
  }
1550
1553
 
1551
1554
  @font-face {
1552
- font-family:'tinymce';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype'),url('fonts/tinymce.svg#tinymce') format('svg');font-weight:normal;font-style:normal;
1555
+ font-family: 'tinymce';
1556
+ src: url('fonts/tinymce.woff') format('woff'),
1557
+ url('fonts/tinymce.ttf') format('truetype'),
1558
+ url('fonts/tinymce.svg#tinymce') format('svg');
1559
+ font-weight: normal;
1560
+ font-style: normal;
1553
1561
  }
1554
1562
 
1555
1563
  @font-face {
1556
- font-family:'tinymce-small';src:url('fonts/tinymce-small.eot');src:url('fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce-small.woff') format('woff'),url('fonts/tinymce-small.ttf') format('truetype'),url('fonts/tinymce-small.svg#tinymce') format('svg');font-weight:normal;font-style:normal;
1564
+ font-family: 'tinymce-small';
1565
+ src: url('fonts/tinymce-small.woff') format('woff'),
1566
+ url('fonts/tinymce-small.ttf') format('truetype'),
1567
+ url('fonts/tinymce-small.svg#tinymce') format('svg');
1568
+ font-weight: normal;
1569
+ font-style: normal;
1557
1570
  }
1558
1571
 
1559
1572
  .mce-ico {
1560
- font-family: 'tinymce',Arial;
1573
+ font-family: 'tinymce', Arial;
1561
1574
  font-style: normal;
1562
1575
  font-weight: normal;
1563
1576
  font-size: 12px;
@@ -1573,7 +1586,7 @@ i.mce-i-resize {
1573
1586
  }
1574
1587
 
1575
1588
  .mce-btn-small .mce-ico {
1576
- font-family: 'tinymce-small',Arial;
1589
+ font-family: 'tinymce-small', Arial;
1577
1590
  }
1578
1591
 
1579
1592
  .mce-i-save:before {
@@ -1604,6 +1617,10 @@ i.mce-i-resize {
1604
1617
  content: "\e006";
1605
1618
  }
1606
1619
 
1620
+ .mce-i-alignnone:before {
1621
+ content: "\e003";
1622
+ }
1623
+
1607
1624
  .mce-i-cut:before {
1608
1625
  content: "\e007";
1609
1626
  }
@@ -1672,7 +1689,7 @@ i.mce-i-resize {
1672
1689
  content: "\e017";
1673
1690
  }
1674
1691
 
1675
- .mce-i-inserttime:before {
1692
+ .mce-i-insertdatetime:before {
1676
1693
  content: "\e018";
1677
1694
  }
1678
1695
 
@@ -1744,10 +1761,6 @@ i.mce-i-resize {
1744
1761
  content: "\e028";
1745
1762
  }
1746
1763
 
1747
- .mce-i-untitled:before {
1748
- content: "\e029";
1749
- }
1750
-
1751
1764
  .mce-i-bold:before {
1752
1765
  content: "\e02a";
1753
1766
  }
@@ -1796,7 +1809,276 @@ i.mce-i-resize {
1796
1809
  content: "\e035";
1797
1810
  }
1798
1811
 
1799
- .mce-i-checkbox:before,.mce-i-selected:before {
1812
+ .mce-i-rotateleft:before {
1813
+ content: "\eaa8";
1814
+ }
1815
+
1816
+ .mce-i-rotateright:before {
1817
+ content: "\eaa9";
1818
+ }
1819
+
1820
+ .mce-i-crop:before {
1821
+ content: "\ee78";
1822
+ }
1823
+
1824
+ .mce-i-editimage:before {
1825
+ content: "\e915";
1826
+ }
1827
+
1828
+ .mce-i-options:before {
1829
+ content: "\ec6a";
1830
+ }
1831
+
1832
+ .mce-i-flipv:before {
1833
+ content: "\eaaa";
1834
+ }
1835
+
1836
+ .mce-i-fliph:before {
1837
+ content: "\eaac";
1838
+ }
1839
+
1840
+ .mce-i-zoomin:before {
1841
+ content: "\eb35";
1842
+ }
1843
+
1844
+ .mce-i-zoomout:before {
1845
+ content: "\eb36";
1846
+ }
1847
+
1848
+ .mce-i-sun:before {
1849
+ content: "\eccc";
1850
+ }
1851
+
1852
+ .mce-i-moon:before {
1853
+ content: "\eccd";
1854
+ }
1855
+
1856
+ .mce-i-arrowleft:before {
1857
+ content: "\edc0";
1858
+ }
1859
+
1860
+ .mce-i-arrowright:before {
1861
+ content: "\e93c";
1862
+ }
1863
+
1864
+ .mce-i-drop:before {
1865
+ content: "\e935";
1866
+ }
1867
+
1868
+ .mce-i-contrast:before {
1869
+ content: "\ecd4";
1870
+ }
1871
+
1872
+ .mce-i-sharpen:before {
1873
+ content: "\eba7";
1874
+ }
1875
+
1876
+ .mce-i-resize2:before {
1877
+ content: "\edf9";
1878
+ }
1879
+
1880
+ .mce-i-orientation:before {
1881
+ content: "\e601";
1882
+ }
1883
+
1884
+ .mce-i-invert:before {
1885
+ content: "\e602";
1886
+ }
1887
+
1888
+ .mce-i-gamma:before {
1889
+ content: "\e600";
1890
+ }
1891
+
1892
+ .mce-i-remove:before {
1893
+ content: "\ed6a";
1894
+ }
1895
+
1896
+ .mce-i-tablerowprops:before {
1897
+ content: "\e604";
1898
+ }
1899
+
1900
+ .mce-i-tablecellprops:before {
1901
+ content: "\e605";
1902
+ }
1903
+
1904
+ .mce-i-table2:before {
1905
+ content: "\e606";
1906
+ }
1907
+
1908
+ .mce-i-tablemergecells:before {
1909
+ content: "\e607";
1910
+ }
1911
+
1912
+ .mce-i-tableinsertcolbefore:before {
1913
+ content: "\e608";
1914
+ }
1915
+
1916
+ .mce-i-tableinsertcolafter:before {
1917
+ content: "\e609";
1918
+ }
1919
+
1920
+ .mce-i-tableinsertrowbefore:before {
1921
+ content: "\e60a";
1922
+ }
1923
+
1924
+ .mce-i-tableinsertrowafter:before {
1925
+ content: "\e60b";
1926
+ }
1927
+
1928
+ .mce-i-tablesplitcells:before {
1929
+ content: "\e60d";
1930
+ }
1931
+
1932
+ .mce-i-tabledelete:before {
1933
+ content: "\e60e";
1934
+ }
1935
+
1936
+ .mce-i-tableleftheader:before {
1937
+ content: "\e62a";
1938
+ }
1939
+
1940
+ .mce-i-tabletopheader:before {
1941
+ content: "\e62b";
1942
+ }
1943
+
1944
+ .mce-i-tabledeleterow:before {
1945
+ content: "\e800";
1946
+ }
1947
+
1948
+ .mce-i-tabledeletecol:before {
1949
+ content: "\e801";
1950
+ }
1951
+
1952
+ .mce-i-codesample:before {
1953
+ content: "\e603";
1954
+ }
1955
+
1956
+ .mce-i-fill:before {
1957
+ content: "\e902";
1958
+ }
1959
+
1960
+ .mce-i-borderwidth:before {
1961
+ content: "\e903";
1962
+ }
1963
+
1964
+ .mce-i-line:before {
1965
+ content: "\e904";
1966
+ }
1967
+
1968
+ .mce-i-count:before {
1969
+ content: "\e905";
1970
+ }
1971
+
1972
+ .mce-i-translate:before {
1973
+ content: "\e907";
1974
+ }
1975
+
1976
+ .mce-i-drag:before {
1977
+ content: "\e908";
1978
+ }
1979
+
1980
+ .mce-i-home:before {
1981
+ content: "\e90b";
1982
+ }
1983
+
1984
+ .mce-i-upload:before {
1985
+ content: "\e914";
1986
+ }
1987
+
1988
+ .mce-i-bubble:before {
1989
+ content: "\e91c";
1990
+ }
1991
+
1992
+ .mce-i-user:before {
1993
+ content: "\e91d";
1994
+ }
1995
+
1996
+ .mce-i-lock:before {
1997
+ content: "\e926";
1998
+ }
1999
+
2000
+ .mce-i-unlock:before {
2001
+ content: "\e927";
2002
+ }
2003
+
2004
+ .mce-i-settings:before {
2005
+ content: "\e928";
2006
+ }
2007
+
2008
+ .mce-i-remove2:before {
2009
+ content: "\e92a";
2010
+ }
2011
+
2012
+ .mce-i-menu:before {
2013
+ content: "\e92d";
2014
+ }
2015
+
2016
+ .mce-i-warning:before {
2017
+ content: "\e930";
2018
+ }
2019
+
2020
+ .mce-i-question:before {
2021
+ content: "\e931";
2022
+ }
2023
+
2024
+ .mce-i-pluscircle:before {
2025
+ content: "\e932";
2026
+ }
2027
+
2028
+ .mce-i-info:before {
2029
+ content: "\e933";
2030
+ }
2031
+
2032
+ .mce-i-notice:before {
2033
+ content: "\e934";
2034
+ }
2035
+
2036
+ .mce-i-arrowup:before {
2037
+ content: "\e93b";
2038
+ }
2039
+
2040
+ .mce-i-arrowdown:before {
2041
+ content: "\e93d";
2042
+ }
2043
+
2044
+ .mce-i-arrowup2:before {
2045
+ content: "\e93f";
2046
+ }
2047
+
2048
+ .mce-i-arrowdown2:before {
2049
+ content: "\e940";
2050
+ }
2051
+
2052
+ .mce-i-menu2:before {
2053
+ content: "\e941";
2054
+ }
2055
+
2056
+ .mce-i-newtab:before {
2057
+ content: "\e961";
2058
+ }
2059
+
2060
+ .mce-i-a11y:before {
2061
+ content: "\e900";
2062
+ }
2063
+
2064
+ .mce-i-plus:before {
2065
+ content: "\e93a";
2066
+ }
2067
+
2068
+ .mce-i-minus:before {
2069
+ content: "\e939";
2070
+ }
2071
+
2072
+ .mce-i-books:before {
2073
+ content: "\e911";
2074
+ }
2075
+
2076
+ .mce-i-checkmark:before {
2077
+ content: "\e033";
2078
+ }
2079
+
2080
+ .mce-i-checkbox:before,
2081
+ .mce-i-selected:before {
1800
2082
  content: "\e033";
1801
2083
  }
1802
2084